Maxim Filippov [Sat, 2 Mar 2019 14:32:40 +0000 (17:32 +0300)]
We do not guarantee the order of elements when we search
Maxim Filippov [Sat, 2 Mar 2019 14:21:18 +0000 (17:21 +0300)]
Add pagination to search
Maxim Filippov [Fri, 1 Mar 2019 18:17:20 +0000 (21:17 +0300)]
Refactor a little bit
Maxim Filippov [Fri, 1 Mar 2019 18:07:05 +0000 (21:07 +0300)]
Format
Maxim Filippov [Fri, 1 Mar 2019 17:58:47 +0000 (20:58 +0300)]
Fix user_test
Maxim Filippov [Fri, 1 Mar 2019 17:23:19 +0000 (20:23 +0300)]
Format
Maxim Filippov [Fri, 1 Mar 2019 17:23:03 +0000 (20:23 +0300)]
Show current user in users list as well
Maxim Filippov [Fri, 1 Mar 2019 17:13:02 +0000 (20:13 +0300)]
Add "local" params to users search
Maxim Filippov [Fri, 1 Mar 2019 14:34:14 +0000 (17:34 +0300)]
Add docs to /users/search
Maxim Filippov [Thu, 28 Feb 2019 16:04:47 +0000 (19:04 +0300)]
Add search users endpoint
Maxim Filippov [Thu, 28 Feb 2019 14:54:02 +0000 (17:54 +0300)]
Add test for the second page
Maxim Filippov [Thu, 28 Feb 2019 14:43:09 +0000 (17:43 +0300)]
Use Mastodon API views in Admin API
Maxim Filippov [Wed, 27 Feb 2019 22:11:56 +0000 (01:11 +0300)]
Add pagination to users admin API
kaniini [Wed, 27 Feb 2019 08:45:43 +0000 (08:45 +0000)]
Merge branch 'fix/formatter' into 'develop'
Bugfix: markdown in formatter
Closes #688
See merge request pleroma/pleroma!869
Egor Kislitsyn [Wed, 27 Feb 2019 08:40:30 +0000 (15:40 +0700)]
fix formatter
kaniini [Wed, 27 Feb 2019 07:28:10 +0000 (07:28 +0000)]
Merge branch 'chore/add-missing-tests-docs-to-admin-api' into 'develop'
Add missing docs and tests to Admin API
See merge request pleroma/pleroma!868
Maxim Filippov [Wed, 27 Feb 2019 00:08:03 +0000 (03:08 +0300)]
Add missing docs and tests
kaniini [Tue, 26 Feb 2019 23:32:26 +0000 (23:32 +0000)]
Merge branch 'auto_linker' into 'develop'
AutoLinker
Closes #609
See merge request pleroma/pleroma!839
Egor [Tue, 26 Feb 2019 23:32:26 +0000 (23:32 +0000)]
AutoLinker
kaniini [Tue, 26 Feb 2019 23:31:53 +0000 (23:31 +0000)]
Merge branch 'feature/more-actions-to-admin-api' into 'develop'
Add list/toggle activation endpoints to AdminController
See merge request pleroma/pleroma!867
Maxim Filippov [Tue, 26 Feb 2019 21:13:38 +0000 (00:13 +0300)]
Add more admin actions
kaniini [Tue, 26 Feb 2019 16:47:18 +0000 (16:47 +0000)]
Merge branch 'fix-nginx-listen-missing-ipv4' into 'develop'
need to put back ipv4 listen instruct
See merge request pleroma/pleroma!866
Kenneth Zhao [Tue, 26 Feb 2019 16:41:37 +0000 (08:41 -0800)]
need to put back ipv4 listen instruct
Haelwenn [Tue, 26 Feb 2019 06:56:29 +0000 (06:56 +0000)]
Merge branch 'nginx-cfg' into 'develop'
Add ipv6 handling to pleroma.nginx
See merge request pleroma/pleroma!865
PEA [Tue, 26 Feb 2019 04:37:46 +0000 (23:37 -0500)]
Add ipv6 handling to pleroma.nginx
Replaces `listen 80` with `listen [::]:80`, same with 443
kaniini [Sun, 24 Feb 2019 19:03:58 +0000 (19:03 +0000)]
Merge branch 'trivial/remove-io-inspect-spam' into 'develop'
twitter card: remove IO.inspect() spam
See merge request pleroma/pleroma!863
William Pitcock [Sun, 24 Feb 2019 18:53:49 +0000 (18:53 +0000)]
twitter card: remove IO.inspect() spam
kaniini [Sat, 23 Feb 2019 04:01:21 +0000 (04:01 +0000)]
Merge branch 'add-apache-cache-config' into 'develop'
apache config: add instructions for mediaproxy.
See merge request pleroma/pleroma!856
kaniini [Sat, 23 Feb 2019 03:59:23 +0000 (03:59 +0000)]
Merge branch 'card-handling' into 'develop'
Private card handling
Closes #652
See merge request pleroma/pleroma!854
kaniini [Sat, 23 Feb 2019 03:56:31 +0000 (03:56 +0000)]
Merge branch 'fix/meck' into 'develop'
Update meck to fix tests on MacOS
Closes #662
See merge request pleroma/pleroma!855
faried nawaz [Fri, 22 Feb 2019 19:18:03 +0000 (00:18 +0500)]
apache config: add instructions for mediaproxy.
Mark Felder [Fri, 22 Feb 2019 17:26:47 +0000 (17:26 +0000)]
Upate meck to fix tests on MacOS
lain [Fri, 22 Feb 2019 12:29:52 +0000 (13:29 +0100)]
Move visibility into own module.
href [Fri, 22 Feb 2019 11:16:10 +0000 (11:16 +0000)]
Merge branch 'oauth2_scopes_migration_hotfix' into 'develop'
Fixed `scopes` of apps / authorizations / tokens from apps initially created with space-delimited `scope`
Closes #660
See merge request pleroma/pleroma!853
lain [Fri, 22 Feb 2019 11:02:51 +0000 (12:02 +0100)]
Fix private post card handling.
Ivan Tashkinov [Fri, 22 Feb 2019 11:00:18 +0000 (14:00 +0300)]
Fixed `scopes` of apps / authorizations / tokens from apps initially created with space-delimited `scope`.
kaniini [Fri, 22 Feb 2019 04:38:14 +0000 (04:38 +0000)]
Merge branch 'fix/twittercards' into 'develop'
Fix Twitter Cards
See merge request pleroma/pleroma!815
kaniini [Fri, 22 Feb 2019 04:37:48 +0000 (04:37 +0000)]
Merge branch 'bugfix/outbox-bomb-on-empty-activities' into 'develop'
Fix: Fixing an outbox related bug when local user activity is empty
See merge request pleroma/pleroma!849
KZ [Fri, 22 Feb 2019 04:37:48 +0000 (04:37 +0000)]
Fix: Fixing an outbox related bug when local user activity is empty
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
href [Tue, 19 Feb 2019 17:56:57 +0000 (18:56 +0100)]
Player: allow styles on CSP, loop videos
href [Tue, 19 Feb 2019 17:17:37 +0000 (18:17 +0100)]
CSP: Allow iframes on embed player
Mark Felder [Tue, 19 Feb 2019 16:58:28 +0000 (16:58 +0000)]
Merge branch 'develop' into fix/twittercards
href [Tue, 19 Feb 2019 16:39:42 +0000 (17:39 +0100)]
Embed player suitable for Twitter Cards
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.
projects / akkoma / log