squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
3,957 Commits 154 Branches 42 Tags 503 MiB
1803d9a022
Commit Graph

2787 Commits

Author SHA1 Message Date
William Pitcock
1803d9a022 fix fetching AP objects with application/json 2019-02-20 20:45:40 +00:00
William Pitcock
22e2ed235d logging: only return ISE reasons in API responses when in dev or test mode 2019-02-20 17:36:47 +00:00
William Pitcock
8b08096436 logging: improve visibility into ISE errors 2019-02-20 17:14:18 +00:00
Egor
bff9eb5ef7 Reports 2019-02-20 16:51:25 +00:00
lain
59c27f29c8 Add some nicer urls in status view. 2019-02-20 17:36:16 +01:00
Ivan Tashkinov
b574d97c2e [#468] Added support for push OAuth scope (Mastodon 2.4+). 2019-02-20 17:27:41 +03:00
Ivan Tashkinov
6fe7acd58e [#468] Merged upstream/develop. 2019-02-20 16:48:59 +03:00
lambda
11b3c10c54 Merge branch 'muting' into 'develop' 
Implement muting, add it to the whole mastodon API

See merge request pleroma/pleroma!319
 2019-02-20 13:19:37 +00:00
Ivan Tashkinov
3ad91ec3c1 [#468] Adjusted scope restriction for MastodonAPIController#index. 2019-02-20 14:05:02 +03:00
Ekaterina Vaartis
5a46d37af9 Update the mute implementation to the current codebase 
Make it part of the info thing (and do a migration to ensure it's there)
 2019-02-19 23:09:16 +03:00
Ekaterina Vaartis
465b547c90 Remove unused "muted" parameter, use piping for mute/block fns 2019-02-19 21:49:55 +03:00
Ekaterina Vaartis
092b1b1453 Do not unfollow muted users 2019-02-19 21:49:55 +03:00
Ekaterina Vaartis
da64ea4a55 Implement mastodon mutes endpoint 
Aparently i forgot to add it, it gets a list of muted users
 2019-02-19 21:49:55 +03:00
Ekaterina Vaartis
f41f017bbc Implement muting, add it to the mastodon API 2019-02-19 21:49:55 +03:00
eugenijm
25b9e7a8c3 Added admin API for changing user activation status 2019-02-19 19:37:02 +03:00
Ivan Tashkinov
c0ecbf6669 [#468] Merged upstream/develop. 2019-02-19 19:10:55 +03:00
lambda
1dd718e83c Merge branch 'set-cache-on-user-tag-update' into 'develop' 
Update user cache when user tags are updated

See merge request pleroma/pleroma!840
 2019-02-19 14:20:58 +00:00
lambda
f25a3f4f78 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
 2019-02-19 14:08:19 +00:00
lambda
f53dc5ee08 Merge branch 'fix/ap_id-unique_constraint' into 'develop' 
mark ap_id unique_constraint

See merge request pleroma/pleroma!842
 2019-02-19 14:07:16 +00:00
rinpatch
109b01a631 mark ap_id unique_constraint 2019-02-19 13:52:15 +03:00
rinpatch
96dcacade1 properly check for follower address in is_private? 2019-02-19 13:23:13 +03:00
eugenijm
fc35481445 Update user cache when user tags are updated 2019-02-19 10:43:38 +03:00
kaniini
833161b5d2 Merge branch 'feature/jobs' into 'develop' 
Job Queue

See merge request pleroma/pleroma!732
 2019-02-18 19:43:06 +00:00
kaniini
a39a094cda Merge branch 'patch-image-description' into 'develop' 
Patch to support image descriptions for pleroma-fe

See merge request pleroma/pleroma!626
 2019-02-18 04:11:46 +00:00
kaniini
7456338ed3 Merge branch 'feature/add-oauth-tokens-endpoint' into 'develop' 
Add OAuth tokens endpoint

See merge request pleroma/pleroma!805
 2019-02-18 04:02:41 +00:00
kaniini
c23bd05737 Merge branch 'features/flavour-switching' into 'develop' 
[MastoAPI] Add switching of frontend flavours

See merge request pleroma/pleroma!807
 2019-02-18 04:01:51 +00:00
kaniini
cd019a5927 Merge branch 'follow-request-count' into 'develop' 
Follow request count

See merge request pleroma/pleroma!817
 2019-02-18 04:01:26 +00:00
kaniini
3f38a05571 Merge branch 'csv-export' into 'develop' 
Add option to return all friends in twitter api.

Closes #602

See merge request pleroma/pleroma!833
 2019-02-18 03:59:46 +00:00
Maxim Filippov
94708d6370 Render only "id", "valid_until" and "app_name" in TokenView 2019-02-17 23:57:35 +03:00
lambda
f26582aae9 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
 2019-02-17 17:37:48 +00:00
lambda
ae84af4ad0 Merge branch 'fix/hellthread-policy-recipient-check' into 'develop' 
Fix recipient count in hellthread policy

See merge request pleroma/pleroma!836
 2019-02-17 16:57:57 +00:00
Ivan Tashkinov
d3fe2c8ec6 [#468] Formatting fix. 2019-02-17 14:07:35 +03:00
Ivan Tashkinov
bc4f77b10b [#468] Merged upstream/develop, resolved conflicts. 2019-02-17 14:07:04 +03:00
Ivan Tashkinov
dcf24a3233 [#468] Refactored OAuth scopes' defaults & missing selection handling. 2019-02-17 13:49:14 +03:00
rinpatch
8f98d970c1 Fix recipient count in hellthread policy 2019-02-17 13:46:40 +03:00
Haelwenn (lanodan) Monnier
4df455f69b
[MastoAPI] Add switching of frontend flavours 2019-02-16 19:50:13 +01:00
rinpatch
96c725328b Remove a limit on attachments in Mastodon API and document the changes in responses from vanilla mastodon 2019-02-16 20:38:25 +03:00
lain
269d3e1ca6 WelcomeMessage: Get rid of Ecto reference. 2019-02-16 17:24:48 +01:00
lain
38e15930cb Add option to return all friends in twitter api. 
Mainly useful for user export.
 2019-02-16 17:01:15 +01:00
lain
d812a347ca Add optional welcome message. 2019-02-16 16:42:34 +01:00
Ivan Tashkinov
2a4a4f3342 [#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.
 2019-02-15 19:54:37 +03:00
lambda
1ce1b7b58d Merge branch 'bugfix/oauth-token-padding' into 'develop' 
oauth: never use base64 padding when returning tokens to applications

See merge request pleroma/pleroma!825
 2019-02-15 14:58:13 +00:00
rinpatch
921571c19b Merge branch 'hellthread-filter-fix' into 'develop' 
Hellthread filter fix

Closes #634

See merge request pleroma/pleroma!831
 2019-02-15 13:18:35 +00:00
Karen Konou
c2e0a0c8d4 Readd threshold is not 0 check, optmization? 2019-02-15 14:05:20 +01:00
Karen Konou
dca6bee2f7 Rename test, add check for follower collection when delisting 2019-02-15 13:43:14 +01:00
rinpatch
b63a5e309d Merge branch 'bugfix/actor-containment' into 'develop' 
activitypub: correctly handle bare URIs in user lookup

Closes #645

See merge request pleroma/pleroma!829
 2019-02-15 12:27:03 +00:00
Karen Konou
d943c90249 Add tests, change default config values, fix a bug 2019-02-15 12:47:50 +01:00
eugenijm
ecdf0657ba 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.
 2019-02-15 12:20:20 +03:00
William Pitcock
da44cdd381 user: search: use get_or_fetch() instead of get_or_fetch_by_nickname() 
get_or_fetch() handles the nickname verses URI differences transparently.
 2019-02-14 20:00:04 +00:00
lambda
ea2698beb7 Merge branch 'bugfix/activitypub-reserialization' into 'develop' 
activitypub transmogrifier: fix reserialization edge cases

See merge request pleroma/pleroma!826
 2019-02-14 19:54:16 +00:00