Ivan Tashkinov [Thu, 21 Feb 2019 15:55:19 +0000 (18:55 +0300)]
Auth customization support.
OAuthController#create_authorization user retrieval / creation, errors handling, template & layout selection.
lambda [Thu, 21 Feb 2019 08:20:06 +0000 (08:20 +0000)]
Merge branch 'bugfix/httpsig-sign-date' into 'develop'
activitypub: sign date header
Closes #649 and #364
See merge request pleroma/pleroma!847
lambda [Thu, 21 Feb 2019 08:14:24 +0000 (08:14 +0000)]
Merge branch 'bugfix/as2-accept-json' into 'develop'
accept application/json mimetype for fetching AS2 objects
See merge request pleroma/pleroma!846
lambda [Thu, 21 Feb 2019 08:11:06 +0000 (08:11 +0000)]
Merge branch '2019-02-21-update-frontend' into 'develop'
update frontend
See merge request pleroma/pleroma!850
lain [Thu, 21 Feb 2019 08:04:35 +0000 (09:04 +0100)]
update frontend
William Pitcock [Thu, 21 Feb 2019 00:23:17 +0000 (00:23 +0000)]
activitypub: sign http date header
William Pitcock [Thu, 21 Feb 2019 00:19:49 +0000 (00:19 +0000)]
mix: add timex dependency
William Pitcock [Wed, 20 Feb 2019 20:49:10 +0000 (20:49 +0000)]
tests: fix formatting
William Pitcock [Wed, 20 Feb 2019 20:45:40 +0000 (20:45 +0000)]
fix fetching AP objects with application/json
William Pitcock [Wed, 20 Feb 2019 20:45:09 +0000 (20:45 +0000)]
tests: add test for fetching AP objects with application/json.
lambda [Wed, 20 Feb 2019 18:21:58 +0000 (18:21 +0000)]
Merge branch 'feature/improve-error-logging' into 'develop'
logging: improve visibility into ISE errors
See merge request pleroma/pleroma!845
William Pitcock [Wed, 20 Feb 2019 17:36:19 +0000 (17:36 +0000)]
logging: only return ISE reasons in API responses when in dev or test mode
William Pitcock [Wed, 20 Feb 2019 17:23:05 +0000 (17:23 +0000)]
tests: fix tests
William Pitcock [Tue, 19 Feb 2019 21:31:27 +0000 (21:31 +0000)]
logging: improve visibility into ISE errors
kaniini [Wed, 20 Feb 2019 16:51:25 +0000 (16:51 +0000)]
Merge branch 'feature/reports' into 'develop'
Reports
Closes #83
See merge request pleroma/pleroma!701
Egor [Wed, 20 Feb 2019 16:51:25 +0000 (16:51 +0000)]
Reports
kaniini [Wed, 20 Feb 2019 16:42:52 +0000 (16:42 +0000)]
Merge branch 'nicer-share-urls' into 'develop'
Add some nicer urls in status view.
See merge request pleroma/pleroma!844
lain [Wed, 20 Feb 2019 16:36:16 +0000 (17:36 +0100)]
Add some nicer urls in status view.
lambda [Wed, 20 Feb 2019 16:15:45 +0000 (16:15 +0000)]
Merge branch '468_oauth2_scopes' into 'develop'
[#468] OAuth2 scopes
Closes #468
See merge request pleroma/pleroma!799
Ivan Tashkinov [Wed, 20 Feb 2019 14:27:41 +0000 (17:27 +0300)]
[#468] Added support for `push` OAuth scope (Mastodon 2.4+).
Ivan Tashkinov [Wed, 20 Feb 2019 13:48:59 +0000 (16:48 +0300)]
[#468] Merged `upstream/develop`.
lambda [Wed, 20 Feb 2019 13:19:37 +0000 (13:19 +0000)]
Merge branch 'muting' into 'develop'
Implement muting, add it to the whole mastodon API
See merge request pleroma/pleroma!319
lain [Wed, 20 Feb 2019 13:14:52 +0000 (14:14 +0100)]
Add test for User.mutes and so on.
lain [Wed, 20 Feb 2019 12:47:44 +0000 (13:47 +0100)]
Add test for muting functionality.
lain [Wed, 20 Feb 2019 12:47:24 +0000 (13:47 +0100)]
Remove superfluous migration.
Ivan Tashkinov [Wed, 20 Feb 2019 11:05:02 +0000 (14:05 +0300)]
[#468] Adjusted scope restriction for MastodonAPIController#index.
Ivan Tashkinov [Wed, 20 Feb 2019 09:27:28 +0000 (12:27 +0300)]
[#468] More OAuth scopes-specific tests.
kaniini [Tue, 19 Feb 2019 22:45:51 +0000 (22:45 +0000)]
Merge branch 'set-activation-status-admin-api' into 'develop'
Added admin API for changing user activation status
See merge request pleroma/pleroma!843
Ekaterina Vaartis [Tue, 19 Feb 2019 20:09:16 +0000 (23:09 +0300)]
Update the mute implementation to the current codebase
Make it part of the info thing (and do a migration to ensure it's there)
Ivan Tashkinov [Tue, 19 Feb 2019 19:28:21 +0000 (22:28 +0300)]
[#468] Added OAuth scopes-specific tests.
Ekaterina Vaartis [Mon, 3 Sep 2018 21:20:22 +0000 (00:20 +0300)]
Remove unused "muted" parameter, use piping for mute/block fns
Ekaterina Vaartis [Mon, 3 Sep 2018 21:17:25 +0000 (00:17 +0300)]
Do not unfollow muted users
Ekaterina Vaartis [Sat, 1 Sep 2018 21:34:15 +0000 (00:34 +0300)]
Add test for mastodon muting endpoints
Ekaterina Vaartis [Sat, 1 Sep 2018 21:33:13 +0000 (00:33 +0300)]
Implement mastodon mutes endpoint
Aparently i forgot to add it, it gets a list of muted users
Ekaterina Vaartis [Wed, 5 Sep 2018 20:49:15 +0000 (23:49 +0300)]
Implement muting, add it to the mastodon API
eugenijm [Tue, 19 Feb 2019 15:40:57 +0000 (18:40 +0300)]
Added admin API for changing user activation status
Ivan Tashkinov [Tue, 19 Feb 2019 16:10:55 +0000 (19:10 +0300)]
[#468] Merged `upstream/develop`.
lambda [Tue, 19 Feb 2019 14:20:58 +0000 (14:20 +0000)]
Merge branch 'set-cache-on-user-tag-update' into 'develop'
Update user cache when user tags are updated
See merge request pleroma/pleroma!840
lambda [Tue, 19 Feb 2019 14:08:19 +0000 (14:08 +0000)]
Merge branch 'fix/check-follower-collection-in-is_private' into 'develop'
properly check for follower address in is_private?
See merge request pleroma/pleroma!841
lambda [Tue, 19 Feb 2019 14:07:16 +0000 (14:07 +0000)]
Merge branch 'fix/ap_id-unique_constraint' into 'develop'
mark ap_id unique_constraint
See merge request pleroma/pleroma!842
rinpatch [Tue, 19 Feb 2019 10:52:15 +0000 (13:52 +0300)]
mark ap_id unique_constraint
rinpatch [Tue, 19 Feb 2019 10:23:13 +0000 (13:23 +0300)]
properly check for follower address in is_private?
eugenijm [Tue, 19 Feb 2019 07:43:37 +0000 (10:43 +0300)]
Update user cache when user tags are updated
kaniini [Mon, 18 Feb 2019 19:43:06 +0000 (19:43 +0000)]
Merge branch 'feature/jobs' into 'develop'
Job Queue
See merge request pleroma/pleroma!732
kaniini [Mon, 18 Feb 2019 04:11:46 +0000 (04:11 +0000)]
Merge branch 'patch-image-description' into 'develop'
Patch to support image descriptions for pleroma-fe
See merge request pleroma/pleroma!626
kaniini [Mon, 18 Feb 2019 04:02:41 +0000 (04:02 +0000)]
Merge branch 'feature/add-oauth-tokens-endpoint' into 'develop'
Add OAuth tokens endpoint
See merge request pleroma/pleroma!805
kaniini [Mon, 18 Feb 2019 04:01:51 +0000 (04:01 +0000)]
Merge branch 'features/flavour-switching' into 'develop'
[MastoAPI] Add switching of frontend flavours
See merge request pleroma/pleroma!807
kaniini [Mon, 18 Feb 2019 04:01:26 +0000 (04:01 +0000)]
Merge branch 'follow-request-count' into 'develop'
Follow request count
See merge request pleroma/pleroma!817
kaniini [Mon, 18 Feb 2019 03:59:46 +0000 (03:59 +0000)]
Merge branch 'csv-export' into 'develop'
Add option to return all friends in twitter api.
Closes #602
See merge request pleroma/pleroma!833
Maxim Filippov [Sun, 17 Feb 2019 21:10:48 +0000 (00:10 +0300)]
Fix test
Maxim Filippov [Sun, 17 Feb 2019 20:57:35 +0000 (23:57 +0300)]
Render only "id", "valid_until" and "app_name" in TokenView
lambda [Sun, 17 Feb 2019 17:53:57 +0000 (17:53 +0000)]
Merge branch 'docs/add-clients-to-ex_doc' into 'develop'
mix.exs: Add docs/Clients.md to docs.extras
See merge request pleroma/pleroma!835
lambda [Sun, 17 Feb 2019 17:39:45 +0000 (17:39 +0000)]
Merge branch 'develop' into 'docs/add-clients-to-ex_doc'
# Conflicts:
# mix.exs
lambda [Sun, 17 Feb 2019 17:38:25 +0000 (17:38 +0000)]
Merge branch 'docker-speedup' into 'develop'
Docker speedup
See merge request pleroma/pleroma!837
lambda [Sun, 17 Feb 2019 17:37:48 +0000 (17:37 +0000)]
Merge branch 'mastoapi-stop-capping-attachments' into 'develop'
Remove a limit on attachments in Mastodon API and document the changes in responses from vanilla Mastodon
See merge request pleroma/pleroma!834
lambda [Sun, 17 Feb 2019 17:01:22 +0000 (17:01 +0000)]
Update Differences-in-MastodonAPI-Responses.md
lambda [Sun, 17 Feb 2019 16:57:57 +0000 (16:57 +0000)]
Merge branch 'fix/hellthread-policy-recipient-check' into 'develop'
Fix recipient count in hellthread policy
See merge request pleroma/pleroma!836
lain [Sun, 17 Feb 2019 16:47:24 +0000 (17:47 +0100)]
More speedup, test fixes.
rinpatch [Sun, 17 Feb 2019 11:33:44 +0000 (14:33 +0300)]
more tests for HellthreadPolicy
Ivan Tashkinov [Sun, 17 Feb 2019 11:07:35 +0000 (14:07 +0300)]
[#468] Formatting fix.
Ivan Tashkinov [Sun, 17 Feb 2019 11:07:04 +0000 (14:07 +0300)]
[#468] Merged `upstream/develop`, resolved conflicts.
Ivan Tashkinov [Sun, 17 Feb 2019 10:49:14 +0000 (13:49 +0300)]
[#468] Refactored OAuth scopes' defaults & missing selection handling.
lain [Sun, 17 Feb 2019 10:36:14 +0000 (11:36 +0100)]
Speed up docker postgres.
rinpatch [Sun, 17 Feb 2019 10:46:40 +0000 (13:46 +0300)]
Fix recipient count in hellthread policy
rinpatch [Sun, 17 Feb 2019 09:07:49 +0000 (12:07 +0300)]
Fix formating
rinpatch [Sun, 17 Feb 2019 07:34:00 +0000 (10:34 +0300)]
Add differences in MastoAPI responses to mix.exs extras
Haelwenn (lanodan) Monnier [Sun, 10 Feb 2019 22:11:12 +0000 (23:11 +0100)]
Web.MastodonAPI.MastodonAPIControllerTest: Add testing of the flavour switching
Haelwenn (lanodan) Monnier [Sun, 3 Feb 2019 11:31:12 +0000 (12:31 +0100)]
[MastoAPI] Add switching of frontend flavours
Haelwenn (lanodan) Monnier [Sat, 16 Feb 2019 18:39:03 +0000 (19:39 +0100)]
mix.exs: Add docs/Clients.md to docs.extras
[ci skip]
rinpatch [Sat, 16 Feb 2019 18:14:07 +0000 (21:14 +0300)]
Add a section on how to identify a pleroma instance, clarify that post upload limit is not capped too
rinpatch [Sat, 16 Feb 2019 17:39:04 +0000 (17:39 +0000)]
Merge branch 'welcome-message' into 'develop'
Add optional welcome message.
See merge request pleroma/pleroma!832
rinpatch [Sat, 16 Feb 2019 17:38:25 +0000 (20:38 +0300)]
Remove a limit on attachments in Mastodon API and document the changes in responses from vanilla mastodon
lain [Sat, 16 Feb 2019 16:25:06 +0000 (17:25 +0100)]
WelcomeMessage: specify that the user has to be local.
lain [Sat, 16 Feb 2019 16:24:48 +0000 (17:24 +0100)]
WelcomeMessage: Get rid of Ecto reference.
lain [Sat, 16 Feb 2019 16:24:31 +0000 (17:24 +0100)]
Check that the welcome message is sent from the correct user.
lain [Sat, 16 Feb 2019 16:01:15 +0000 (17:01 +0100)]
Add option to return all friends in twitter api.
Mainly useful for user export.
lain [Sat, 16 Feb 2019 15:42:34 +0000 (16:42 +0100)]
Add optional welcome message.
Ivan Tashkinov [Fri, 15 Feb 2019 16:54:37 +0000 (19:54 +0300)]
[#468] Defined OAuth restrictions for all applicable routes.
Improved missing "scopes" param handling.
Allowed "any of" / "all of" mode specification in OAuthScopesPlug.
Fixed auth UI / behavior when user selects no permissions at /oauth/authorize.
lambda [Fri, 15 Feb 2019 14:58:13 +0000 (14:58 +0000)]
Merge branch 'bugfix/oauth-token-padding' into 'develop'
oauth: never use base64 padding when returning tokens to applications
See merge request pleroma/pleroma!825
rinpatch [Fri, 15 Feb 2019 13:18:35 +0000 (13:18 +0000)]
Merge branch 'hellthread-filter-fix' into 'develop'
Hellthread filter fix
Closes #634
See merge request pleroma/pleroma!831
Karen Konou [Fri, 15 Feb 2019 13:05:20 +0000 (14:05 +0100)]
Readd threshold is not 0 check, optmization?
Karen Konou [Fri, 15 Feb 2019 12:43:14 +0000 (13:43 +0100)]
Rename test, add check for follower collection when delisting
rinpatch [Fri, 15 Feb 2019 12:27:03 +0000 (12:27 +0000)]
Merge branch 'bugfix/actor-containment' into 'develop'
activitypub: correctly handle bare URIs in user lookup
Closes #645
See merge request pleroma/pleroma!829
Karen Konou [Fri, 15 Feb 2019 11:47:50 +0000 (12:47 +0100)]
Add tests, change default config values, fix a bug
eugenijm [Sat, 9 Feb 2019 23:26:29 +0000 (02:26 +0300)]
Add logic for keeping follow_request_count up-to-date on the `follow`,
`approve_friend_request`, and `deny_friend_request` actions.
Add follow_request_count to the user view.
William Pitcock [Thu, 14 Feb 2019 19:59:12 +0000 (19:59 +0000)]
test: user: add a test for whether user search returns a user or not
William Pitcock [Thu, 14 Feb 2019 19:58:24 +0000 (19:58 +0000)]
user: search: use get_or_fetch() instead of get_or_fetch_by_nickname()
get_or_fetch() handles the nickname verses URI differences transparently.
lambda [Thu, 14 Feb 2019 19:54:16 +0000 (19:54 +0000)]
Merge branch 'bugfix/activitypub-reserialization' into 'develop'
activitypub transmogrifier: fix reserialization edge cases
See merge request pleroma/pleroma!826
William Pitcock [Thu, 14 Feb 2019 19:42:33 +0000 (19:42 +0000)]
activitypub: clean up logging statements a little
Wim Vanderbauwhede [Thu, 14 Feb 2019 16:41:40 +0000 (16:41 +0000)]
Merge remote-tracking branch 'upstream/develop' into patch-image-description
Ivan Tashkinov [Thu, 14 Feb 2019 14:03:19 +0000 (17:03 +0300)]
[#468] Refactored OAuth scopes parsing / defaults handling.
Ivan Tashkinov [Thu, 14 Feb 2019 11:28:26 +0000 (14:28 +0300)]
[#468] OAuth scopes-related data migration simplification.
href [Thu, 14 Feb 2019 10:10:13 +0000 (10:10 +0000)]
Merge branch 'fix/mediaproxy-s3' into 'develop'
Fix S3 links encoding in Mediaproxy
Closes #580
See merge request pleroma/pleroma!828
Egor Kislitsyn [Thu, 14 Feb 2019 10:02:47 +0000 (17:02 +0700)]
Fix queue name
Egor Kislitsyn [Thu, 14 Feb 2019 08:55:21 +0000 (15:55 +0700)]
fix S3 links encoding in Mediaproxy
kaniini [Thu, 14 Feb 2019 03:55:26 +0000 (03:55 +0000)]
Merge branch 'fix/credo-issues-test' into 'develop'
Fix credo issues in ./test
See merge request pleroma/pleroma!808
Haelwenn [Thu, 14 Feb 2019 03:40:33 +0000 (03:40 +0000)]
Merge branch 'bugfix/activitypub-totalitems-removal' into 'develop'
activitypub: user inbox/outbox: `totalItems` removal
See merge request pleroma/pleroma!827
William Pitcock [Thu, 14 Feb 2019 03:22:54 +0000 (03:22 +0000)]
tests: update tests for totalItems leak fix
William Pitcock [Thu, 14 Feb 2019 03:13:07 +0000 (03:13 +0000)]
activitypub: user view: formatting
William Pitcock [Thu, 14 Feb 2019 03:03:41 +0000 (03:03 +0000)]
activitypub: user view: report totalItems=0 for follows/followers when hidden
projects / akkoma / log