kaniini [Sun, 3 Mar 2019 15:48:00 +0000 (15:48 +0000)]
Merge branch 'remove-follow-request-count' into 'develop'
Remove follow_request_count as it's not needed for FE anymore.
See merge request pleroma/pleroma!886
eugenijm [Sun, 3 Mar 2019 15:39:37 +0000 (18:39 +0300)]
Remove follow_request_count as it's not needed for FE anymore.
MastoFE uses `GET /api/v1/follow_requests` and PleromaFE uses
`GET /api/pleroma/friend_requests` which they query on the initial page
load.
lambda [Sun, 3 Mar 2019 11:13:59 +0000 (11:13 +0000)]
Merge branch 'fix/dont-show-dms-in-mentions-timeline' into 'develop'
[#675] Do not show DMs in mentions timeline
See merge request pleroma/pleroma!877
rinpatch [Sat, 2 Mar 2019 06:39:07 +0000 (06:39 +0000)]
Merge branch 'bugfix/oauth-scopes-join' into 'develop'
Bugfix: OAuth scopes formatting
Closes #702
See merge request pleroma/pleroma!881
Haelwenn (lanodan) Monnier [Sat, 2 Mar 2019 03:10:43 +0000 (04:10 +0100)]
Web.OAuth.OAuthControllerTest: Add test against token formatting
Haelwenn (lanodan) Monnier [Sat, 2 Mar 2019 03:04:16 +0000 (04:04 +0100)]
Web.OAuth.OAuthController: Fix scopes Enum.join for OAuth response
rinpatch [Fri, 1 Mar 2019 12:48:04 +0000 (15:48 +0300)]
use commonapi.post instead of activitybulder
kaniini [Fri, 1 Mar 2019 12:28:08 +0000 (12:28 +0000)]
Merge branch 'hotfix/http-date-header' into 'develop'
activitypub: fix date header format
See merge request pleroma/pleroma!879
William Pitcock [Fri, 1 Mar 2019 12:21:09 +0000 (12:21 +0000)]
activitypub: fix date header format
HTTP date header specification says that days must always be two-digit.
Accordingly, change the format string used to ensure days are always
represented as two-digit (e.g. 01).
kaniini [Fri, 1 Mar 2019 11:09:36 +0000 (11:09 +0000)]
Merge branch 'default-tags-for-existing-users' into 'develop'
Migration for adding tags to the existing users records
See merge request pleroma/pleroma!878
eugenijm [Fri, 1 Mar 2019 10:25:32 +0000 (13:25 +0300)]
Added migration for setting default tags in existing users records
lambda [Fri, 1 Mar 2019 09:48:24 +0000 (09:48 +0000)]
Merge branch 'bugfix/236-ambiguous-route-for-numerical-handles' into 'develop'
Bugfix #236 Prefer user look-up by nickname
See merge request pleroma/pleroma!860
lambda [Fri, 1 Mar 2019 09:42:34 +0000 (09:42 +0000)]
Merge branch 'feature/cowboy2' into 'develop'
upgrade to cowboy 2.6
See merge request pleroma/pleroma!876
rinpatch [Fri, 1 Mar 2019 06:37:29 +0000 (09:37 +0300)]
[#675] Do not show DMs in mentions timeline
William Pitcock [Thu, 28 Feb 2019 16:58:00 +0000 (16:58 +0000)]
config: fix chat endpoint path
William Pitcock [Thu, 28 Feb 2019 16:23:55 +0000 (16:23 +0000)]
mastodon websocket: return errors using ok, not stop
William Pitcock [Thu, 28 Feb 2019 16:23:24 +0000 (16:23 +0000)]
mastodon websocket: bring back infinity timeout
William Pitcock [Thu, 28 Feb 2019 16:02:48 +0000 (16:02 +0000)]
mastodon websocket: use pattern match to get query data, robustly handle errors
William Pitcock [Thu, 28 Feb 2019 15:43:38 +0000 (15:43 +0000)]
config: update config for cowboy 2 endpoints
William Pitcock [Thu, 28 Feb 2019 15:17:01 +0000 (15:17 +0000)]
mastodon api: websocket: update code for cowboy 2.x
William Pitcock [Thu, 28 Feb 2019 14:53:54 +0000 (14:53 +0000)]
mix: update dependencies for cowboy 2.0
href [Thu, 28 Feb 2019 11:18:01 +0000 (11:18 +0000)]
Merge branch 'customizable_auth' into 'develop'
Authenticator tweaks
See merge request pleroma/pleroma!875
Ivan Tashkinov [Thu, 28 Feb 2019 11:12:41 +0000 (14:12 +0300)]
Renamed *DatabaseAuthenticator to *Authenticator.
Ivan Tashkinov [Thu, 28 Feb 2019 10:58:58 +0000 (13:58 +0300)]
Added `auth_template/0` to DatabaseAuthenticator.
kaniini [Thu, 28 Feb 2019 10:22:19 +0000 (10:22 +0000)]
Merge branch 'with-mutes' into 'develop'
Add `with_muted` param.
Closes #683
See merge request pleroma/pleroma!872
href [Thu, 28 Feb 2019 10:12:26 +0000 (10:12 +0000)]
Merge branch 'customizable_auth' into 'develop'
Auth customization support
See merge request pleroma/pleroma!852
kaniini [Thu, 28 Feb 2019 10:10:03 +0000 (10:10 +0000)]
Merge branch 'speedup-follow-requests' into 'develop'
Speedup follow requests
Closes #677
See merge request pleroma/pleroma!871
kaniini [Thu, 28 Feb 2019 10:08:31 +0000 (10:08 +0000)]
Merge branch 'deactivated-in-user-view' into 'develop'
Add activation status to the regular user view
See merge request pleroma/pleroma!874
Ivan Tashkinov [Thu, 28 Feb 2019 10:00:54 +0000 (13:00 +0300)]
Made auth customization be runtime-configurable.
lambda [Thu, 28 Feb 2019 07:35:26 +0000 (07:35 +0000)]
Merge branch 'feature/mastoapi-embedded-relationships' into 'develop'
mastodon api: embed relationship card under account card for Pleroma FE convenience
See merge request pleroma/pleroma!870
eugenijm [Thu, 28 Feb 2019 05:31:33 +0000 (08:31 +0300)]
Added deactivated to the user view
lain [Wed, 27 Feb 2019 16:24:51 +0000 (17:24 +0100)]
Remove parts of the old activity view.
Not used anymore.
lain [Wed, 27 Feb 2019 15:52:03 +0000 (16:52 +0100)]
Add user muted status info to twitterapi.
lain [Wed, 27 Feb 2019 15:46:47 +0000 (16:46 +0100)]
Add user muted status info to MastodonAPI.
lain [Wed, 27 Feb 2019 15:37:42 +0000 (16:37 +0100)]
Add `with_muted` param.
lain [Wed, 27 Feb 2019 14:01:54 +0000 (15:01 +0100)]
Follower requests: Utilize object index.
Closes #677
lain [Wed, 27 Feb 2019 13:51:07 +0000 (14:51 +0100)]
Add follow request test.
William Pitcock [Wed, 27 Feb 2019 13:01:10 +0000 (13:01 +0000)]
mastodon api: embed relationship card under account card for Pleroma FE convenience
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
Ivan Tashkinov [Tue, 26 Feb 2019 13:26:54 +0000 (16:26 +0300)]
Added missing copyright headers.
Ivan Tashkinov [Tue, 26 Feb 2019 12:29:43 +0000 (15:29 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into customizable_auth
Ivan Tashkinov [Tue, 26 Feb 2019 12:27:01 +0000 (15:27 +0300)]
Database authenticator behaviour / Pleroma implementation refactoring.
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
11backslashes [Sun, 24 Feb 2019 18:23:47 +0000 (13:23 -0500)]
delegate user retrieval to the User module
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`.
Ivan Tashkinov [Fri, 22 Feb 2019 08:10:17 +0000 (11:10 +0300)]
Minor setting name adjustment (:app_template -> :app_layout).
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
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
projects / akkoma / log