lain
|
a5bbfa21a1
|
StaticFE: Prioritize json in requests.
|
2020-06-26 16:27:39 +02:00 |
|
lain
|
7ed2296416
|
Nodeinfo: Add chat information back in.
|
2020-06-26 13:04:15 +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 |
|
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
|
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 |
|
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 |
|
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 |
|
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
|
7e6f43c0d7
|
Add is_muted to notifications
|
2020-06-22 19:03:04 +04:00 |
|
lain
|
59bdef0c33
|
Merge branch 'feature/1739-account-endpoints' into 'develop'
account visibility in masto api
Closes #1739
See merge request pleroma/pleroma!2488
|
2020-06-22 12:37:10 +00:00 |
|
lain
|
8b5bdd164e
|
Merge branch 'fix/1825-admin-api-error-codes' into 'develop'
Proper error codes for error in adminFE
Closes #1825
See merge request pleroma/pleroma!2665
|
2020-06-22 12:25:12 +00:00 |
|
lain
|
e785cd5cae
|
ActivityPub: Remove update and switch to pipeline.
|
2020-06-22 13:59:45 +02:00 |
|
rinpatch
|
c75ba63bef
|
Merge branch '1865-media-only' into 'develop'
Resolve "/api/v1/accounts/:id/statuses?only_media=true returns media that is not owned"
Closes #1865
See merge request pleroma/pleroma!2650
|
2020-06-22 11:34:07 +00:00 |
|
lain
|
1e7ca24430
|
Update Handling Test: Fix for re-used update ids.
|
2020-06-22 13:23:21 +02:00 |
|
lain
|
31a4d42ce0
|
SideEffects: Handle user updating.
|
2020-06-22 13:15:37 +02:00 |
|
rinpatch
|
282f492cd5
|
Merge branch '1883-mrf-chat' into 'develop'
HellthreadPolicy: Restrict to Notes and Articles.
Closes #1883
See merge request pleroma/pleroma!2666
|
2020-06-22 10:00:13 +00:00 |
|
lain
|
93ae1c8bd3
|
Merge branch 'feature/1854-emoji-pagination' into 'develop'
Emoji and packs pagination
Closes #1854
See merge request pleroma/pleroma!2658
|
2020-06-22 08:41:09 +00:00 |
|
lain
|
35e9282ffd
|
HellthreadPolicy: Restrict to Notes and Articles.
|
2020-06-22 10:35:11 +02:00 |
|
Alexander Strizhakov
|
c5863438ba
|
proper error codes for error in adminFE
|
2020-06-20 13:53:57 +03:00 |
|
lain
|
31761340fe
|
Merge branch 'feature/support-bot-field-in-update-credentials' into 'develop'
Support 'bot' field in account update_credentials
Closes #1600 and #1467
See merge request pleroma/pleroma!2662
|
2020-06-20 09:57:12 +00:00 |
|
lain
|
7d542450b1
|
Merge branch 'develop' into '1865-media-only'
# Conflicts:
# CHANGELOG.md
|
2020-06-20 09:33:18 +00:00 |
|
Alexander Strizhakov
|
1a704e1f1e
|
fix for packs pagination
|
2020-06-20 10:56:28 +03:00 |
|
Haelwenn (lanodan) Monnier
|
3d4cfc9c5f
|
Stop filling conversation field on incoming objects (legacy, unused)
conversation field is still set for outgoing federation for compatibility.
|
2020-06-20 00:08:26 +02:00 |
|
|
|
f928267773
|
Merge branch 'issue/1855' into 'develop'
#1855 MediaProxy cache invalidation via Admin API
See merge request pleroma/pleroma!2648
|
2020-06-19 20:38:22 +00:00 |
|
Sergey Suprunenko
|
b63646169d
|
Add support for bot field in update_credentials
|
2020-06-19 21:18:07 +02:00 |
|
lain
|
75670a99e4
|
UpdateValidator: Only allow updates from the user themselves.
|
2020-06-19 16:38:57 +02:00 |
|
lain
|
abdb540d45
|
ObjectValidators: Add basic UpdateValidator.
|
2020-06-19 15:30:30 +02:00 |
|
Ivan Tashkinov
|
5237a2df9f
|
[#1873] Fixes missing :offset pagination param support. Added pagination support for hashtags search.
|
2020-06-19 16:14:06 +03:00 |
|
lain
|
7e488cd4a7
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-validator
|
2020-06-19 14:56:50 +02:00 |
|
Alexander Strizhakov
|
3e3f9253e6
|
adding overall count for packs and files
|
2020-06-19 10:17:24 +03:00 |
|
Alexander Strizhakov
|
4975ed86bc
|
emoji pagination for pack show action
|
2020-06-18 18:50:03 +03:00 |
|
Alexander Strizhakov
|
3becdafd33
|
emoji packs pagination
|
2020-06-18 14:32:21 +03:00 |
|
Maksim Pechnikov
|
4044f24e2e
|
fix test
|
2020-06-18 05:06:28 +03:00 |
|
Mark Felder
|
2731ea1334
|
Change references from "deleted_urls" to "banned_urls" as nothing is handled via media deletions anymore; all actions are manual operations by an admin to ban the url
|
2020-06-17 13:13:55 -05:00 |
|
Mark Felder
|
3462d4b995
|
Merge branch 'develop' into issue/1855
|
2020-06-17 12:50:06 -05:00 |
|
lain
|
d772361e62
|
Merge branch 'fix/1787-mogrify-args' into 'develop'
Moving custom ecto types in context folders
See merge request pleroma/pleroma!2652
|
2020-06-17 15:53:24 +00:00 |
|
Maksim
|
96493da7bd
|
Apply suggestion to test/web/media_proxy/invalidation_test.exs
|
2020-06-17 13:14:01 +00:00 |
|
Maksim
|
078d687e6e
|
Apply suggestion to test/web/media_proxy/media_proxy_controller_test.exs
|
2020-06-17 12:58:50 +00:00 |
|
Maksim
|
2991aae4c4
|
Apply suggestion to test/web/media_proxy/invalidations/script_test.exs
|
2020-06-17 12:58:38 +00:00 |
|
Maksim
|
11b22a4229
|
Apply suggestion to test/web/media_proxy/invalidations/http_test.exs
|
2020-06-17 12:58:33 +00:00 |
|
Maksim
|
6d33a3a51b
|
Apply suggestion to test/web/admin_api/controllers/media_proxy_cache_controller_test.exs
|
2020-06-17 12:58:28 +00:00 |
|
Maksim
|
793a53f1ec
|
Apply suggestion to test/web/admin_api/controllers/media_proxy_cache_controller_test.exs
|
2020-06-17 12:58:16 +00:00 |
|
Maksim
|
1b45bc7b2a
|
Apply suggestion to test/web/admin_api/controllers/media_proxy_cache_controller_test.exs
|
2020-06-17 12:58:08 +00:00 |
|
rinpatch
|
4ec2fb967e
|
Merge branch 'features/users-raw_bio' into 'develop'
User: Add raw_bio, storing unformatted bio
See merge request pleroma/pleroma!2326
|
2020-06-17 10:34:23 +00:00 |
|
Haelwenn
|
b536e57124
|
Merge branch '1866-last-status-stuff' into 'develop'
Resolve "/api/v1/conversations returns the wrong `last_status`"
Closes #1866
See merge request pleroma/pleroma!2647
|
2020-06-16 18:10:00 +00:00 |
|
Alexander Strizhakov
|
b66e6eb521
|
fixes for tests
|
2020-06-16 19:03:45 +03:00 |
|
