Alex Gleason
|
2edb44789d
|
Merge remote-tracking branch 'origin/develop' into odic
|
2022-08-11 18:17:44 -05:00 |
|
Alex Gleason
|
a12441c9a5
|
Merge branch 'dokku' into 'develop'
Review apps with Dokku
See merge request soapbox-pub/soapbox-be!146
|
2022-08-11 23:15:23 +00:00 |
|
Alex Gleason
|
54838c959f
|
Expose oauth_consumer_strategies in instance API
|
2022-08-11 17:58:54 -05:00 |
|
feld
|
514caed573
|
Merge branch 'fix-varnish7-support' into 'develop'
Fix Varnish7 support
See merge request pleroma/pleroma!3722
|
2022-08-11 15:14:16 +00:00 |
|
Mark Felder
|
73b4d0d9a7
|
Fix the mocks to use uppercase as well
|
2022-08-10 21:46:56 +00:00 |
|
Mark Felder
|
243ed7d60f
|
Update the recommended VCL configuration
|
2022-08-10 17:18:06 -04:00 |
|
Mark Felder
|
cbdc13b767
|
Fix Varnish 7 support by ensuring Media Preview Proxy fetches headers with a capitalized HEAD verb
|
2022-08-10 17:09:58 -04: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 |
|
Tusooa Zhu
|
d487e0160c
|
Treat containment failure as cancel in ReceiverWorker
|
2022-08-08 08:41:33 -04: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 |
|
Tusooa Zhu
|
88e0e6acd5
|
Fix FederatorTest
|
2022-08-06 00:42:10 -04:00 |
|
Tusooa Zhu
|
a0166e92fa
|
Treat MRF rejects as success in Oban worker
|
2022-08-06 00:33:18 -04:00 |
|
Alex Gleason
|
d317e08b49
|
Add app.json for Dokku
|
2022-08-05 15:42:56 -05:00 |
|
Alex Gleason
|
5d31b5a9e9
|
Set GIT_DEPTH=0 for dokku deployment
|
2022-08-05 14:59:25 -05:00 |
|
Alex Gleason
|
9019550a27
|
Dokku: add missing dokku@
|
2022-08-05 14:20:57 -05:00 |
|
Alex Gleason
|
9817db05f3
|
GitLab CI: remove before_script from review_app
|
2022-08-05 13:47:23 -05:00 |
|
Alex Gleason
|
c73a08869d
|
Deploy review app with Dokku
|
2022-08-05 13:21:18 -05:00 |
|
Alex Gleason
|
d0d1457680
|
Docker: respect PORT env, use 5000 by default
|
2022-08-05 09:32:42 -05:00 |
|
Alex Gleason
|
9832ab2573
|
docker-entrypoint: use $DATABASE_URL for pg_isready
|
2022-08-04 22:37:37 -05:00 |
|
Alex Gleason
|
97e141c5e3
|
docker.exs: simplify database config
|
2022-08-04 19:53:37 -05:00 |
|
Alex Gleason
|
132a65a87e
|
Remove .buildpacks
|
2022-08-04 19:17:30 -05: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 |
|
floatingghost
|
f2a9285ff0
|
bugfix/follow-state (#104)
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/104
|
2022-08-03 01:07:53 -04: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 |
|
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 |
|
