lain
|
9ad305209a
|
Merge branch 'bugfix/peertube-videos' into 'develop'
Fix getting videos from peertube
See merge request pleroma/pleroma!2728
|
2020-07-07 09:14:50 +00:00 |
Haelwenn
|
fa0fa4552f
|
Merge branch 'feature/1392-support-irreversible-filters' into 'develop'
Updates for Feature/1392 support irreversible filters
Closes #1392
See merge request pleroma/pleroma!2186
|
2020-07-07 08:23:49 +00:00 |
Haelwenn (lanodan) Monnier
|
fbb9743a70
|
Fix getting videos from peertube
|
2020-07-07 09:38:38 +02:00 |
Haelwenn
|
d81acb5f62
|
Merge branch 'description-limits' into 'develop'
Add limits to image descriptions
See merge request pleroma/pleroma!2724
|
2020-07-07 03:00:52 +00:00 |
lain
|
a6a12b241f
|
FollowValidator: Add basic validation.
|
2020-07-06 15:57:19 +02:00 |
lain
|
4e3b3998ad
|
BlockValidation test: Rename.
|
2020-07-06 15:44:35 +02:00 |
lain
|
eb87430803
|
ObjectValidator tests: Extract block validation tests.
|
2020-07-06 15:14:58 +02:00 |
lain
|
410c1fab31
|
ObjectValidator tests: Extract update validation tests.
|
2020-07-06 15:13:11 +02:00 |
lain
|
b2e1ea9226
|
ObjectValidation tests: Extract announce validation tests.
|
2020-07-06 15:11:49 +02:00 |
lain
|
bbaf108aee
|
ObjectValidator tests: Extract undo validation tests.
|
2020-07-06 15:09:41 +02:00 |
lain
|
168256dce9
|
ObjectValidation tests: Extract like validation tests.
|
2020-07-06 15:08:11 +02:00 |
lain
|
e6a13d97d0
|
ObjectValidation tests: Extract delete validation tests.
|
2020-07-06 15:05:02 +02:00 |
lain
|
60d4c6c91d
|
ObjectValidator tests: Extract emoji react testing
|
2020-07-06 15:02:35 +02:00 |
lain
|
e0baaa967c
|
ObjectValidator tests: Extract chat tests
|
2020-07-06 13:01:44 +02:00 |
lain
|
0aa4c20d78
|
ObjectValidator Test: Extract attachments.
|
2020-07-06 12:59:06 +02:00 |
lain
|
28feba8af4
|
Preloaders: Remove status_net preloader
|
2020-07-06 12:24:45 +02:00 |
lain
|
1963e143c5
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remove-twitter-api
|
2020-07-06 12:15:59 +02:00 |
lain
|
ed4f9f6a29
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1507-static-fe-prioritize-json
|
2020-07-06 12:07:56 +02:00 |
lain
|
208baf157a
|
ActivityPub: Add new 'capabilities' to user.
|
2020-07-06 11:38:40 +02:00 |
lain
|
74b88c0a8b
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information
|
2020-07-06 11:27:06 +02:00 |
lain
|
cc8b4e48d9
|
InstanceView: Add chat limit, description limit
|
2020-07-06 11:12:37 +02:00 |
Alexander Strizhakov
|
818f3c2393
|
test fixes
|
2020-07-06 09:30:43 +03:00 |
Sergey Suprunenko
|
8277b29790
|
Restrict thread statuses that contain user's irreversible filters
|
2020-07-06 09:30:39 +03:00 |
Sergey Suprunenko
|
4a8c26654e
|
Restrict statuses that contain user's irreversible filters
|
2020-07-06 09:28:21 +03:00 |
lain
|
cf56655614
|
Streamer: Don't filter out announce notifications.
|
2020-07-04 17:11:37 +02:00 |
Mark Felder
|
4695bdd81b
|
Merge branch 'develop' into issue/1790-updated-oban
|
2020-07-03 10:36:41 -05:00 |
lain
|
c2a052a346
|
Merge branch 'features/mastoapi-2.9.0-status_text' into 'develop'
MastoAPI 2.9.0: status text on deletion
See merge request pleroma/pleroma!2690
|
2020-07-03 15:06:33 +00:00 |
lain
|
d3efb50262
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/mastoapi-2.9.0-status_text
|
2020-07-03 16:44:31 +02:00 |
lain
|
945e75c8e8
|
SearchController: Trim query.
|
2020-07-03 16:36:55 +02:00 |
lain
|
e3b5559780
|
AccountController: Make setting accepts_chat_messages possible.
|
2020-07-03 15:54:25 +02:00 |
lain
|
4a7b89e372
|
ChatMessageValidator: Additional validation.
|
2020-07-03 15:13:27 +02:00 |
lain
|
5c0bf4c472
|
ActivityPub: Ingest information about chat acceptance.
|
2020-07-03 13:58:34 +02:00 |
lain
|
26a7cc3f00
|
UserView: Add acceptsChatMessages field
|
2020-07-03 13:38:59 +02:00 |
lain
|
db76c26469
|
AccountViewTest: Fix test.
|
2020-07-03 13:24:16 +02:00 |
lain
|
3250228be9
|
AccountView: Add 'accepts_chat_messages' to view.
|
2020-07-03 13:07:33 +02:00 |
Mark Felder
|
8121e46f25
|
Merge branch 'develop' into activation-meta
|
2020-07-02 13:01:22 -05:00 |
lain
|
311b7c19d0
|
Streamer: Align announce streaming with polling.
|
2020-07-02 09:50:26 +02:00 |
lain
|
61fe94d698
|
SideEffects: Refactor.
|
2020-07-02 09:33:50 +02:00 |
lain
|
691742e62d
|
Revert "Merge branch 'avatar-removing' into 'develop'"
This reverts merge request !2701
|
2020-07-01 08:51:56 +00:00 |
Mark Felder
|
5a8e0208b1
|
Add fields limits to instance metadata, add tests
|
2020-06-30 15:25:10 -05:00 |
Mark Felder
|
d69af7f742
|
Rename user.settings column
This is used exclusively by MastoFE/GlitchFE now
|
2020-06-30 11:50:53 -05:00 |
lain
|
0176b7bca2
|
Merge branch 'preload-fixups-2' into preloadfixups
|
2020-06-30 11:40:34 +02:00 |
lain
|
2382a2a151
|
Preload: Load the correct instance panel
|
2020-06-30 11:35:54 +02:00 |
Egor Kislitsyn
|
3aa04b81c4
|
Test default "content-type" for CastAndValidate
|
2020-06-29 19:47:04 +04:00 |
Egor Kislitsyn
|
4a306720e8
|
Merge branch 'develop' into remove-twitter-api
|
2020-06-29 16:09:49 +04: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 |
Mark Felder
|
ce85db41a3
|
Lint
|
2020-06-26 14:35:04 -05:00 |
Haelwenn (lanodan) Monnier
|
244655e884
|
MastoAPI: Show source field when deleting
|
2020-06-26 19:52:20 +02: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 |
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 |
Haelwenn (lanodan) Monnier
|
27c33f216a
|
activity_draft: Add source field
|
2020-06-26 05:48:25 +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 |
Mark Felder
|
433c01b370
|
Merge branch 'develop' into refactor/notification_settings
|
2020-06-25 14:26:21 -05:00 |
lain
|
04abee782b
|
AntiSpamLinkPolicy: Exempt local users.
|
2020-06-25 12:40:39 +02: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
|
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
|
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
|
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 |
Maksim Pechnikov
|
a8d967762e
|
migrate to oban 2.0-rc1
|
2020-06-23 15:09:01 +03: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 |
feld
|
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 |