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 |
|
Haelwenn
|
7c7a6509b9
|
Merge branch 'hotfix/preload-tests-nodeinfo' into 'develop'
nodeinfo: Fix MRF transparency
See merge request pleroma/pleroma!2689
|
2020-06-26 03:48:25 +00:00 |
|
Haelwenn (lanodan) Monnier
|
d6c958b4c2
|
nodeinfo: Fix MRF transparency
|
2020-06-26 05:33:59 +02:00 |
|
feld
|
8288419686
|
Merge branch 'preload-data' into 'develop'
Preload data into index.html
Closes #1660
See merge request pleroma/pleroma!2381
|
2020-06-25 21:35:39 +00:00 |
|
feld
|
2e39fbe02e
|
Merge branch 'mastoapi-omitted' into 'develop'
MastoAPI differences: Document not implemented features
See merge request pleroma/pleroma!2687
|
2020-06-25 21:25:02 +00:00 |
|
feld
|
bb275c4985
|
Merge branch 'update/admin-fe-20200625' into 'develop'
Update AdminFE build
See merge request pleroma/pleroma!2688
|
2020-06-25 20:09:19 +00:00 |
|
Mark Felder
|
d9e4623628
|
Update AdminFE build
|
2020-06-25 14:55:00 -05:00 |
|
Mark Felder
|
433c01b370
|
Merge branch 'develop' into refactor/notification_settings
|
2020-06-25 14:26:21 -05:00 |
|
Alex Gleason
|
28d4e60f66
|
MastoAPI differences: Document not implemented features
|
2020-06-25 12:32:06 -05:00 |
|
lain
|
1d0804b49f
|
Merge branch 'chore/remove-reference-to-distsn' into 'develop'
Remove reference to defunct distsn.org
See merge request pleroma/pleroma!2675
|
2020-06-25 10:42:57 +00:00 |
|
lain
|
04abee782b
|
AntiSpamLinkPolicy: Exempt local users.
|
2020-06-25 12:40:39 +02:00 |
|
lain
|
f585622f85
|
Apply suggestion to config/description.exs
|
2020-06-25 10:17:16 +00:00 |
|
lain
|
1cd1977c0f
|
Merge branch 'issue/1872-ex_aws' into 'develop'
[#1872] use Pleroma.HTTP for ExAws.S3
See merge request pleroma/pleroma!2683
|
2020-06-25 10:14:19 +00:00 |
|
lain
|
84f9ca1956
|
Blocking: Don't federate if the options is set.
|
2020-06-25 12:03:14 +02:00 |
|
lain
|
44bb7cfccd
|
ActivityPub: Remove block.
|
2020-06-25 11:51:33 +02:00 |
|
lain
|
8cfb58a8c0
|
AccountController: Extract blocking to CommonAPI.
|
2020-06-25 11:44:04 +02:00 |
|
lain
|
e38293c8f1
|
Transmogrifier: Switch to pipeline for Blocks.
|
2020-06-25 11:33:54 +02:00 |
|
lain
|
89e5b2046b
|
ObjectValidator: Basic Block support.
|
2020-06-25 11:13:35 +02:00 |
|
lain
|
d137f934df
|
Transmogrifier Test: Extract block handling.
|
2020-06-25 10:54:00 +02:00 |
|
lain
|
0e26ef2ab9
|
Merge branch 'fix/following-request-from-deactivated' into 'develop'
Filter outstanding follower requests from deactivated accounts
Closes #1771
See merge request pleroma/pleroma!2682
|
2020-06-25 06:50:44 +00:00 |
|
Maksim Pechnikov
|
439a1a0218
|
added wrapper Pleroma.HTTP for ExAws.S3
|
2020-06-25 07:12:29 +03:00 |
|
Mark Felder
|
67ab580553
|
Filter outstanding follower requests from deactivated accounts
|
2020-06-24 17:18:53 -05:00 |
|
Maksim Pechnikov
|
cc837f9d15
|
fixed config/descpiption.exs
|
2020-06-24 21:21:33 +03:00 |
|
lain
|
ae94fcc95f
|
Merge branch 'fix-emoji-pagination' into 'develop'
Fix for emoji pagination in pack show
See merge request pleroma/pleroma!2681
|
2020-06-24 15:23:20 +00:00 |
|
Alexander Strizhakov
|
aae1af8cf1
|
fix for emoji pagination in pack show
|
2020-06-24 18:06:30 +03:00 |
|
lain
|
4c5fb831b3
|
Status schema: Add parent_visible.
|
2020-06-24 14:33:00 +02:00 |
|
lain
|
1702239428
|
Changelog: Put info under API header.
|
2020-06-24 14:30:12 +02:00 |
|
lain
|
79ee914bc2
|
Changelog: Add info about parent_visible field
|
2020-06-24 13:32:14 +02:00 |
|
lain
|
637bae42b4
|
Docs: Document added parent_visible field.
|
2020-06-24 13:31:42 +02:00 |
|
lain
|
35f6770436
|
StatusView: Add pleroma.parent_visible
|
2020-06-24 13:29:08 +02:00 |
|
lain
|
88ccade1cb
|
Merge branch 'feature/admin-api-status-count-per-instance' into 'develop'
admin api status count per instance
See merge request pleroma/pleroma!2500
|
2020-06-24 10:42:07 +00:00 |
|
lain
|
510031ece2
|
Merge branch 'issue/1872-updated-tzdata' into 'develop'
[#1872] use Pleroma.HTTP for Tzdata
See merge request pleroma/pleroma!2678
|
2020-06-24 09:00:17 +00:00 |
|
lain
|
65f3eb333b
|
Apply suggestion to test/http/tzdata_test.exs
|
2020-06-24 08:50:33 +00:00 |
|
Maksim Pechnikov
|
721fc7c554
|
added wrapper Pleroma.HTTP for Tzdata.HTTPClient
|
2020-06-24 09:12:32 +03:00 |
|
feld
|
b4a502fc8b
|
Merge branch 'moving-mrf-namespace-migration-fix' into 'develop'
Moving to mrf namespace migration fix
See merge request pleroma/pleroma!2676
|
2020-06-23 18:51:37 +00:00 |
|
Maksim Pechnikov
|
71e233268a
|
oban 2.0-rc2
|
2020-06-23 21:47:01 +03:00 |
|
lain
|
98af7b59e4
|
Merge branch 'update-validator' into 'develop'
Update validator
See merge request pleroma/pleroma!2668
|
2020-06-23 18:10:33 +00:00 |
|
Roman Chvanikov
|
1471b70ef1
|
Merge develop
|
2020-06-23 20:56:55 +03:00 |
|