sjw
/
pleroma
mirror of https://git.pleroma.social/sjw/pleroma.git
1
0
Fork 0
Code Issues Releases Wiki Activity
4,712 Commits 136 Branches 24 Tags 254 MiB
Commit Graph

1253 Commits

Author SHA1 Message Date
Karen Konou ccc891561b fix tests 2019-04-23 19:58:03 +02:00
Maxim Filippov a5988ad490 Store Question as its own activity 2019-04-22 01:13:54 +03:00
Maxim Filippov 86aaa6083b Merge branch 'develop' into feature/add-polls 2019-04-19 10:02:12 +02:00
Alexander Strizhakov ada384207b typo fix 
docs for RelMe provider
 2019-04-19 07:50:21 +00:00
lambda 218d96a26b Merge branch '923_oauth_consumer_refactoring_ci' into 'develop' 
OAuth consumer params handling refactoring

See merge request pleroma/pleroma!1047
 2019-04-19 07:49:26 +00:00
William Pitcock 36f78c6dcd activitypub: fix filtering of boosts from blocked users 2019-04-17 22:27:59 +00:00
William Pitcock 2140e164d7 activitypub: properly filter out transitive activities concerning blocked users 2019-04-17 20:05:09 +00:00
kaniini 73df3046e0 Merge branch 'feature/788-separate-email-addresses' into 'develop' 
Feature/788 separate email addresses

Closes #788

See merge request pleroma/pleroma!1040
 2019-04-16 18:44:07 +00:00
Haelwenn cde7711b12 Merge branch 'bugfix/relax-spam-protection' into 'develop' 
activitypub: allow indirect messages from users being followed at a personal inbox

See merge request pleroma/pleroma!1069
 2019-04-16 18:38:11 +00:00
Normandy d4a749cfb2 Handle new-style mastodon follow lists 
Fixes https://git.pleroma.social/pleroma/pleroma/issues/814
 2019-04-16 18:35:38 +00:00
William Pitcock 750b369d04 activitypub: allow indirect messages from users being followed at a personal inbox 2019-04-16 18:31:12 +00:00
Maxim Filippov 1142379a1c Merge branch 'develop' into feature/add-polls 2019-04-15 13:07:39 +02:00
lambda 56956de6fa Merge branch 'fix/status-reblogged' into 'develop' 
Assign reblogged in the Mastodon reblog status view

Closes #812

See merge request pleroma/pleroma!1057
 2019-04-15 10:26:23 +00:00
lambda f358295cbe Merge branch 'unfollow-oneself' into 'develop' 
Consistent response for self follow/unfollow

Closes #819

See merge request pleroma/pleroma!1061
 2019-04-15 10:24:37 +00:00
eugenijm 27d78dc526 Use User.get_cached_by* 2019-04-15 12:37:49 +03:00
rinpatch 5d73dca064 Remove inReplyToStatusId 2019-04-15 11:50:36 +03:00
eugenijm 507e7821e3 Handle follow/unfollow directed to themselves 2019-04-15 10:21:18 +03:00
eugenijm 679a8ef629 Assign reblogged in the Mastodon reblog status view 2019-04-14 11:35:15 +03:00
Maxim Filippov 6db5a07dfa Store question inside Create activity 2019-04-13 21:39:54 +02:00
Alex S c5d0fffeaf naming fix 2019-04-13 14:55:42 +07:00
Alex S c349573791 Merge develop to 788-separate-email-addresses 
Merge conflicts:
test/web/twitter_api/twitter_api_test.exs
test/web/twitter_api/twitter_api_controller_test.exs
test/web/admin_api/admin_api_controller_test.exs
 2019-04-13 12:24:38 +07:00
Maxim Filippov 9d7d108f89 Make polls work with latest mastofe 2019-04-13 00:11:20 +02:00
Maxim Filippov 7c257ad725 Respect poll limits for local actors 2019-04-12 16:47:25 +02:00
Maxim Filippov 3391b3572e Merge branch 'develop' into feature/add-polls 2019-04-12 15:08:56 +02:00
Maxim Filippov a8b8cf0fd7 Use Flake id to vote/fetch poll, but ap_id internally 2019-04-12 14:57:44 +02:00
lambda 184ae60b21 Merge branch 'bugfix/pleroma-email-naming' into 'develop' 
Make the filename and module name of Pleroma.Emails.* orthogonal

