lain
|
8ca1f3e8c6
|
Merge branch '1723-token-fixes' into 'develop'
AccountController: Return scope in proper format.
Closes #1723
See merge request pleroma/pleroma!2694
|
2020-07-09 13:10:05 +00:00 |
|
|
lain
|
f4469dc741
|
Merge branch 'features/favicons' into 'develop'
Add support for remote favicons
See merge request pleroma/pleroma!2261
|
2020-07-09 13:09:31 +00:00 |
|
Haelwenn
|
bdc7b60610
|
Merge branch '1925-muting-reblogs' into 'develop'
AccountController: Fix muting / unmuting reblogs.
Closes #1925
See merge request pleroma/pleroma!2732
|
2020-07-09 12:10:26 +00:00 |
|
|
lain
|
00e54f8fe7
|
ActivityPub: Remove follow and fix issues.
|
2020-07-08 17:07:24 +02:00 |
|
|
lain
|
9dda8b5427
|
CommonAPI: Switch to pipeline for following.
|
2020-07-08 15:40:56 +02:00 |
|
|
lain
|
172f4aff8e
|
Transmogrifier: Move following to the pipeline.
|
2020-07-08 14:30:53 +02:00 |
|
|
lain
|
7d0e2b3fdd
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into follow-pipeline
|
2020-07-08 13:23:07 +02:00 |
|
|
lain
|
6335b32aa8
|
Merge branch '1895-hashtag-timeline-restrict-unauthenticated-fix' into 'develop'
[#1895] Made hashtag timeline respect `:restrict_unauthenticated` instance setting
Closes #1895
See merge request pleroma/pleroma!2731
|
2020-07-08 10:55:03 +00:00 |
|
|
lain
|
c0385cf47a
|
AccountController: Fix muting / unmuting reblogs.
|
2020-07-08 11:52:29 +02:00 |
|
Haelwenn (lanodan) Monnier
|
312fc55f14
|
Add [:instances_favicons, :enabled] setting, defaults to false
|
2020-07-08 06:28:40 +02:00 |
|
|
Haelwenn (lanodan) Monnier
|
6a679d80c9
|
Move get_favicon to Pleroma.Instances, use /
|
2020-07-08 06:28:39 +02:00 |
|
|
Haelwenn (lanodan) Monnier
|
f6d09fafee
|
Add support for remote favicons
|
2020-07-08 06:28:39 +02:00 |
|
|
Haelwenn
|
a8447c3803
|
Merge branch '1918-avatar-background-header-reset-2' into 'develop'
Resolve "Better support for resetting avatar/header/background"
Closes #1918
See merge request pleroma/pleroma!2729
|
2020-07-08 03:25:30 +00:00 |
|
|
lain
|
8939ff39e4
|
Merge branch 'remove-twitter-api' into 'develop'
Remove some TwitterAPI endpoints
See merge request pleroma/pleroma!2327
|
2020-07-07 18:26:07 +00:00 |
|
Ivan Tashkinov
|
3e08e77151
|
[#1895] Made hashtag timeline respect :restrict_unauthenticated instance setting.
|
2020-07-07 20:37:11 +03:00 |
|
|
lain
|
c8dd973af5
|
AccountController: Remove unused update_? routes.
These were not documented and are also not used anymore.
|
2020-07-07 16:53:20 +02:00 |
|
|
lain
|
59cf78e412
|
AccountController: Allow removal / reset of user images.
|
2020-07-07 16:53:03 +02:00 |
|
|
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
|
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 |
|
|
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 |
|
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 |
|