|
|
2fbbf9eec1
|
EventController.create: Use location_id
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-09-01 23:08:10 +02:00 |
|
|
|
a7687b197d
|
Handle banner_id
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-08-30 11:05:34 +02:00 |
|
|
|
ee8f11b085
|
Export to ical
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-08-30 10:05:39 +02:00 |
|
|
|
8d5592ef9d
|
Update @context
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-08-29 11:45:46 +02:00 |
|
|
|
62add6cfbd
|
WIP location handling
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-08-27 22:57:54 +02:00 |
|
|
|
d967e1f55e
|
Add some controller tests, fixes
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-08-24 23:28:59 +02:00 |
|
|
|
2aae16d810
|
Event reminder notifications
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-08-22 22:47:55 +02:00 |
|
|
|
ff5ddd040e
|
Validate event datetime
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-08-21 23:23:35 +02:00 |
|
|
|
b8e44cb231
|
Notification test
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-08-21 23:23:19 +02:00 |
|
|
|
d90d00d77c
|
Fix tests
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-08-21 13:14:55 +02:00 |
|
|
|
c4dea542cc
|
fix migration
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-08-21 12:46:53 +02:00 |
|
|
|
b3700afdd3
|
Notification for participation request/accepted participation
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-08-19 23:20:00 +02:00 |
|
|
|
4d9ddd4f4b
|
Include join state in StatusView
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-08-19 16:42:29 +02:00 |
|
|
|
3482b5d3a3
|
wip events
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-08-12 23:11:34 +02:00 |
|
|
|
2833287bee
|
wip
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-08-10 14:21:50 +02:00 |
|
|
|
538a210f70
|
Merge remote-tracking branch 'soapbox/develop' into pleroma-events
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-08-09 15:30:34 +02:00 |
|
marcin mikołajczak
|
9ce43cf0cb
|
Merge branch 'public-polls-' into 'develop'
Expose nonAnonymous field from Smithereen polls
See merge request soapbox-pub/soapbox-be!150
|
2022-08-08 14:41:24 +00:00 |
|
|
|
b4575815ed
|
Add entry to @context, tests
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-08-08 10:45:43 +02:00 |
|
|
|
3d7d1870b5
|
Expose nonAnonymous field from Smithereen polls
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-08-07 23:56:52 +02:00 |
|
|
|
10753eeb6b
|
wip events
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-08-07 20:19:56 +02:00 |
|
marcin mikołajczak
|
3b964ee555
|
Merge branch 'merge-pleroma' into 'develop'
merge-pleroma
See merge request soapbox-pub/soapbox-be!145
|
2022-08-03 22:04:39 +00:00 |
|
|
|
55c62d19a8
|
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-08-03 23:42:48 +02:00 |
|
Alex Gleason
|
af622eaf03
|
Merge branch 'docker' into 'develop'
Fix the Dockerfile
See merge request soapbox-pub/soapbox-be!143
|
2022-08-02 20:55:09 +00:00 |
|
marcin mikołajczak
|
fdea5d2df6
|
Merge branch 'stream_markers' into 'develop'
Stream marker updates
See merge request soapbox-pub/soapbox-be!144
|
2022-08-02 07:35:37 +00:00 |
|
Haelwenn
|
b2ba307f4d
|
Merge branch 'from/upstream-develop/tusooa/2871-fix-local-public' into 'develop'
local only fixes
Closes #2871
See merge request pleroma/pleroma!3660
|
2022-08-02 05:39:50 +00:00 |
|
Haelwenn
|
7299795eb4
|
Merge branch 'from/upstream-develop/tusooa/backup-without-email' into 'develop'
Allow users to create backups without providing email address
See merge request pleroma/pleroma!3665
|
2022-08-02 05:23:49 +00:00 |
|
Haelwenn
|
f8540b0a9d
|
Merge branch 'weblate' into 'develop'
Translations update from Pleroma Weblate
See merge request pleroma/pleroma!3716
|
2022-08-02 05:10:51 +00:00 |
|
|
|
fe0c02f2c8
|
Stream marker updates
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-08-01 19:07:17 +02:00 |
|
Yating Zhan
|
99d4823ab1
|
Translated using Weblate (Chinese (Simplified))
Currently translated at 18.9% (189 of 998 strings)
Translation: Pleroma/Pleroma Backend (domain config_descriptions)
Translate-URL: http://weblate.pleroma-dev.ebin.club/projects/pleroma/pleroma-backend-domain-config_descriptions/zh_Hans/
|
2022-07-31 22:00:56 +00:00 |
|
tusooa
|
cc533e6956
|
Translated using Weblate (Chinese (Simplified))
Currently translated at 18.9% (189 of 998 strings)
Translation: Pleroma/Pleroma Backend (domain config_descriptions)
Translate-URL: http://weblate.pleroma-dev.ebin.club/projects/pleroma/pleroma-backend-domain-config_descriptions/zh_Hans/
|
2022-07-31 22:00:56 +00:00 |
|
Haelwenn
|
7de21ec991
|
Merge branch 'from/develop/tusooa/emit-move' into 'develop'
Implement moving account
See merge request pleroma/pleroma!3524
|
2022-07-31 22:00:40 +00:00 |
|
Haelwenn
|
5ef2dc317d
|
Change test case wording
|
2022-07-31 21:34:23 +00:00 |
|
tusooa
|
c80096522c
|
Merge branch 'develop' into 'from/develop/tusooa/emit-move'
# Conflicts:
# CHANGELOG.md
# test/pleroma/user_test.exs
|
2022-07-31 21:32:49 +00:00 |
|
Haelwenn
|
b5266097a1
|
Merge branch 'mutes' into 'develop'
MastoAPI: Use `duration` param for mute expiration duration
See merge request pleroma/pleroma!3715
|
2022-07-31 19:41:25 +00:00 |
|
|
|
5d3d6a58f7
|
Use duration param for mute expiration duration
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-07-31 17:22:34 +02:00 |
|
|
|
3a6274f29a
|
wip events
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-07-28 11:07:21 +02:00 |
|
Haelwenn
|
0814d0e0cb
|
Merge branch 'fix/proper-emoji-qualification' into 'develop'
Emoji: implement full-qualifier using combinations
See merge request pleroma/pleroma!3709
|
2022-07-28 04:46:15 +00:00 |
|
Haelwenn
|
0f9f3d2897
|
Merge branch 'from/upstream-develop/tusooa/2384-pagination' into 'develop'
Make mutes and blocks behave the same as other lists
Closes #2384
See merge request pleroma/pleroma!3693
|
2022-07-28 04:37:10 +00:00 |
|
Haelwenn
|
18d6a58c7e
|
Merge branch 'from/upstream-develop/tusooa/gettext-extract' into 'develop'
Extract translatable strings
See merge request pleroma/pleroma!3712
|
2022-07-28 04:33:17 +00:00 |
|
Alex Gleason
|
288d1bf1b8
|
Docker: update maintainer data
|
2022-07-26 20:00:06 -05:00 |
|
Alex Gleason
|
246f0df88e
|
Fix the Dockerfile
|
2022-07-26 19:58:42 -05:00 |
|
Hélène
|
7167de592e
|
Emoji: apply recommended tail call changes
Behavior matches previous code.
Co-authored-by: Tusooa Zhu <tusooa@kazv.moe>
|
2022-07-27 02:08:46 +02:00 |
|
marcin mikołajczak
|
5a3949edce
|
Merge branch 'webhooks' into 'develop'
Mastodon-like webhooks
See merge request soapbox-pub/soapbox-be!135
|
2022-07-26 18:49:08 +00:00 |
|
|
|
cca794e5fe
|
Merge remote-tracking branch 'soapbox/develop' into webhooks
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-07-26 19:12:52 +02:00 |
|
Tusooa Zhu
|
4bdd8e349c
|
Extract translatable strings
|
2022-07-26 10:50:29 -04:00 |
|
tusooa
|
36d79468ec
|
Merge branch 'authorized-fetch' into 'develop'
Add authorized_fetch_mode to description.exs
See merge request pleroma/pleroma!3710
|
2022-07-26 14:48:00 +00:00 |
|
marcin mikołajczak
|
47fc009882
|
Merge branch 'merge-pleroma' into 'develop'
Merge Pleroma
See merge request soapbox-pub/soapbox-be!142
|
2022-07-26 11:07:20 +00:00 |
|
|
|
965f1de57e
|
Revert "Document way to do notice compatibility routes with Nginx reverse-proxy instead"
This reverts commit 64e16e6a4b.
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-07-26 07:12:23 +02:00 |
|
Hélène
|
b99f5d6183
|
Emoji: split qualification variation into a module
|
2022-07-26 02:04:12 +02:00 |
|
|
|
a8540c3797
|
Merge Pleroma
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-07-25 23:51:14 +02:00 |
|
