|
|
7ea96a1f56
|
More tests?
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-10-12 23:54:30 +02:00 |
|
|
|
8221504ecb
|
Merge remote-tracking branch 'soapbox/develop' into pleroma-events
|
2022-10-12 21:52:36 +02:00 |
|
Alex Gleason
|
0447197378
|
Merge branch 'merge-pleroma' into 'develop'
Merge Pleroma
See merge request soapbox-pub/rebased!184
|
2022-10-10 01:22:54 +00:00 |
|
Alex Gleason
|
22a1532850
|
Merge branch 'link-tag-fix' into 'develop'
Support FEP-e232 quote posts
See merge request soapbox-pub/rebased!185
|
2022-10-09 22:36:58 +00:00 |
|
Alex Gleason
|
0ee413400f
|
FEP-e232: support Link mediaType "application/activity+json"
|
2022-10-09 15:25:34 -05:00 |
|
Alex Gleason
|
035d9e71eb
|
Merge remote-tracking branch 'origin/develop' into merge-pleroma
|
2022-10-09 13:58:19 -05:00 |
|
Alex Gleason
|
7ac6f4b6ea
|
Merge remote-tracking branch 'origin/develop' into link-tag-fix
|
2022-10-09 13:57:29 -05:00 |
|
Alex Gleason
|
04ee564077
|
Merge branch 'erratic-move-tests' into 'develop'
Tag erratic Move tests
See merge request soapbox-pub/rebased!190
|
2022-10-09 18:57:11 +00:00 |
|
Alex Gleason
|
ddaeb09e54
|
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
|
2022-10-09 13:46:48 -05:00 |
|
Alex Gleason
|
147f6c4f63
|
Tag erratic Move tests
|
2022-10-09 13:37:27 -05:00 |
|
Alex Gleason
|
872729dc7e
|
Merge remote-tracking branch 'origin/develop' into link-tag-fix
|
2022-10-09 13:27:57 -05:00 |
|
Alex Gleason
|
11dfc2589a
|
Add support for FEP-e232 quotes without quoteUrl
|
2022-10-09 13:27:16 -05:00 |
|
Alex Gleason
|
33a4716843
|
Merge branch 'gitlab-ci-dind' into 'develop'
GitLab CI: tag `dind`
See merge request soapbox-pub/rebased!189
|
2022-10-09 17:26:19 +00:00 |
|
Alex Gleason
|
23ab8e12b9
|
GitLab CI: tag dind
|
2022-10-09 17:25:23 +00:00 |
|
tusooa
|
8042e0ebe1
|
Merge branch 'mergeback/2.4.4' into 'develop'
mergeback: 2.4.4
See merge request pleroma/pleroma!3762
|
2022-10-09 04:29:09 +00:00 |
|
Tusooa Zhu
|
dd82fd234f
|
Merge branch 'release/2.4.4' into mergeback/2.4.4
|
2022-10-08 22:15:09 -04:00 |
|
|
|
ba642aaf6a
|
Fix tests
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-10-06 23:33:06 +02:00 |
|
marcin mikołajczak
|
512398a556
|
Merge branch 'fix-migration' into 'develop'
Fix down() in AddUpdateToNotificationsEnum migration for Rebased
See merge request soapbox-pub/rebased!186
|
2022-10-05 22:38:44 +00:00 |
|
|
|
4d9ecc2b9e
|
Fix down() in AddUpdateToNotificationsEnum migration for Rebased
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-10-06 00:11:25 +02:00 |
|
|
|
678b6ce17c
|
Add more tests
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-10-06 00:06:34 +02:00 |
|
|
|
e187aff5dd
|
Add some tests
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-10-03 23:10:02 +02:00 |
|
|
|
c45612badd
|
Update spec, fix tests
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-10-03 20:13:44 +02:00 |
|
|
|
73e7549d94
|
Update scheduled notitfications on edit
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-10-02 16:32:34 +02:00 |
|
Alex Gleason
|
0cd15c997c
|
TagValidator: allow Link tags, don't go nuclear for unrecognized Tag types
|
2022-10-01 19:56:11 -05:00 |
|
|
|
0612c32c6e
|
Add notifications for updates in events you joined
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-10-01 22:26:35 +02:00 |
|
|
|
9ff0eb5c4b
|
Fix event updates
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-10-01 18:01:52 +02:00 |
|
|
|
58e0ca0d68
|
Merge remote-tracking branch 'soapbox/develop' into pleroma-events
|
2022-09-30 20:04:29 +02:00 |
|
Alex Gleason
|
f6afe649fe
|
GenerateUnsetUserKeys: only select necessary user fields
|
2022-09-28 17:58:25 -05:00 |
|
Alex Gleason
|
9137089895
|
CI Docker: remove README, adapt build_and_push.sh
|
2022-09-28 17:42:57 -05:00 |
|
Alex Gleason
|
5dfb582bd2
|
Revert "Merge branch 'from/upstream-develop/tusooa/2169-queue-limit' into 'develop'"
This reverts commit 757a21554f, reversing
changes made to 5d7d623390.
|
2022-09-28 17:41:36 -05:00 |
|
Alex Gleason
|
ecd2d32dc2
|
ci/Dockerfile: tabs to spaces
|
2022-09-28 17:39:58 -05:00 |
|
Alex Gleason
|
544be36c80
|
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
|
2022-09-28 17:29:53 -05:00 |
|
marcin mikołajczak
|
31f5bafe64
|
Merge branch 'move-cooldown-period' into 'develop'
Add migration cooldown period
Closes #107
See merge request soapbox-pub/rebased!183
|
2022-09-28 22:00:40 +00:00 |
|
|
|
c6fddd6e0a
|
Add migration cooldown period
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-09-28 23:48:45 +02:00 |
|
Haelwenn
|
3f1c31b7cd
|
Merge branch 'fix/exclude-deactivated-in-search' into 'develop'
User: search: exclude inactive users from user search
See merge request pleroma/pleroma!3755
|
2022-09-27 23:58:45 +00:00 |
|
|
|
f7d9f42243
|
event editing?
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-09-27 23:56:20 +02:00 |
|
Haelwenn
|
d43d02bf41
|
Merge branch 'from/upstream-develop/tusooa/fix-static-tests' into 'develop'
Make instance document controller test sync
Closes #2940
See merge request pleroma/pleroma!3757
|
2022-09-27 21:50:43 +00:00 |
|
Haelwenn
|
757a21554f
|
Merge branch 'from/upstream-develop/tusooa/2169-queue-limit' into 'develop'
Reduce incoming and outgoing federation queue sizes to 5
Closes #2169
See merge request pleroma/pleroma!3756
|
2022-09-27 21:50:06 +00:00 |
|
Haelwenn
|
5d7d623390
|
Merge branch 'bugfix/elixir-1.14' into 'develop'
Bugfix: Elixir 1.14
See merge request pleroma/pleroma!3740
|
2022-09-27 21:46:03 +00:00 |
|
|
|
daccdc179c
|
Only allow event author to accept/reject joins
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-09-27 21:01:48 +02:00 |
|
|
|
31d2f9a255
|
Store internal location data
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-09-25 23:19:08 +02:00 |
|
|
|
ba9fe4c6f2
|
Fix participation requests query
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-09-25 22:01:34 +02:00 |
|
|
|
5039c5ca80
|
Fix notification display
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-09-24 22:04:44 +02:00 |
|
marcin mikołajczak
|
54daefaecc
|
Merge branch 'manifest' into 'develop'
Add shortcuts and share_target to manifest.json
See merge request soapbox-pub/rebased!182
|
2022-09-24 19:26:11 +00:00 |
|
|
|
f5fe5b4544
|
Add shortcuts and share_target to manifest.json
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-09-24 18:34:09 +02:00 |
|
|
|
0b65d205c9
|
Store participation_request_count
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-09-22 23:42:28 +02:00 |
|
Tusooa Zhu
|
e66c02b775
|
Make instance document controller test sync
|
2022-09-20 12:34:10 -04:00 |
|
tusooa
|
ac95b8b4f3
|
Merge branch 'websocketex' into 'develop'
Use Websockex to replace websocket_client
See merge request pleroma/pleroma!3743
|
2022-09-18 17:09:12 +00:00 |
|
|
|
c3f59eb9ec
|
format
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-09-18 13:14:11 +02:00 |
|
Tusooa Zhu
|
467b6cad6f
|
Reduce incoming and outgoing federation queue sizes to 5
|
2022-09-17 16:34:33 -04:00 |
|
