Commit graph

15085 commits

Author SHA1 Message Date
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
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
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
f7d9f42243 event editing?
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-09-27 23:56:20 +02: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
c3f59eb9ec format
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-09-18 13:14:11 +02:00
3b498061ed Merge remote-tracking branch 'rebased/develop' into pleroma-events
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-09-16 21:24:22 +02:00
Alex Gleason
64efa18c38 Merge branch 'object-delete-slower' into 'develop'
Slow down ContextObjectsDeletionMigrator

Closes #102

See merge request soapbox-pub/rebased!181
2022-09-16 01:11:05 +00:00
Alex Gleason
589e9b395f
Slow down ContextObjectsDeletionMigrator 2022-09-15 11:37:09 -05:00
Alex Gleason
c6e4a12322 Merge branch 'soapbox-fe' into 'develop'
soapbox-fe --> soapbox

See merge request soapbox-pub/rebased!180
2022-09-13 23:13:41 +00:00
Alex Gleason
2f259173c3
Tag erratic tests 2022-09-13 15:57:50 -05:00
Alex Gleason
f5e77a3eaa
soapbox-fe --> soapbox 2022-09-13 15:26:28 -05:00
marcin mikołajczak
98ccf6cbdc Merge branch 'webfinger-expanding' into 'develop'
Webfinger expanding

See merge request soapbox-pub/rebased!96
2022-09-10 22:03:10 +00:00
f169b9ee3b Use paths from mastodon groups implementation
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-09-07 15:03:57 +02:00
Alex Gleason
31d5a6066b Merge branch 'fix-edit-test' into 'develop'
NotificationTest: update edit notification test for async worker

See merge request soapbox-pub/rebased!177
2022-09-06 17:37:36 +00:00
Alex Gleason
4b62d36fe5
NotificationTest: update edit notification test for async worker 2022-09-06 12:00:13 -05:00
Alex Gleason
ce9bacc3be Merge branch 'fix-subscriptions' into 'develop'
Create notifications async with NotificationWorker, #91

See merge request soapbox-pub/rebased!173
2022-09-06 16:33:02 +00:00
Alex Gleason
7375535af2
Update description.exs with :poll_notifications and :notifications oban queues 2022-09-06 11:04:22 -05:00
marcin mikołajczak
0680650e5d Merge branch 'merge-pleroma' into 'develop'
merge pleroma

See merge request soapbox-pub/rebased!172
2022-09-05 21:53:20 +00:00
86cb1897f5 Fixes, add/update tests
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-09-05 23:34:25 +02:00
Alex Gleason
8a38fcf52f Merge branch 'deps-mix-lock' into 'develop'
GitLab CI: only run deps when mix.lock changes

See merge request soapbox-pub/rebased!175
2022-09-05 19:57:23 +00:00
Alex Gleason
42f668558e
GitLab CI: only run deps when mix.lock changes 2022-09-05 14:28:34 -05:00
Alex Gleason
5b8b21b9e9
Fix tests for async notifications 2022-09-05 14:25:23 -05:00
marcin mikołajczak
9ab3cce7e4 Merge branch 'birthday-config-description' into 'develop'
Clarify `birthday_min_age` config description

See merge request soapbox-pub/rebased!174
2022-09-05 18:43:28 +00:00
580bb1439b Clarify birthday_min_age config description
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-09-05 20:24:04 +02:00
Alex Gleason
05a20c8d6d
Create notifications async with NotificationWorker, #91 2022-09-05 12:38:30 -05:00
a84d9b78f6 Display location, mix format
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-09-05 18:24:37 +02:00
d4eccd86b3 Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-09-05 15:30:14 +02:00
8fc5609cdf Add icalendar to dependencies
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-09-05 15:23:06 +02:00
f1607c3d3b Add geospatial package dependency
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-09-05 13:53:13 +02:00
Alex Gleason
c208af8472 Merge branch 'improve-ci' into 'develop'
Improve CI

See merge request soapbox-pub/rebased!168
2022-09-05 04:24:24 +00:00
Alex Gleason
7c426ed136
Dokku: force push to git 2022-09-04 23:00:10 -05:00
Alex Gleason
f0f4f03281
GitLab CI: build docker image 2022-09-04 22:06:02 -05:00
Alex Gleason
5d61e43703
GitLab CI: improve dokku URLs 2022-09-04 22:04:40 -05:00
Alex Gleason
99cc0b1f05
GitLab CI: do use cache for cycles 2022-09-04 21:40:36 -05:00
Alex Gleason
101eb08b07
GitLab CI: move review to test stage 2022-09-04 21:31:30 -05:00
Alex Gleason
5ba971849b
GitLab CI: try using Elixir 1.12 base image 2022-09-04 21:18:34 -05:00
Alex Gleason
a52c44da3e
GitLab CI: only run release on develop branch 2022-09-04 20:43:54 -05:00
tusooa
f8afba95b2 Merge branch 'fix/gts-federation' into 'develop'
GoToSocial federation fixes

See merge request pleroma/pleroma!3725
2022-09-05 01:10:34 +00:00
tusooa
20347898e2 Merge branch 'fix/federation-context-issues' into 'develop'
Fix reply context fixing (Pleroma replies to Misskey threads) and removal of context objects

See merge request pleroma/pleroma!3717
2022-09-04 18:43:36 +00:00