kaniini [Thu, 14 Mar 2019 02:01:10 +0000 (02:01 +0000)]
Merge branch 'admin-api-account-view-namespace' into 'develop'
MastodonAPI.Admin.AccountView → AdminAPI.AccountView
See merge request pleroma/pleroma!930
kaniini [Thu, 14 Mar 2019 02:00:47 +0000 (02:00 +0000)]
Merge branch 'feature/add-local-to-users-admin-api' into 'develop'
Add "local" & "tags" to users admin API
See merge request pleroma/pleroma!932
Maxim Filippov [Thu, 14 Mar 2019 00:17:09 +0000 (03:17 +0300)]
Ensure empty array is returned for tags
Maxim Filippov [Wed, 13 Mar 2019 22:52:24 +0000 (01:52 +0300)]
Add tags
kaniini [Wed, 13 Mar 2019 22:04:23 +0000 (22:04 +0000)]
Merge branch 'mastofe-content-types' into 'develop'
Set content types settings on mastofe endpoint.
See merge request pleroma/pleroma!894
kaniini [Wed, 13 Mar 2019 22:01:56 +0000 (22:01 +0000)]
Merge branch 'unify-accept-reject-unfollow' into 'develop'
Unify unfollow, accept and reject follow requests using CommonAPI
See merge request pleroma/pleroma!931
eugenijm [Wed, 13 Mar 2019 06:04:49 +0000 (09:04 +0300)]
Unify unfollow, accept and reject follow requests using CommonAPI
Maxim Filippov [Wed, 13 Mar 2019 14:56:15 +0000 (17:56 +0300)]
Add test when local is false
Maxim Filippov [Wed, 13 Mar 2019 13:14:31 +0000 (16:14 +0300)]
Fix test
Maxim Filippov [Wed, 13 Mar 2019 13:04:44 +0000 (16:04 +0300)]
Add "local" to users admin API
Haelwenn (lanodan) Monnier [Wed, 13 Mar 2019 03:13:28 +0000 (04:13 +0100)]
MastodonAPI.Admin.AccountView → AdminAPI.AccountView
lambda [Wed, 13 Mar 2019 09:09:44 +0000 (09:09 +0000)]
Merge branch 'features/add-credo-to-ci' into 'develop'
Add credo to CI
See merge request pleroma/pleroma!902
Haelwenn (lanodan) Monnier [Thu, 7 Mar 2019 23:34:36 +0000 (00:34 +0100)]
Pleroma.Web.TwitterAPI.Controller: Remove duplicated alias/es
Haelwenn (lanodan) Monnier [Tue, 5 Mar 2019 05:11:21 +0000 (06:11 +0100)]
.gitlab-ci.yml: Use --strict instead of list
This makes the output to be more compact while not loosing readability
--format=flycheck // --format=json could also be used but they are
not very human readable
Haelwenn (lanodan) Monnier [Tue, 5 Mar 2019 05:07:21 +0000 (06:07 +0100)]
[Credo][CI] Add readability as it’s fixed
Haelwenn (lanodan) Monnier [Tue, 5 Mar 2019 04:44:53 +0000 (05:44 +0100)]
[Credo] Change quoted string with 3+ quotes to sigils
Haelwenn (lanodan) Monnier [Tue, 5 Mar 2019 04:37:33 +0000 (05:37 +0100)]
[Credo] fix Credo.Check.Readability.MaxLineLength
Haelwenn (lanodan) Monnier [Tue, 5 Mar 2019 04:03:13 +0000 (05:03 +0100)]
[Credo] write large numbers with underscore separation
Haelwenn (lanodan) Monnier [Tue, 5 Mar 2019 03:36:19 +0000 (04:36 +0100)]
[Credo] make all variables use snake_case
Haelwenn (lanodan) Monnier [Tue, 5 Mar 2019 03:18:43 +0000 (04:18 +0100)]
[Credo] Remove parentesis on argument-less functions
Haelwenn (lanodan) Monnier [Tue, 5 Mar 2019 02:52:23 +0000 (03:52 +0100)]
[Credo] fix Credo.Check.Readability.AliasOrder
Haelwenn (lanodan) Monnier [Tue, 5 Mar 2019 01:45:07 +0000 (02:45 +0100)]
[Credo] Fix the consistency
Haelwenn (lanodan) Monnier [Tue, 5 Mar 2019 01:38:42 +0000 (02:38 +0100)]
.credo.exs: Clear removed tests
Haelwenn (lanodan) Monnier [Tue, 5 Mar 2019 01:32:12 +0000 (02:32 +0100)]
[Credo][CI] Do not make TODO/FIXME fail
Haelwenn (lanodan) Monnier [Tue, 5 Mar 2019 01:30:19 +0000 (02:30 +0100)]
[Credo] Fix the warnings
Haelwenn (lanodan) Monnier [Tue, 5 Mar 2019 01:24:12 +0000 (02:24 +0100)]
.gitlab-ci.yml: Adds credo to the chain
Not really sure about the order in which this is but it feels right
because credo is more about checking if a ~working code could need
some improvements.<M-1>
kaniini [Tue, 12 Mar 2019 19:50:51 +0000 (19:50 +0000)]
Merge branch 'feature/add-roles-to-users-admin-api' into 'develop'
Add "roles" to users admin API
See merge request pleroma/pleroma!928
Maxim Filippov [Tue, 12 Mar 2019 19:15:28 +0000 (22:15 +0300)]
Add "roles" to users admin API
kaniini [Tue, 12 Mar 2019 16:27:47 +0000 (16:27 +0000)]
Merge branch 'masto-api-followers-following' into 'develop'
MastoAPI followers/following endpoints
See merge request pleroma/pleroma!924
eugenijm [Mon, 11 Mar 2019 18:03:30 +0000 (21:03 +0300)]
MastoAPI followers/following endpoints
kaniini [Mon, 11 Mar 2019 21:43:46 +0000 (21:43 +0000)]
Merge branch 'add-screenname-extension-to-masto-api' into 'develop'
MastoAPI Accounts: Add fetching by nickname.
See merge request pleroma/pleroma!922
kaniini [Mon, 11 Mar 2019 21:43:06 +0000 (21:43 +0000)]
Merge branch 'add-activity-id-to-push-messages' into 'develop'
WebPush: Add activity id to the push messages.
See merge request pleroma/pleroma!925
rinpatch [Mon, 11 Mar 2019 19:40:45 +0000 (19:40 +0000)]
Merge branch 'ci-switch-to-elixir-1-8-1' into 'develop'
Switch the CI to Elixir 1.8.1
See merge request pleroma/pleroma!926
rinpatch [Mon, 11 Mar 2019 19:36:02 +0000 (22:36 +0300)]
Switch the CI to Elixir 1.8.1
lain [Mon, 11 Mar 2019 18:32:21 +0000 (19:32 +0100)]
Linting.
lain [Mon, 11 Mar 2019 18:23:21 +0000 (19:23 +0100)]
WebPush: Add activity id to the push messages.
Makes it easier to relate the push to a given status.
lain [Mon, 11 Mar 2019 14:18:32 +0000 (15:18 +0100)]
MastoAPI Accounts: Add fetching by nickname.
This is to make it easier for the frontends to handle domain.com/users/nickname
urls.
lambda [Mon, 11 Mar 2019 13:26:12 +0000 (13:26 +0000)]
Merge branch 'add-local-field-to-status' into 'develop'
MastoAPI StatusView: Add locality indicator.
See merge request pleroma/pleroma!920
lambda [Mon, 11 Mar 2019 13:21:03 +0000 (13:21 +0000)]
Update Differences-in-MastodonAPI-Responses.md
lambda [Mon, 11 Mar 2019 13:19:24 +0000 (13:19 +0000)]
Merge branch 'feat/style-oauth-login-page' into 'develop'
Style again the OAuth login page to fit pleroma more
See merge request pleroma/pleroma!921
lambda [Mon, 11 Mar 2019 13:19:09 +0000 (13:19 +0000)]
Merge branch 'broadcast-activity-id-on-deletion' into 'develop'
Broadcast proper deleted activity id to conform to MastoAPI streaming spec
See merge request pleroma/pleroma!917
lambda [Mon, 11 Mar 2019 13:15:45 +0000 (13:15 +0000)]
Merge branch 'fix/roma-links-clients-md' into 'develop'
Update homepages and provide source code links for Roma apps in Clients.md
See merge request pleroma/pleroma!919
Shpuld Shpuldson [Mon, 11 Mar 2019 13:10:42 +0000 (15:10 +0200)]
Remove chromium input hilight that clashes with our own
Shpuld Shpuldson [Mon, 11 Mar 2019 12:57:04 +0000 (14:57 +0200)]
Style again the login page to fit pleroma more
lain [Mon, 11 Mar 2019 12:48:27 +0000 (13:48 +0100)]
MastoAPI StatusView: Add locality indicator.
eugenijm [Sat, 9 Mar 2019 11:12:15 +0000 (14:12 +0300)]
Broadcast deleted activity id on deletion to conform to MastoAPI streamig spec
rinpatch [Mon, 11 Mar 2019 05:36:56 +0000 (08:36 +0300)]
Change order of source code to align with platforms
rinpatch [Mon, 11 Mar 2019 05:33:57 +0000 (08:33 +0300)]
Update homepages and provide source code links for Roma apps in Clients.md
rinpatch [Mon, 11 Mar 2019 05:27:14 +0000 (05:27 +0000)]
Merge branch 'patch-2' into 'develop'
[Doc] Rename Mastalab -> Fedilab in Clients.md
See merge request pleroma/pleroma!918
Hakaba Hitoyo [Mon, 11 Mar 2019 01:40:34 +0000 (01:40 +0000)]
Rename Mastalab -> Fedilab in Clients.md
kaniini [Fri, 8 Mar 2019 23:02:55 +0000 (23:02 +0000)]
Merge branch 'bugfix/tesla-safety' into 'develop'
tesla hardening
Closes #712 and #672
See merge request pleroma/pleroma!912
William Pitcock [Fri, 8 Mar 2019 22:59:10 +0000 (22:59 +0000)]
http: connection: unify adapter configuration and defaults
William Pitcock [Fri, 8 Mar 2019 22:50:43 +0000 (22:50 +0000)]
http: connection: relax the timeouts a little
William Pitcock [Thu, 7 Mar 2019 23:49:02 +0000 (23:49 +0000)]
http: rework connection timeouts to match hackney docs, enforce 1 second max TCP connection timeout
William Pitcock [Thu, 7 Mar 2019 23:32:58 +0000 (23:32 +0000)]
http: actually pass the options list to the Connection factory
William Pitcock [Thu, 7 Mar 2019 23:31:59 +0000 (23:31 +0000)]
http: connection: merge hackney option lists instead of concatenating them
this ensures the right pools are used
William Pitcock [Thu, 7 Mar 2019 23:18:59 +0000 (23:18 +0000)]
http: safely catch erlang exits and elixir errors from hackney (ref #672)
kaniini [Fri, 8 Mar 2019 22:53:12 +0000 (22:53 +0000)]
Merge branch 'fix-tlsv1.3' into 'develop'
Fix supported TLS versions as TLS 1.3 support seems buggy.
Closes #708
See merge request pleroma/pleroma!892
kaniini [Fri, 8 Mar 2019 22:47:41 +0000 (22:47 +0000)]
Merge branch 'delete-status' into 'develop'
Allow an admin to delete a user status #721 (MastoAPI)
See merge request pleroma/pleroma!914
kaniini [Fri, 8 Mar 2019 22:33:31 +0000 (22:33 +0000)]
Merge branch 'fetch-posts-on-first-federation' into 'develop'
Fetch user's outbox posts on first federation with that user
Closes #131
See merge request pleroma/pleroma!907
eugenijm [Fri, 8 Mar 2019 17:21:56 +0000 (20:21 +0300)]
Allow an admin to delete a user status
Ekaterina Vaartis [Fri, 8 Mar 2019 13:26:16 +0000 (16:26 +0300)]
Add tests for fetch_ordered_collection
Ekaterina Vaartis [Wed, 6 Mar 2019 21:13:26 +0000 (00:13 +0300)]
Fetch user's outbox posts on first federation with that user
kaniini [Fri, 8 Mar 2019 00:42:17 +0000 (00:42 +0000)]
Merge branch 'update-mastofe/glitch-soc-2019-03-07' into 'develop'
Update Mastodon Frontend to 2019-03-07 bundle
See merge request pleroma/pleroma!911
Haelwenn (lanodan) Monnier [Thu, 7 Mar 2019 10:56:02 +0000 (11:56 +0100)]
Update Mastodon Frontend to 2019-03-07 bundle
See: https://git.pleroma.social/pleroma/mastofe/tags/bundle-2019-03-07
[ci skip]
rinpatch [Thu, 7 Mar 2019 16:42:05 +0000 (16:42 +0000)]
Merge branch 'bugfix/mrf-antifollowbot-nil-bio' into 'develop'
MRF: anti followbot: gracefully handle nil display names
See merge request pleroma/pleroma!909
kaniini [Thu, 7 Mar 2019 13:36:50 +0000 (13:36 +0000)]
Merge branch 'update/pleroma-fe-
20190307' into 'develop'
update pleroma frontend
See merge request pleroma/pleroma!910
William Pitcock [Thu, 7 Mar 2019 13:31:03 +0000 (13:31 +0000)]
update pleroma frontend
William Pitcock [Thu, 7 Mar 2019 12:20:04 +0000 (12:20 +0000)]
tests: add regression test
William Pitcock [Thu, 7 Mar 2019 12:13:48 +0000 (12:13 +0000)]
MRF: anti followbot: gracefully handle accounts without a display name
rinpatch [Thu, 7 Mar 2019 11:31:08 +0000 (11:31 +0000)]
Merge branch 'bugfix/delete-activity-audience' into 'develop'
expand the audience of delete activities to all recipients of the deleted object
Closes #682
See merge request pleroma/pleroma!891
Karen Konou [Thu, 7 Mar 2019 11:26:03 +0000 (12:26 +0100)]
Adjust delete activity audience to match the deleted object
Karen Konou [Thu, 7 Mar 2019 10:53:15 +0000 (11:53 +0100)]
Revert existing object check
lambda [Thu, 7 Mar 2019 09:33:54 +0000 (09:33 +0000)]
Merge branch 'preserve-link-headers' into 'develop'
Preserves parameters in link headers
Closes #716
See merge request pleroma/pleroma!908
eugenijm [Thu, 7 Mar 2019 02:29:42 +0000 (05:29 +0300)]
Preserve parameters in link headers (Mastodon API)
kaniini [Wed, 6 Mar 2019 22:27:42 +0000 (22:27 +0000)]
Merge branch 'chore/merge-search-into-list-users' into 'develop'
Merge search endpoint into /users
See merge request pleroma/pleroma!898
kaniini [Wed, 6 Mar 2019 13:22:02 +0000 (13:22 +0000)]
Merge branch 'bugfix/connect-src-https' into 'develop'
Plugs.HTTPSecurityPlug: Add static_url to CSP's connect-src
See merge request pleroma/pleroma!900
kaniini [Wed, 6 Mar 2019 13:20:51 +0000 (13:20 +0000)]
Merge branch 'bugfix/rel-me_list' into 'develop'
Web.RelMe: Fix having other values in rel attr
See merge request pleroma/pleroma!901
kaniini [Wed, 6 Mar 2019 13:20:12 +0000 (13:20 +0000)]
Merge branch 'feature/647' into 'develop'
[#647] tests for web push
See merge request pleroma/pleroma!904
Maksim [Wed, 6 Mar 2019 13:20:12 +0000 (13:20 +0000)]
[#647] tests for web push
kaniini [Wed, 6 Mar 2019 13:19:26 +0000 (13:19 +0000)]
Merge branch 'features/masto_fe-config' into 'develop'
Add default config for masto_fe
See merge request pleroma/pleroma!906
Maxim Filippov [Wed, 6 Mar 2019 02:01:38 +0000 (05:01 +0300)]
Keep heading short
Haelwenn [Wed, 6 Mar 2019 01:45:17 +0000 (01:45 +0000)]
Merge branch 'fix/escape-reserved-chars-in-filenames' into 'develop'
Properly escape reserved URI charachters in upload urls
Closes #700
See merge request pleroma/pleroma!905
Haelwenn (lanodan) Monnier [Wed, 6 Mar 2019 01:25:13 +0000 (02:25 +0100)]
Add default config for masto_fe
Related to: https://git.pleroma.social/pleroma/mastofe/merge_requests/22
Karen Konou [Tue, 5 Mar 2019 22:15:22 +0000 (23:15 +0100)]
Add handling of objects not in database
rinpatch [Tue, 5 Mar 2019 16:28:58 +0000 (19:28 +0300)]
Add tests for reserved char escaping in upload
rinpatch [Tue, 5 Mar 2019 15:09:23 +0000 (18:09 +0300)]
Properly escape reserved URI charachters in upload urls
rinpatch [Tue, 5 Mar 2019 07:05:44 +0000 (07:05 +0000)]
Merge branch 'add-admin-to-node-info' into 'develop'
Include admins in nodeinfo
Closes #689
See merge request pleroma/pleroma!899
Haelwenn (lanodan) Monnier [Tue, 5 Mar 2019 01:03:44 +0000 (02:03 +0100)]
Web.RelMe: Fix having other values in rel attr
One example of this is Github which puts a rel="nofollow me" on the
profile link.
Haelwenn (lanodan) Monnier [Tue, 5 Mar 2019 00:44:24 +0000 (01:44 +0100)]
Plugs.HTTPSecurityPlug: Add static_url to CSP's connect-src
Closes: https://git.pleroma.social/pleroma/pleroma/merge_requests/469
Haelwenn [Tue, 5 Mar 2019 00:33:04 +0000 (00:33 +0000)]
Merge branch 'bugfix/rich-media-uri-validation' into 'develop'
rich media: don't crawl bogus URIs
See merge request pleroma/pleroma!864
eugenijm [Mon, 4 Mar 2019 19:14:04 +0000 (22:14 +0300)]
Include admins in nodeinfo
Maxim Filippov [Mon, 4 Mar 2019 23:11:15 +0000 (02:11 +0300)]
Typo
William Pitcock [Mon, 4 Mar 2019 18:38:23 +0000 (18:38 +0000)]
rich media: helpers: rework validate_page_url()
Maxim Filippov [Mon, 4 Mar 2019 18:36:47 +0000 (21:36 +0300)]
local -> only_local
Maxim Filippov [Mon, 4 Mar 2019 18:33:53 +0000 (21:33 +0300)]
Format & update docs
William Pitcock [Sat, 2 Mar 2019 12:22:02 +0000 (12:22 +0000)]
helpers: use AutoLinker to validate URIs as well as the other tests
William Pitcock [Sun, 24 Feb 2019 19:39:27 +0000 (19:39 +0000)]
tests: add tests for rich media helper functions
William Pitcock [Sun, 24 Feb 2019 19:13:46 +0000 (19:13 +0000)]
rich media: don't crawl bogus URIs
kaniini [Mon, 4 Mar 2019 18:29:13 +0000 (18:29 +0000)]
Merge branch 'feature/add-status-text-to-notifications' into 'develop'
Add status text to notifications (mentions and reposts)
Closes #696
See merge request pleroma/pleroma!897
projects / akkoma / log