Commit Graph

9165 Commits

Author SHA1 Message Date
lain c845820911 Notifications: Create a chat notification. 2020-04-17 16:55:01 +02:00
lain 8c2c325598 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-04-17 15:51:24 +02:00
rinpatch 6936854878 Merge branch 'bugfix/1695-user_emoji_miration' into 'develop'
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering

Closes #1695

See merge request pleroma/pleroma!2398
2020-04-17 13:40:25 +00:00
lain 372614cfd3 ChatView: Add a mastodon api representation of the recipient. 2020-04-17 15:37:54 +02:00
Haelwenn (lanodan) Monnier 46f051048f
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering 2020-04-17 14:32:15 +02:00
lain d45ae64858 ChatController: Use OAuth scopes. 2020-04-17 13:04:46 +02:00
Haelwenn 09bd1d12c1 Merge branch 'sync-changelog' into 'develop'
Move changelog entries to unreleased section

See merge request pleroma/pleroma!2397
2020-04-17 09:39:29 +00:00
Alexander Strizhakov 4d22b100b7
move changelogs entries to unreleased section 2020-04-17 12:33:11 +03:00
Haelwenn a17bfb5fab Merge branch 'feature/1584-client-captcha-options' into 'develop'
Creating trusted app from adminFE & mix task

Closes #1584

See merge request pleroma/pleroma!2252
2020-04-17 09:19:35 +00:00
Haelwenn d8142ee6fe Merge branch 'fix/1694-transfer-task-fix' into 'develop'
Fix for logger configuration

Closes #1694

See merge request pleroma/pleroma!2396
2020-04-17 09:02:10 +00:00
Haelwenn 9c76d70a47 Merge branch 'feature/1677-need_reboot-flag-endpoint' into 'develop'
Added need_reboot endpoint to admin api

Closes #1677

See merge request pleroma/pleroma!2373
2020-04-17 08:55:46 +00:00
Alexander Strizhakov 304ea09f4c
fix for logger configuration 2020-04-17 08:42:48 +03:00
rinpatch badd888ccb Merge branch 'authenticated-api-oauth-check-enforcement' into 'develop'
Enforcement of OAuth scopes check for authenticated API endpoints

See merge request pleroma/pleroma!2349
2020-04-16 21:58:57 +00:00
rinpatch 28bcde5d98 Merge branch 'fix/1691-feed-render' into 'develop'
Fix for use of `published` field from different entities

Closes #1691

See merge request pleroma/pleroma!2395
2020-04-16 18:38:58 +00:00
rinpatch 0ddee13c83 Merge branch 'features/remove-user-source_data' into 'develop'
User: remove source_data

Closes #820

See merge request pleroma/pleroma!2339
2020-04-16 18:37:56 +00:00
rinpatch 942d7467ca Merge branch 'develop' into features/remove-user-source_data 2020-04-16 21:28:52 +03:00
lain f8c3ae7a62 ChatController: Handle pagination. 2020-04-16 18:43:31 +02:00
lain e983f70884 ChatMessagesHandling: Strip HTML of incoming messages. 2020-04-16 17:50:24 +02:00
Alexander Strizhakov 4d330d9df1
fix for use of published from different entities 2020-04-16 18:05:36 +03:00
rinpatch 252528a4b9 Merge branch 'refactor/remove-upgrade-changeset' into 'develop'
Remove User.upgrade_changeset in favor of remote_user_creation

See merge request pleroma/pleroma!2368
2020-04-16 14:59:11 +00:00
rinpatch 77ee64b993 user: remove blank? 2020-04-16 17:54:57 +03:00
lain 41fdcb7282 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-04-16 15:28:08 +02:00
lain ca598e9c27 AccountView: Return user ap_id. 2020-04-16 15:27:35 +02:00
lain e2ced04917 ChatMessages: Better validation. 2020-04-16 15:21:47 +02:00
Alexander Strizhakov 72ef6cc4f2
added need_reboot endpoint to admin api 2020-04-16 16:03:26 +03:00
lain 3d4eca5dd4 CommonAPI: Escape HTML for chat messages. 2020-04-16 12:56:29 +02:00
lain 2b57f73b77 Merge branch 'small-fix-rewrite_policy' into 'develop'
small fix in the rewrite_policy example

