Ivan Tashkinov
|
e4b12494d7
|
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
# Conflicts:
# mix.lock
|
2020-05-14 20:19:56 +03:00 |
|
Ivan Tashkinov
|
f1f588fd52
|
[#2497] Added support for :eimp for image resizing.
|
2020-05-14 20:18:31 +03:00 |
|
rinpatch
|
e455ca3f3e
|
Merge branch 'feature/database-configuration-whitelist' into 'develop'
Database configuration whitelist
See merge request pleroma/pleroma!2522
|
2020-05-14 16:07:37 +00:00 |
|
Stephanie Wilde-Hobbs
|
80308c5c26
|
Add config migration disclaimer to config whitelist documentation
|
2020-05-14 15:56:14 +01:00 |
|
lain
|
4157c459b8
|
Merge branch 'bcrypt-auth' into 'develop'
Handle bcrypt passwords for Mastodon migration
See merge request pleroma/pleroma!2527
|
2020-05-14 14:36:56 +00:00 |
|
Alex Gleason
|
5b0f27d23d
|
Pbkdf2.verify_pass --> AuthenticationPlug.checkpw
|
2020-05-14 08:57:38 -05:00 |
|
Stephanie Wilde-Hobbs
|
3eff542678
|
Add Changelog entry
|
2020-05-14 12:43:54 +01:00 |
|
Stephanie Wilde-Hobbs
|
20cbfb5cb5
|
Allow whitelisting whole groups
|
2020-05-14 12:43:53 +01:00 |
|
Steph
|
5c6f575315
|
Style fixes
|
2020-05-14 12:15:48 +01:00 |
|
lain
|
a2a8c8e9e0
|
Merge branch 'features/openrc-console' into 'develop'
init.d/pleroma: Add option to attach an elixir console
See merge request pleroma/pleroma!1704
|
2020-05-14 09:27:33 +00:00 |
|
lain
|
39ec1af993
|
Merge branch 'openapi/pleroma-api/accounts' into 'develop'
Add OpenAPI spec for PleromaAPI.AccountController
See merge request pleroma/pleroma!2528
|
2020-05-14 09:25:18 +00:00 |
|
lain
|
359d7b0a6d
|
Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_account_operation.ex
|
2020-05-14 09:09:11 +00:00 |
|
lain
|
1c2629328d
|
Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_account_operation.ex
|
2020-05-14 09:07:09 +00:00 |
|
lain
|
4134bfbbb2
|
Merge branch 'pleroma_internal' into 'develop'
Add `pleroma_internal` as an internal field
See merge request pleroma/pleroma!2533
|
2020-05-14 08:22:53 +00:00 |
|
Alex Gleason
|
249e009c5e
|
Add pleroma_internal as an internal field
|
2020-05-13 16:14:24 -05:00 |
|
rinpatch
|
d7d352b869
|
Merge branch 'weblate-pleroma-pleroma' into 'develop'
Translations update from Weblate
See merge request pleroma/pleroma!2529
|
2020-05-13 16:26:34 +00:00 |
|
Alex Gleason
|
9cbf17d59f
|
Handle bcrypt passwords for Mastodon migration
|
2020-05-13 10:53:56 -05:00 |
|
Egor Kislitsyn
|
6802dc28ba
|
Add OpenAPI spec for PleromaAPI.AccountController
|
2020-05-13 19:06:46 +04:00 |
|
Haelwenn (lanodan) Monnier
|
5f5681282e
|
Translated using Weblate (French)
Currently translated at 100.0% (90 of 90 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/fr/
|
2020-05-13 13:38:40 +00:00 |
|
lain
|
da550be066
|
Merge branch 'fix/1742-random-failing-tests' into 'develop'
Fix sporadically failing tests
See merge request pleroma/pleroma!2524
|
2020-05-13 13:38:32 +00:00 |
|
lain
|
6706cdce65
|
Merge branch 'openapi/suggestions' into 'develop'
Add OpenAPI spec for SuggestionController
See merge request pleroma/pleroma!2525
|
2020-05-13 10:34:04 +00:00 |
|
Egor Kislitsyn
|
bcadbf964a
|
Add OpenAPI spec for SuggestionController
|
2020-05-13 14:15:24 +04:00 |
|
lain
|
156c8a5088
|
Merge branch 'openapi/statuses' into 'develop'
Add OpenAPI spec for StatusController
See merge request pleroma/pleroma!2521
|
2020-05-13 09:34:30 +00:00 |
|
lain
|
1307d6ca3c
|
Merge branch 'openapi/timelines' into 'develop'
Add OpenAPI spec for TimelineController
See merge request pleroma/pleroma!2506
|
2020-05-13 09:33:37 +00:00 |
|
Alexander Strizhakov
|
fbe3d3aa5f
|
ignore order
|
2020-05-13 11:38:23 +03:00 |
|
Alexander Strizhakov
|
2c356a4bac
|
don't use async with global mocks
|
2020-05-13 11:38:23 +03:00 |
|
Alexander Strizhakov
|
12635bc156
|
don't use global mocks in setup callbacks
|
2020-05-13 11:38:22 +03:00 |
|
Alexander Strizhakov
|
b962b24e6f
|
don't run in async if tests depend on env config
|
2020-05-13 11:38:22 +03:00 |
|
Alexander Strizhakov
|
ec27f346ee
|
correct order for publised in assert
|
2020-05-13 11:38:22 +03:00 |
|
Alexander Strizhakov
|
e0944dee99
|
make test fail everytime
|
2020-05-13 11:38:22 +03:00 |
|
Alexander Strizhakov
|
712055612f
|
don't run tests which change env in async
|
2020-05-13 11:38:22 +03:00 |
|
Alexander Strizhakov
|
4ba913d641
|
{:error, :enoent} s3 fix
s3 tests were executed before temp file was uploaded
|
2020-05-13 11:38:21 +03:00 |
|
lain
|
3210e939bf
|
Merge branch 'upgrade-comeonin' into 'develop'
Upgrade Comeonin to v5
See merge request pleroma/pleroma!2523
|
2020-05-13 07:45:35 +00:00 |
|
Alex Gleason
|
b46811a074
|
Upgrade Comeonin to v5
https://github.com/riverrun/comeonin/blob/master/UPGRADE_v5.md
|
2020-05-12 17:14:59 -05:00 |
|
Egor Kislitsyn
|
79ad12064d
|
Fix format
|
2020-05-13 01:59:17 +04:00 |
|
minibikini
|
cb1a3e196c
|
Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex
|
2020-05-12 21:23:43 +00:00 |
|
minibikini
|
5a2333925c
|
Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex
|
2020-05-12 21:23:36 +00:00 |
|
minibikini
|
822e9c09aa
|
Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex
|
2020-05-12 21:23:21 +00:00 |
|
minibikini
|
40646a7e0e
|
Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex
|
2020-05-12 21:14:52 +00:00 |
|
minibikini
|
0bb164a3e1
|
Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex
|
2020-05-12 21:12:22 +00:00 |
|
minibikini
|
648cc0d72d
|
Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex
|
2020-05-12 21:09:26 +00:00 |
|
Egor Kislitsyn
|
7803a85d2c
|
Add OpenAPI spec for StatusController
|
2020-05-13 00:25:21 +04:00 |
|
rinpatch
|
c74018e6a7
|
Merge branch 'fix/eldap-required' into 'develop'
fix eldap being required for non-OTP releases
See merge request pleroma/pleroma!2520
|
2020-05-12 20:20:19 +00:00 |
|
Stephanie Wilde-Hobbs
|
a2fcfc78c9
|
Filter config descriptions by config whitelist
|
2020-05-12 21:07:33 +01:00 |
|
rinpatch
|
da2fe8920d
|
fix eldap being required for non-OTP releases
|
2020-05-12 23:03:21 +03:00 |
|
rinpatch
|
2b18b8a263
|
Merge branch 'streamer-get-topic' into 'develop'
Expand and authorize streams in Streamer directly
See merge request pleroma/pleroma!2519
|
2020-05-12 17:02:57 +00:00 |
|
href
|
68cca29dcf
|
Fix typo in test
|
2020-05-12 18:51:10 +02:00 |
|
rinpatch
|
24c8c13640
|
Merge branch '1757-blocks-breaking-on-disabled-outgoing-blocks' into 'develop'
ActivityPub: Fix non-federating blocks.
Closes #1757
See merge request pleroma/pleroma!2514
|
2020-05-12 16:45:46 +00:00 |
|
rinpatch
|
4cc71aad65
|
Merge branch '1748-remote-following-follower-count' into 'develop'
Transmogrifier: On incoming follow accept, update follow counts.
Closes #1748
See merge request pleroma/pleroma!2515
|
2020-05-12 16:44:58 +00:00 |
|
Stephanie Wilde-Hobbs
|
620247a015
|
Add database configuration whitelist
|
2020-05-12 17:12:27 +01:00 |
|