See merge request pleroma/pleroma!1029
 2019-04-12 10:41:09 +00:00
lambda 0a09692c7d Merge branch 'features/mastoapi/2.6.0-min_id-pagination' into 'develop' 
Features: mastoapi-2.6.0 `min_id` pagination

Closes #351

See merge request pleroma/pleroma!976
 2019-04-12 09:34:12 +00:00
Alexander Strizhakov 711ade961e adding destroy multiple for mastofe 2019-04-12 02:28:46 +00:00
Alexander Strizhakov e03d24af96 in_reply_to_id - null 2019-04-12 02:21:32 +00:00
Maxim Filippov 1568e48ef2 Support mastodon API 2019-04-12 02:25:04 +02:00
Ivan Tashkinov c3f12cf3c3 [#923] OAuth consumer params handling refactoring. 
Registration and authorization-related params are wrapped in "authorization" in order to reduce edge cases number and simplify handling logic.
 2019-04-10 21:40:38 +03:00
Alex S fe511a6c65 Merge branch 'develop' into feature/788-separate-email-addresses 2019-04-10 18:06:54 +07:00
Alex S fe13a1d78c adding notify_email setting for trigger emails 2019-04-10 17:57:41 +07:00
lambda e5d553aa45 Merge branch 'feature/767-multiple-use-invite-token' into 'develop' 
Feature/767 multiple use invite token

See merge request pleroma/pleroma!1032
 2019-04-10 10:10:08 +00:00
Sadposter be8350baa2
Merge branch 'develop' into feature/user-status-subscriptions 2019-04-10 10:44:54 +01:00
lambda c8440b5e0c Merge branch 'fix/emoji-api-nonsense' into 'develop' 
Change response format of /api/pleroma/emoji so it makes sense

See merge request pleroma/pleroma!1038
 2019-04-10 06:22:51 +00:00
Haelwenn (lanodan) Monnier 9c1b36856b
s/Pleroma.UserEmail/Pleroma.Emails.UserEmail/ 2019-04-10 06:33:20 +02:00
kaniini 97395e013e Merge branch 'notification-pleroma-settings' into 'develop' 
Notification controls

Closes #738

See merge request pleroma/pleroma!988
 2019-04-10 02:10:31 +00:00
Maxim Filippov 4c755a7a7f Add more tests 2019-04-10 01:42:17 +02:00
Maxim Filippov 657898e293 Merge branch 'develop' into feature/add-polls 2019-04-10 00:33:05 +02:00
rinpatch b57b43027c Change response format of /api/pleroma/emoji to the one that actually makes sense 2019-04-09 23:20:31 +03:00
Maxim Filippov 37f22f35b6 Fix all failing tests 2019-04-09 01:23:23 +02:00
Maxim Filippov 42482f0af0 Merge branch 'develop' into feature/add-polls 2019-04-08 17:26:47 +02:00
Alex S fee50636d0 removing not needed invite update 2019-04-08 20:08:16 +07:00
Egor Kislitsyn 9abf832b03 Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush 2019-04-08 18:48:10 +07:00
lambda e19590c93f Merge branch 'improve_upgrade_user_from_ap_id' into 'develop' 
Improve Transmogrifier.upgrade_user_from_ap_id/2

See merge request pleroma/pleroma!1019
 2019-04-08 11:42:20 +00:00
lambda fd45cab9ec Merge branch 'twitter_oauth' into 'develop' 
OAuth consumer (sign in / sign up with external provider)

See merge request pleroma/pleroma!923
 2019-04-08 11:41:50 +00:00
Alexander Strizhakov 36c0a10fdf adding language tag 2019-04-08 11:03:10 +00:00
lambda 23067908de Merge branch 'feature/770-add-emoji-tags' into 'develop' 
Feature/770 add emoji tags

See merge request pleroma/pleroma!998
 2019-04-08 09:50:00 +00:00
Egor Kislitsyn c3d5c3513a Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush 2019-04-08 16:46:59 +07:00