See merge request pleroma/pleroma!2391
2020-04-16 09:38:24 +00:00
Ivan Tashkinov bde1189c34 [#2349] Made :skip_plug/2 prevent plug from being executed even if explicitly called. Refactoring. Tests. 2020-04-15 21:19:16 +03:00
Ilja aa0a4a1e78 small fix in the rewrite_policy example 2020-04-15 19:03:27 +02:00
lain 6ace22b56a Chat: Add views, don't return them in timeline queries. 2020-04-15 18:23:16 +02:00
Ivan Tashkinov bedf92e064 Merge remote-tracking branch 'remotes/origin/develop' into authenticated-api-oauth-check-enforcement 2020-04-15 19:20:34 +03:00
Haelwenn b1c1d2e5e1 Merge branch 'fix/1659-rate-limiter' into 'develop'
remote_ip plug adds remote_ip_found flag

Closes #1659

See merge request pleroma/pleroma!2390
2020-04-15 15:26:55 +00:00
lain 44bfb491ea Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-04-15 14:41:43 +02:00
Alexander Strizhakov 22bde21c4f
remote_ip plug adds remote_ip_found flag 2020-04-15 15:27:34 +03:00
rinpatch ad8630b95a Merge branch 'uploads-csp-changes' into 'develop'
Uploads: Sandbox them in the CSP.

See merge request pleroma/pleroma!2389
2020-04-15 10:15:15 +00:00
lain 6bc76df287 Uploads: Sandbox them in the CSP. 2020-04-15 12:05:22 +02:00
rinpatch 96eae62995 Merge branch 'fix/openapi-form-mimetype' into 'develop'
openapi: add application/x-www-form-urlencoded to body types

Closes #1683

See merge request pleroma/pleroma!2387
2020-04-14 22:01:24 +00:00
rinpatch cc4ff19e34 openapi: add application/x-www-form-urlencoded to body types
Closes #1683
2020-04-15 00:49:21 +03:00
feld 6c3e09fbce Merge branch 'fix/richmedia-oban-error' into 'develop'
Attempt at fixing Oban not receiving :ok from RichMediaHelper job

Closes #1684

See merge request pleroma/pleroma!2377
2020-04-14 17:05:17 +00:00
Mark Felder 3bf78f2be7 Fix Oban not receiving :ok from RichMediaHelper job 2020-04-14 11:43:53 -05:00
lain c02e6ceea5 Merge branch 'revert-60cc7d6c' into 'develop'
Revert "Merge branch 'issue/1276' into 'develop'"

See merge request pleroma/pleroma!2384
2020-04-14 16:32:34 +00:00
lain 4576520461 Revert "Merge branch 'issue/1276' into 'develop'"
This reverts merge request !1877
2020-04-14 16:32:22 +00:00
lain 3677a1e578 Merge branch 'revert-13a7105b' into 'develop'
Revert "Merge branch 'marker-update-fix' into 'develop'"

See merge request pleroma/pleroma!2383
2020-04-14 16:31:41 +00:00
lain 7c060432fc Revert "Merge branch 'marker-update-fix' into 'develop'"
This reverts merge request !2380
2020-04-14 16:31:30 +00:00
feld bf3afbc1a1 Merge branch 'logger-configuration' into 'develop'
Fix for logger configuration through admin-fe

See merge request pleroma/pleroma!2365
2020-04-14 15:11:25 +00:00
lain 13a7105b21 Merge branch 'marker-update-fix' into 'develop'
Marker update migration: Don't try to update virtual field.

See merge request pleroma/pleroma!2380
2020-04-14 13:17:44 +00:00
lain 5fc6ce30ac Merge branch 'chore/spelling' into 'develop'
Fix spelling in log message

See merge request pleroma/pleroma!2378
2020-04-14 13:07:57 +00:00
lain d8b12ffd59 Marker update migration: Don't try to update virtual field. 2020-04-14 15:06:09 +02:00
lain 2eae5793cd Merge branch 'fix/issue_1679' into 'develop'
[#1679] fixed  logs

See merge request pleroma/pleroma!2379
2020-04-14 11:08:33 +00:00
Haelwenn 60cc7d6c9a Merge branch 'issue/1276' into 'develop'
[#1276] An endpoint for getting unread notification count

Closes #1276

See merge request pleroma/pleroma!1877
2020-04-14 06:38:56 +00:00