lain
|
5e2ba57327
|
Activity search: Fix order of results
Greatly speeds up the search for RUM.
|
2020-11-19 13:20:58 +01:00 |
|
lain
|
21eaaf491c
|
Changelog: Add info about reset tokens
|
2020-11-19 12:29:41 +01:00 |
|
lain
|
f6c22f4d08
|
Cheatsheet: Add docs about reset token expiration
|
2020-11-19 12:28:39 +01:00 |
|
lain
|
11e0d5f9ac
|
Password Resets: Don't accept tokens above a certain age.
By default, one day
|
2020-11-19 12:27:06 +01:00 |
|
lain
|
6f9b03384f
|
Merge branch 'hide-muted-reactions' into 'develop'
Hide reactions from muted and blocked users
Closes #1875
See merge request pleroma/pleroma!3147
|
2020-11-19 10:58:28 +00:00 |
|
Alexander Strizhakov
|
4aaffe3a10
|
log capture
|
2020-11-19 09:58:32 +03:00 |
|
Alexander Strizhakov
|
8a8c154b4e
|
test fixes
|
2020-11-19 09:58:32 +03:00 |
|
Alexander Strizhakov
|
44f3795b8e
|
changelog entries for fixes
|
2020-11-19 09:58:27 +03:00 |
|
Alexander Strizhakov
|
be0b874e1d
|
fix for mastodon forwarded reports
|
2020-11-19 09:53:14 +03:00 |
|
Alexander Strizhakov
|
a840aefda8
|
formatting
|
2020-11-19 09:53:13 +03:00 |
|
Alexander Strizhakov
|
e2bf6b1f7e
|
fix for forwarded reports
|
2020-11-19 09:53:13 +03:00 |
|
feld
|
8a7ee9fe74
|
Merge branch 'revert-da4660d2' into 'develop'
Revert "Merge branch 'use-https-in-dockerfile' into 'develop'"
See merge request pleroma/pleroma!3158
|
2020-11-18 21:16:12 +00:00 |
|
Mark Felder
|
3e7642b123
|
Update AdminFE build to pleroma/admin-fe@c18f167a12
|
2020-11-18 14:42:16 -06:00 |
|
feld
|
42ff5ea95e
|
Revert "Merge branch 'use-https-in-dockerfile' into 'develop'"
This reverts merge request !2955
|
2020-11-18 20:32:30 +00:00 |
|
minibikini
|
6669ac5bf7
|
Merge branch 'develop' into 'hide-muted-reactions'
# Conflicts:
# CHANGELOG.md
|
2020-11-18 20:22:40 +00:00 |
|
Mark Felder
|
1d03ba4ffb
|
Fixed emoji reactions not being filtered from blocked and muted accounts
|
2020-11-18 20:13:25 +00:00 |
|
feld
|
a1056aace1
|
Merge branch 'fix/mix-task-user-delete_activities' into 'develop'
Fix mix pleroma.user delete_activities task
See merge request pleroma/pleroma!3156
|
2020-11-18 18:57:47 +00:00 |
|
lain
|
aae669d05e
|
Merge branch 'fix/webpush-and-emojireact' into 'develop'
Push notifications: add pleroma:emoji_reaction, improve tests
Closes #2185
See merge request pleroma/pleroma!3141
|
2020-11-18 18:33:48 +00:00 |
|
lain
|
1b63aa0b4f
|
Apply 1 suggestion(s) to 1 file(s)
|
2020-11-18 18:27:30 +00:00 |
|
lain
|
6b32e1de23
|
Merge branch 'frontend-admin-api' into 'develop'
Add an API to manage frontends
Closes #2238
See merge request pleroma/pleroma!3108
|
2020-11-18 17:51:57 +00:00 |
|
lain
|
d7b63272b8
|
Changelog: Move api info to api heading.
|
2020-11-18 18:32:13 +01:00 |
|
Maksim Pechnikov
|
9c5d1cb9ed
|
fix tests
|
2020-11-18 09:58:51 +03:00 |
|
Maksim
|
3c00af82dc
|
Apply 1 suggestion(s) to 1 file(s)
|
2020-11-18 05:19:37 +00:00 |
|
Maksim
|
137b7f9e28
|
Apply 1 suggestion(s) to 1 file(s)
|
2020-11-18 05:19:30 +00:00 |
|
Maksim
|
e91e2399ee
|
Apply 1 suggestion(s) to 1 file(s)
|
2020-11-18 05:19:22 +00:00 |
|
Maksim
|
ce11f0bc33
|
Apply 1 suggestion(s) to 1 file(s)
|
2020-11-18 05:19:09 +00:00 |
|
Maksim
|
25eb222bed
|
Apply 1 suggestion(s) to 1 file(s)
|
2020-11-18 05:19:01 +00:00 |
|
feld
|
fe7008ee39
|
Merge branch 'update/admin-fe-20201117' into 'develop'
Update AdminFE
See merge request pleroma/pleroma!3157
|
2020-11-17 23:16:17 +00:00 |
|
Mark Felder
|
ad7fc35252
|
Update AdminFE build to pleroma/admin-fe@5b38aea279
|
2020-11-17 17:01:34 -06:00 |
|
Mark Felder
|
415481a4d9
|
Add test for POST when push is disabled
Also group together the tests verifiying failure when disabled
|
2020-11-17 22:18:22 +00:00 |
|
Mark Felder
|
3eaa5335c9
|
Revert adding extra alert types here
|
2020-11-17 21:37:17 +00:00 |
|
Mark Felder
|
d9732fb7d3
|
Fix incorrect test description
|
2020-11-17 21:34:18 +00:00 |
|
Mark Felder
|
ccddedb504
|
Credo
|
2020-11-17 20:33:30 +00:00 |
|
Mark Felder
|
ff7a4b6aa2
|
Test that we ignore invalid subscription alert types separately.
|
2020-11-17 20:22:25 +00:00 |
|
Mark Felder
|
30f140e570
|
Ensure all supported push notification subscription alert types are tested
|
2020-11-17 20:22:25 +00:00 |
|
Mark Felder
|
499faa82f6
|
Synchronize reaction notification text with PleromaFE's style
|
2020-11-17 20:22:24 +00:00 |
|
Mark Felder
|
5d0bc5e028
|
Support both pleroma:chat_mention and pleroma:emoji_reaction for /api/v1/push/subscription
|
2020-11-17 20:21:48 +00:00 |
|
Mark Felder
|
67a6abd071
|
Update OpenAPI spec/schema and test to verify support for pleroma:emoji_reaction subscriptions
|
2020-11-17 20:20:00 +00:00 |
|
Mark Felder
|
80e21903d4
|
Spelling
|
2020-11-17 20:20:00 +00:00 |
|
Mark Felder
|
1433d3c59c
|
Document the API extensions for push subscriptions
|
2020-11-17 20:20:00 +00:00 |
|
Mark Felder
|
83ec2f1384
|
Allow subscribing for pleroma:emoji_reaction push notifications
|
2020-11-17 20:20:00 +00:00 |
|
Mark Felder
|
3ce11b830e
|
Add capability for emoji reaction push notifications
|
2020-11-17 20:20:00 +00:00 |
|
lain
|
e6d4d62f85
|
Docs: Add info about frontend install error response
|
2020-11-17 16:44:20 +01:00 |
|
lain
|
bb9650f3c2
|
FrontendController: Return error on installation error.
|
2020-11-17 16:43:07 +01:00 |
|
Mark Felder
|
56d95203b5
|
Document fixing the pleroma.user delete_activities mix task
|
2020-11-17 15:28:46 +00:00 |
|
Mark Felder
|
97201f7e37
|
Need to start web_resp cache or mix task fails
|
2020-11-17 15:15:53 +00:00 |
|
feld
|
d33b9e7b33
|
Merge branch 'remove/fedsockets' into 'develop'
Remove FedSockets
See merge request pleroma/pleroma!3155
|
2020-11-17 14:58:33 +00:00 |
|
rinpatch
|
cf99b1c1fd
|
Merge branch 'release/just-a-test-for-arm32-on-arm64' into 'develop'
Specify the architecture for arm gitlab jobs
See merge request pleroma/pleroma!3139
|
2020-11-17 14:52:08 +00:00 |
|
Egor Kislitsyn
|
f69fe36ebf
|
Merge branch 'develop' into frontend-admin-api
|
2020-11-17 18:34:04 +04:00 |
|
Egor Kislitsyn
|
d48dbfab2b
|
Merge remote-tracking branch 'origin/develop' into hide-muted-reactions
|
2020-11-17 18:30:10 +04:00 |
|