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
|
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 |
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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
|
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
|
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 |
|
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
|
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 |
|
|
|
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 |
|
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 |
|
Alexander Strizhakov
|
cb96c82f70
|
moving to mrf namespace migration fix
|
2020-06-23 20:28:48 +03:00 |
|
Haelwenn
|
c7d69e9256
|
Merge branch 'feature/1631-redesign-mrf-configuration' into 'develop'
Moving mrf settings from instance to separate mrf group
Closes #1631
See merge request pleroma/pleroma!2320
|
2020-06-23 16:38:27 +00:00 |
|
Mark Felder
|
54039100fe
|
Remove reference to defunct distsn.org
|
2020-06-23 11:17:26 -05:00 |
|
lain
|
b7f297f0bd
|
Merge branch 'issue/1798' into 'develop'
[#1798] fixed migration the settings to DB
See merge request pleroma/pleroma!2655
|
2020-06-23 10:54:15 +00:00 |
|
lain
|
aee815b478
|
ObjectValidator: Clarify type of object.
|
2020-06-23 12:37:05 +02:00 |
|
lain
|
59e2a1018a
|
Merge branch 'fix_1586_provide_index_md' into 'develop'
Fix 1586 provide index md
See merge request pleroma/pleroma!2669
|
2020-06-23 10:06:47 +00:00 |
|
lain
|
adc199c6a8
|
ActivityPubControllerTest: Capture error log
|
2020-06-23 12:04:51 +02:00 |
|
lain
|
d93e01137b
|
ActivityPubControllerTest: Testing changes.
|
2020-06-23 11:43:20 +02:00 |
|
lain
|
2737809bbf
|
An act of desperation.
|
2020-06-23 11:03:32 +02:00 |
|
lain
|
2c603f2009
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-validator
|
2020-06-23 10:17:12 +02:00 |
|
Maksim Pechnikov
|
84aa9c78dd
|
fix tests
|
2020-06-23 09:08:24 +03:00 |
|
Maksim Pechnikov
|
2715c40e1d
|
added tests
|
2020-06-23 06:59:00 +03:00 |
|
Haelwenn
|
3875a507d4
|
Merge branch '@doc/apc2s-upload-media' into 'develop'
ActivityPubController: Update upload_media @doc
See merge request pleroma/pleroma!2673
|
2020-06-23 03:04:27 +00:00 |
|
Haelwenn (lanodan) Monnier
|
c116b6d6d6
|
ActivityPubController: Update upload_media @doc
Small cherry-pick from https://git.pleroma.social/pleroma/pleroma/-/merge_requests/1810
|
2020-06-23 04:42:44 +02:00 |
|
Haelwenn
|
d21ef5e66b
|
Merge branch 'fix/missing-default-instance_thumbnail_config' into 'develop'
Add missing default config value for :instance, instance_thumbnail
See merge request pleroma/pleroma!2672
|
2020-06-23 01:55:33 +00:00 |
|
Mark Felder
|
df5e048cbb
|
Do not need a function to provide fallback value with default defined in config.exs
|
2020-06-22 17:39:02 -05:00 |
|
Mark Felder
|
bf8310f380
|
Add missing default config value for :instance, instance_thumbnail
Follows up on b7fc61e17b
|
2020-06-22 17:35:02 -05:00 |
|
Haelwenn
|
98f014d3be
|
Merge branch 'warning/mastofe-settings-blob' into 'develop'
Add warning against parsing/reusing MastoFE settings blob
See merge request pleroma/pleroma!2671
|
2020-06-22 21:59:21 +00:00 |
|
Haelwenn (lanodan) Monnier
|
8f6ba4b22f
|
Add warning against parsing/reusing MastoFE settings blob
|
2020-06-22 23:45:29 +02:00 |
|
lain
|
46f7e51b27
|
Merge branch 'add-muted-to-notifications' into 'develop'
Add `pleroma.is_muted` property to notifications
Closes #1812
See merge request pleroma/pleroma!2670
|
2020-06-22 15:40:09 +00:00 |
|
Egor Kislitsyn
|
b3a549e916
|
Update NotificationOperation spec
|
2020-06-22 19:18:33 +04:00 |
|
Egor Kislitsyn
|
7e6f43c0d7
|
Add is_muted to notifications
|
2020-06-22 19:03:04 +04:00 |
|
Maksim Pechnikov
|
b0a40fc2e4
|
added verify RUM settings before start app
|
2020-06-22 17:27:49 +03:00 |
|
