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

3977 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark Felder
bf562a6ecc Upate meck to fix tests on MacOS 2019-02-22 17:26:47 +00:00
href
34646c6923 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
 2019-02-22 11:16:10 +00:00
Ivan Tashkinov
b227ccab82 Fixed scopes of apps / authorizations / tokens from apps initially created with space-delimited scope. 2019-02-22 14:00:18 +03:00
kaniini
5a4e2905fe Merge branch 'fix/twittercards' into 'develop' 
Fix Twitter Cards

See merge request pleroma/pleroma!815
 2019-02-22 04:38:14 +00:00
kaniini
eeeb8124b9 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
 2019-02-22 04:37:48 +00:00
KZ
7c722c08f5 Fix: Fixing an outbox related bug when local user activity is empty 2019-02-22 04:37:48 +00:00
lambda
2813f28b6f Merge branch 'bugfix/httpsig-sign-date' into 'develop' 
activitypub: sign date header

Closes #649 and #364

See merge request pleroma/pleroma!847
 2019-02-21 08:20:06 +00:00
lambda
19bd799bd7 Merge branch 'bugfix/as2-accept-json' into 'develop' 
accept application/json mimetype for fetching AS2 objects

See merge request pleroma/pleroma!846
 2019-02-21 08:14:24 +00:00
lambda
45b06860d3 Merge branch '2019-02-21-update-frontend' into 'develop' 
update frontend

See merge request pleroma/pleroma!850
 2019-02-21 08:11:06 +00:00
lain
553ce57d42 update frontend 2019-02-21 09:04:35 +01:00
William Pitcock
f8a72f2997 activitypub: sign http date header 2019-02-21 00:23:17 +00:00
William Pitcock
1c87102d01 mix: add timex dependency 2019-02-21 00:19:49 +00:00
William Pitcock
e95dbecf3e tests: fix formatting 2019-02-20 20:49:10 +00:00
William Pitcock
1803d9a022 fix fetching AP objects with application/json 2019-02-20 20:45:40 +00:00
William Pitcock
aa45674be6 tests: add test for fetching AP objects with application/json. 2019-02-20 20:45:09 +00:00
lambda
1f85c9c9c7 Merge branch 'feature/improve-error-logging' into 'develop' 
logging: improve visibility into ISE errors

See merge request pleroma/pleroma!845
 2019-02-20 18:21:58 +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
3ee77e95b2 tests: fix tests 2019-02-20 17:23:05 +00:00
William Pitcock
8b08096436 logging: improve visibility into ISE errors 2019-02-20 17:14:18 +00:00
kaniini
54f9e3d382 Merge branch 'feature/reports' into 'develop' 
Reports

Closes #83

See merge request pleroma/pleroma!701
 2019-02-20 16:51:25 +00:00
Egor
bff9eb5ef7 Reports 2019-02-20 16:51:25 +00:00
kaniini
77fb926afa Merge branch 'nicer-share-urls' into 'develop' 
Add some nicer urls in status view.

See merge request pleroma/pleroma!844
 2019-02-20 16:42:52 +00:00
lain
59c27f29c8 Add some nicer urls in status view. 2019-02-20 17:36:16 +01:00
lambda
dff5e1e46a Merge branch '468_oauth2_scopes' into 'develop' 
[#468] OAuth2 scopes

Closes #468

See merge request pleroma/pleroma!799
 2019-02-20 16:15:45 +00: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
lain
4196d9af11 Add test for User.mutes and so on. 2019-02-20 14:14:52 +01:00
lain
9ae79bb71a Add test for muting functionality. 2019-02-20 13:47:44 +01:00
lain
840d2c9f0b Remove superfluous migration. 2019-02-20 13:47:24 +01:00
Ivan Tashkinov
3ad91ec3c1 [#468] Adjusted scope restriction for MastodonAPIController#index. 2019-02-20 14:05:02 +03:00
Ivan Tashkinov
337367d764 [#468] More OAuth scopes-specific tests. 2019-02-20 12:27:28 +03:00
kaniini
abd0b85efd Merge branch 'set-activation-status-admin-api' into 'develop' 
Added admin API for changing user activation status

See merge request pleroma/pleroma!843
 2019-02-19 22:45:51 +00: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
Ivan Tashkinov
04ee877a20 [#468] Added OAuth scopes-specific tests. 2019-02-19 22:28:21 +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
ad2cf4fd86 Add test for mastodon muting endpoints 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
href
f4bfc628ca
Player: allow styles on CSP, loop videos 2019-02-19 18:56:57 +01:00
href
aa9af1d639
CSP: Allow iframes on embed player 2019-02-19 18:19:13 +01:00
Mark Felder
2d21ea1a0e Merge branch 'develop' into fix/twittercards 2019-02-19 16:58:28 +00:00
href
10a11f083c
Embed player suitable for Twitter Cards 2019-02-19 17:47:48 +01: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