lain
|
09c5991f82
|
Apply suggestion to lib/pleroma/notification.ex
|
2020-06-29 16:04:14 +00:00 |
|
|
lain
|
b2b332984c
|
Merge branch 'fix/cast-and-validate' into 'develop'
Fix CastAndValidate plug
Closes #1889
See merge request pleroma/pleroma!2704
|
2020-06-29 15:59:40 +00:00 |
|
|
lain
|
c01f4ca07f
|
Notification: Remove TODO.
|
2020-06-29 17:52:56 +02:00 |
|
|
lain
|
90083a754d
|
Notifications: Never return nil in the notification list.
|
2020-06-29 17:48:18 +02:00 |
|
|
Egor Kislitsyn
|
3aa04b81c4
|
Test default "content-type" for CastAndValidate
|
2020-06-29 19:47:04 +04:00 |
|
|
feld
|
344a9b28b3
|
Merge branch 'fix/swoosh-sendmail' into 'develop'
updated swoosh
See merge request pleroma/pleroma!2703
|
2020-06-29 15:24:39 +00:00 |
|
|
Egor Kislitsyn
|
979f02ec94
|
Fix CastAndValidate plug
|
2020-06-29 17:33:00 +04:00 |
|
|
Maksim Pechnikov
|
dc60b1ee58
|
updated swoosh
|
2020-06-29 16:27:01 +03:00 |
|
|
Egor Kislitsyn
|
67d92ac7b7
|
Remove /statusnet/config
|
2020-06-29 17:00:37 +04:00 |
|
|
lain
|
07ff2d62f4
|
Merge branch 'rich-media-parser-exclude-attachment-links' into 'develop'
excluding attachment links from RichMedia
See merge request pleroma/pleroma!2702
|
2020-06-29 12:44:58 +00:00 |
|
|
Egor Kislitsyn
|
8693e01799
|
Fix warning
|
2020-06-29 16:29:51 +04:00 |
|
|
Alexander Strizhakov
|
6512ef6879
|
excluding attachment links from RichMedia
|
2020-06-29 15:25:57 +03:00 |
|
|
Egor Kislitsyn
|
4a306720e8
|
Merge branch 'develop' into remove-twitter-api
|
2020-06-29 16:09:49 +04:00 |
|
|
lain
|
59540131c1
|
Credo fixes.
|
2020-06-29 14:09:03 +02:00 |
|
|
lain
|
f308196b75
|
Token Response: Remove empty file.
|
2020-06-29 13:52:50 +02:00 |
|
|
lain
|
e374872fe7
|
AccountOperation: Correctly describe create response.
|
2020-06-29 13:49:48 +02:00 |
|
|
lain
|
bb168ed94a
|
OAuth: Extract view-type functions to a view.
|
2020-06-29 13:39:09 +02:00 |
|
|
lain
|
651f269568
|
Merge branch 'avatar-removing' into 'develop'
UpdateCredentialsTest: Add test for removing profile images.
See merge request pleroma/pleroma!2701
|
2020-06-29 11:16:30 +00:00 |
|
|
lain
|
e64d08439e
|
UpdateCredentialsTest: Add test for removing profile images.
|
2020-06-29 12:40:23 +02:00 |
|
|
lain
|
8630a6c7f5
|
Preloaders: Use strings as keys.
|
2020-06-29 11:41:00 +02:00 |
|
|
lain
|
a19f8778af
|
User preloader: Put user info at correct key
|
2020-06-29 11:06:20 +02:00 |
|
|
lain
|
577da132da
|
Merge branch '1031-parent-visible' into 'develop'
Resolve "Add `pleroma.parent_visible` to the status view"
Closes #1031
See merge request pleroma/pleroma!2679
|
2020-06-29 08:39:51 +00:00 |
|
|
lain
|
e229640372
|
Merge branch 'openapi/schema-account-pleromafields' into 'develop'
ApiSpec.Schemas.Account: import description from differences_in_mastoapi_responses
See merge request pleroma/pleroma!2700
|
2020-06-29 08:32:56 +00:00 |
|
|
Haelwenn (lanodan) Monnier
|
9f51b03eed
|
ApiSpec.Schemas.Account: import description from differences_in_mastoapi_responses
|
2020-06-29 03:31:33 +02:00 |
|
|
Haelwenn
|
cf1bd386c6
|
Merge branch 'docs/mastoapi-account-fields' into 'develop'
differences_in_mastoapi_responses: Update account fields
See merge request pleroma/pleroma!2699
|
2020-06-29 00:56:02 +00:00 |
|
|
Haelwenn (lanodan) Monnier
|
efb5d64e50
|
differences_in_mastoapi_responses: Update account fields
|
2020-06-29 02:40:32 +02:00 |
|
|
lain
|
4b32bc80de
|
Merge branch 'reduce-preloading-defaults' into 'develop'
Config: Reduce default preloaders to configuration endpoints.
See merge request pleroma/pleroma!2697
|
2020-06-27 10:40:29 +00:00 |
|
|
lain
|
0313520cd2
|
Config: Reduce default preloaders to configuration endpoints.
Fetching the timeline is a bit heavy to do by default.
|
2020-06-27 12:18:37 +02:00 |
|
|
lain
|
dc31fbfe6c
|
Merge branch 'fix/fetcher-transmogrifier-error' into 'develop'
object/fetcher: Pass full Transmogrifier error
See merge request pleroma/pleroma!2696
|
2020-06-27 09:41:35 +00:00 |
|
|
Alexander Strizhakov
|
f89390110b
|
added tab & labels for mrf policies
|
2020-06-27 12:18:34 +03:00 |
|
|
Mark Felder
|
ce85db41a3
|
Lint
|
2020-06-26 14:35:04 -05:00 |
|
|
Haelwenn (lanodan) Monnier
|
1566543bec
|
object/fetcher: Pass full Transmogrifier error
|
2020-06-26 20:10:47 +02:00 |
|
|
Haelwenn (lanodan) Monnier
|
244655e884
|
MastoAPI: Show source field when deleting
|
2020-06-26 19:52:20 +02:00 |
|
|
Mark Felder
|
76313e8162
|
Document breaking change of hide_notification_details setting
|
2020-06-26 12:48:05 -05:00 |
|
|
Mark Felder
|
69848d5c97
|
Rename notification "privacy_option" setting
|
2020-06-26 12:45:46 -05:00 |
|
|
Haelwenn
|
bf1c5e255a
|
Merge branch 'block-handling' into 'develop'
Handle blocks with the pipeline
See merge request pleroma/pleroma!2685
|
2020-06-26 17:41:00 +00:00 |
|
|
Haelwenn
|
09478c9cf7
|
Merge branch '1258-anti-link-spam-exemption' into 'develop'
AntiSpamLinkPolicy: Exempt local users.
Closes #1258
See merge request pleroma/pleroma!2686
|
2020-06-26 16:59:46 +00:00 |
|
|
Mark Felder
|
fd5e797379
|
Simplify notification filtering settings further
|
2020-06-26 11:24:28 -05:00 |
|
|
Mark Felder
|
b950fb01db
|
Merge branch 'develop' into refactor/notification_settings
|
2020-06-26 10:23:19 -05:00 |
|
|
lain
|
a5bbfa21a1
|
StaticFE: Prioritize json in requests.
|
2020-06-26 16:27:39 +02:00 |
|
|
lain
|
f378e93bf4
|
AccountController: Return scope in proper format.
|
2020-06-26 16:15:27 +02:00 |
|
|
lain
|
a2002ebb63
|
Preloading: Fix nodeinfo url.
|
2020-06-26 14:48:23 +02:00 |
|
|
lain
|
4a7a34ae8c
|
Preloading: Return correct data for statusnet stuff.
|
2020-06-26 14:47:38 +02:00 |
|
|
Alexander Strizhakov
|
e7bc0273e5
|
additional data to MRF policies in descriptions
|
2020-06-26 15:22:08 +03:00 |
|
|
lain
|
6db9f7cdb3
|
Merge branch 'fix-chats' into 'develop'
Nodeinfo: Add chat information back in.
See merge request pleroma/pleroma!2691
|
2020-06-26 11:09:37 +00:00 |
|
|
lain
|
7ed2296416
|
Nodeinfo: Add chat information back in.
|
2020-06-26 13:04:15 +02:00 |
|
|
lain
|
15a8b70318
|
User: Don't unfollow on block when the relevant setting is set.
|
2020-06-26 12:06:00 +02:00 |
|
|
lain
|
c3383d4fab
|
BlockValidator: Restore old behavior for incoming blocks.
|
2020-06-26 11:58:40 +02:00 |
|
|
Alexander Strizhakov
|
91cd023720
|
Pleroma.Upload.Filter.Mogrify args description
|
2020-06-26 09:03:07 +03:00 |
|
|
Haelwenn (lanodan) Monnier
|
27c33f216a
|
activity_draft: Add source field
|
2020-06-26 05:48:25 +02:00 |
|