lain
|
af3568a6d9
|
Docs: sql -> SQL
|
2020-05-25 19:26:07 +02:00 |
|
lain
|
f7cb3f4cfc
|
Apply suggestion to docs/installation/otp_en.md
|
2020-05-25 17:11:35 +00:00 |
|
lain
|
dbd07d29a3
|
Streamer: Don't crash on streaming chat notifications
|
2020-05-25 17:27:45 +02:00 |
|
lain
|
2c25087d20
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-05-25 16:52:03 +02:00 |
|
lain
|
6a85fe1f9d
|
Docs: Document reasonable Postgres settings.
|
2020-05-25 15:53:14 +02:00 |
|
lain
|
6bd7070b00
|
Transmogrifier: Use a simpler way to get mentions.
|
2020-05-25 15:08:43 +02:00 |
|
lain
|
5fef405208
|
User: Change signature of get_users_from_set
|
2020-05-25 15:06:35 +02:00 |
|
Egor Kislitsyn
|
cbcd592300
|
Add OpenAPI spec for AdminAPI.RelayController
|
2020-05-25 16:51:16 +04:00 |
|
lain
|
f20dff451e
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1808-pleroma-sucks
|
2020-05-25 14:01:16 +02:00 |
|
lain
|
6783d544b2
|
Merge branch 'flaky-tests' into 'develop'
Flaky tests
See merge request pleroma/pleroma!2578
|
2020-05-25 12:00:53 +00:00 |
|
lain
|
5d5db7e5b7
|
StealEmojiPolicyTest: Clean up.
|
2020-05-25 14:00:18 +02:00 |
|
lain
|
2dff376041
|
StealEmojiPolicyTest: Fix flaky test.
|
2020-05-25 13:58:14 +02:00 |
|
lain
|
ee35bb5ac2
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-05-25 13:57:27 +02:00 |
|
lain
|
aeb0875025
|
StealEmojiPolicyTest: Fix flaky test.
|
2020-05-25 13:48:47 +02:00 |
|
lain
|
ec470c4c77
|
Merge branch 'openapi/admin/status' into 'develop'
Add OpenAPI spec for AdminAPI.StatusController
See merge request pleroma/pleroma!2566
|
2020-05-25 11:40:54 +00:00 |
|
lain
|
3bec0d2e50
|
Factory: Set users to be ap_enabled by default.
|
2020-05-25 12:59:42 +02:00 |
|
lain
|
0c970a9d44
|
UserTest: Add test for user refreshing.
|
2020-05-25 12:49:38 +02:00 |
|
lain
|
d0c26956da
|
User: Don't error out if we want to refresh a user but can't
|
2020-05-25 12:46:14 +02:00 |
|
rinpatch
|
7bc2ec0aa2
|
Merge branch 'mastodon-migration-compat' into 'develop'
Add compatibility routes for converted mastodon instances
Closes #1797
See merge request pleroma/pleroma!2572
|
2020-05-24 19:05:57 +00:00 |
|
lain
|
72189d227f
|
Merge branch 'priv-warning' into 'develop'
priv/static: Add a warning discouraging admins from modifying the static files directly
See merge request pleroma/pleroma!2571
|
2020-05-22 17:20:23 +00:00 |
|
lain
|
ddbbefeb2e
|
Merge branch 'feature/configure-filename-truncate' into 'develop'
Configurable filename truncation threshold
Closes #1799
See merge request pleroma/pleroma!2573
|
2020-05-22 16:05:35 +00:00 |
|
Roman Chvanikov
|
5d60b25e69
|
Apply suggestion to lib/pleroma/web/common_api/utils.ex
|
2020-05-22 15:44:10 +00:00 |
|
Roman Chvanikov
|
8eb1dfadca
|
Update CHANGELOG and docs
|
2020-05-22 18:30:13 +03:00 |
|
Roman Chvanikov
|
cc82229ba7
|
Add filename_display_max_length config
|
2020-05-22 18:19:25 +03:00 |
|
lain
|
3506e95499
|
Add Changelog
|
2020-05-22 17:13:09 +02:00 |
|
lain
|
91c8467582
|
OStatusController: Add Mastodon activity compat route.
|
2020-05-22 17:11:59 +02:00 |
|
lain
|
355aa3bdc7
|
ActivityPubController: Add Mastodon activity compat route.
|
2020-05-22 17:06:12 +02:00 |
|
lain
|
8a4bd9e5d1
|
OStatusController: Add Mastodon compatibility route for objects.
|
2020-05-22 16:47:22 +02:00 |
|
rinpatch
|
1fa7aa9fc5
|
Merge branch 'emoji-react-better-errors' into 'develop'
EmojiReactionController: Return more appropriate error.
See merge request pleroma/pleroma!2569
|
2020-05-22 14:36:08 +00:00 |
|
rinpatch
|
96650c55ae
|
Merge branch 'fix/notifications-api' into 'develop'
Fix notifications mark as read API
Closes #1800
See merge request pleroma/pleroma!2570
|
2020-05-22 14:35:13 +00:00 |
|
rinpatch
|
fabc11bf9a
|
priv/static: Add a warning discouraging admins from modifying the static files directly
|
2020-05-22 17:33:19 +03:00 |
|
Egor Kislitsyn
|
ba106aa9c8
|
Fix notifications mark as read API
|
2020-05-22 18:15:36 +04:00 |
|
lain
|
ca755f9a73
|
ActivityPubController: Add Mastodon compatibility route.
|
2020-05-22 16:15:29 +02:00 |
|
lain
|
bcb549531f
|
EmojiReactionController: Return more appropriate error.
|
2020-05-22 14:38:28 +02:00 |
|
Ivan Tashkinov
|
0e23138b50
|
[#2497] Specified SHELL in .gitlab-ci.yml as required for exexec.
|
2020-05-22 10:35:48 +03:00 |
|
Haelwenn
|
7b02bfca51
|
Merge branch 'announce-validator' into 'develop'
Announce validator
See merge request pleroma/pleroma!2567
|
2020-05-22 05:47:53 +00:00 |
|
Haelwenn
|
a57e7f3503
|
Merge branch '1113-op-mentioning' into 'develop'
CommonAPI: Change public->private implicit addressing.
Closes #1113
See merge request pleroma/pleroma!2563
|
2020-05-22 05:22:07 +00:00 |
|
Ivan Tashkinov
|
3a1e810aaa
|
[#2497] Customized exexec launch to support root operation (currently required by Gitlab CI).
|
2020-05-21 21:47:32 +03:00 |
|
Ivan Tashkinov
|
610343edb3
|
[#2497] Image preview proxy: image resize & background color fix with ffmpeg -filter_complex.
|
2020-05-21 17:35:42 +03:00 |
|
lain
|
e0d1a942a6
|
Merge branch 'issue/1707' into 'develop'
[#1707] fixed `mix pleroma.instance gen`
See merge request pleroma/pleroma!2565
|
2020-05-21 14:32:49 +00:00 |
|
lain
|
ab1154e13f
|
Merge branch 'admin-logo-upload' into 'develop'
Ability to upload background, logo, default user avatar, instance thumbnail, and the NSFW hiding image
See merge request pleroma/pleroma!2388
|
2020-05-21 14:30:34 +00:00 |
|
lain
|
578ed3a37f
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-05-21 15:35:13 +02:00 |
|
lain
|
a42a0716ec
|
Merge branch 'features/emoji_stealer' into 'develop'
MRF.StealEmojiPolicy: New Policy
See merge request pleroma/pleroma!2385
|
2020-05-21 13:31:49 +00:00 |
|
lain
|
f166316f50
|
Merge branch 'openapi/pleroma-api/pleroma' into 'develop'
Add OpenAPI spec for PleromaAPI.PleromaAPIController
See merge request pleroma/pleroma!2564
|
2020-05-21 13:30:09 +00:00 |
|
lain
|
283fb1e05b
|
Merge branch 'issue/749' into 'develop'
[#749] unsubscribes of friends when user deactivated
See merge request pleroma/pleroma!2513
|
2020-05-21 13:27:44 +00:00 |
|
Egor Kislitsyn
|
45d2c4157f
|
Add OpenAPI spec for AdminAPI.StatusController
|
2020-05-21 17:23:12 +04:00 |
|
lain
|
c4a5cead51
|
UploadTest: Fix test.
|
2020-05-21 15:17:39 +02:00 |
|
lain
|
cc0d462e91
|
Attachments: Have the mediaType on the root, too.
|
2020-05-21 15:08:56 +02:00 |
|
lain
|
814c3e5171
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-05-21 15:00:05 +02:00 |
|
lain
|
bf1b221f94
|
Credo fixes for the credo god.
|
2020-05-21 14:12:32 +02:00 |
|