summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-05-15Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-dms
2020-05-15Chats: Add updated_at to Schema and docs.lain
2020-05-15Merge branch 'openapi/nullable-request-fields' into 'develop'rinpatch
[OpenAPI] Mark all not required request fields as nullable Closes #1761 See merge request pleroma/pleroma!2536
2020-05-15[OpenAPI] Mark all not required request fields as nullableEgor Kislitsyn
2020-05-15Merge branch 'weblate-pleroma-pleroma' into 'develop'rinpatch
Translations update from Weblate See merge request pleroma/pleroma!2531
2020-05-14Translated using Weblate (Polish)Michał Sidor
Currently translated at 61.3% (65 of 106 strings) Translation: Pleroma/Pleroma backend Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/pl/
2020-05-14Translated using Weblate (Polish)Michał Sidor
Currently translated at 55.6% (59 of 106 strings) Translation: Pleroma/Pleroma backend Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/pl/
2020-05-14Added translation using Weblate (Polish)Michał Sidor
2020-05-14Merge branch 'feature/database-configuration-whitelist' into 'develop'rinpatch
Database configuration whitelist See merge request pleroma/pleroma!2522
2020-05-14Add config migration disclaimer to config whitelist documentationStephanie Wilde-Hobbs
2020-05-14Merge branch 'bcrypt-auth' into 'develop'lain
Handle bcrypt passwords for Mastodon migration See merge request pleroma/pleroma!2527
2020-05-14Pbkdf2.verify_pass --> AuthenticationPlug.checkpwAlex Gleason
2020-05-14Add Changelog entryStephanie Wilde-Hobbs
2020-05-14Allow whitelisting whole groupsStephanie Wilde-Hobbs
2020-05-14ChatView: Add update_at field.lain
2020-05-14Style fixesSteph
2020-05-14Merge branch 'features/openrc-console' into 'develop'lain
init.d/pleroma: Add option to attach an elixir console See merge request pleroma/pleroma!1704
2020-05-14Merge branch 'openapi/pleroma-api/accounts' into 'develop'lain
Add OpenAPI spec for PleromaAPI.AccountController See merge request pleroma/pleroma!2528
2020-05-14Apply suggestion to ↵lain
lib/pleroma/web/api_spec/operations/pleroma_account_operation.ex
2020-05-14Apply suggestion to ↵lain
lib/pleroma/web/api_spec/operations/pleroma_account_operation.ex
2020-05-14Merge branch 'pleroma_internal' into 'develop'lain
Add `pleroma_internal` as an internal field See merge request pleroma/pleroma!2533
2020-05-13Add `pleroma_internal` as an internal fieldAlex Gleason
2020-05-13Merge branch 'weblate-pleroma-pleroma' into 'develop'rinpatch
Translations update from Weblate See merge request pleroma/pleroma!2529
2020-05-13Handle bcrypt passwords for Mastodon migrationAlex Gleason
2020-05-13Add OpenAPI spec for PleromaAPI.AccountControllerEgor Kislitsyn
2020-05-13Translated using Weblate (French)Haelwenn (lanodan) Monnier
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-13Merge branch 'fix/1742-random-failing-tests' into 'develop'lain
Fix sporadically failing tests See merge request pleroma/pleroma!2524
2020-05-13Chat: Allow posting without content if an attachment is present.lain
2020-05-13InstanceView: Add pleroma chat messages to nodeinfolain
2020-05-13Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-dms
2020-05-13Merge branch 'openapi/suggestions' into 'develop'lain
Add OpenAPI spec for SuggestionController See merge request pleroma/pleroma!2525
2020-05-13Add OpenAPI spec for SuggestionControllerEgor Kislitsyn
2020-05-13Merge branch 'openapi/statuses' into 'develop'lain
Add OpenAPI spec for StatusController See merge request pleroma/pleroma!2521
2020-05-13Merge branch 'openapi/timelines' into 'develop'lain
Add OpenAPI spec for TimelineController See merge request pleroma/pleroma!2506
2020-05-13ignore orderAlexander Strizhakov
2020-05-13don't use async with global mocksAlexander Strizhakov
2020-05-13don't use global mocks in setup callbacksAlexander Strizhakov
2020-05-13don't run in async if tests depend on env configAlexander Strizhakov
2020-05-13correct order for publised in assertAlexander Strizhakov
2020-05-13make test fail everytimeAlexander Strizhakov
2020-05-13don't run tests which change env in asyncAlexander Strizhakov
2020-05-13{:error, :enoent} s3 fixAlexander Strizhakov
s3 tests were executed before temp file was uploaded
2020-05-13Merge branch 'upgrade-comeonin' into 'develop'lain
Upgrade Comeonin to v5 See merge request pleroma/pleroma!2523
2020-05-12Upgrade Comeonin to v5Alex Gleason
https://github.com/riverrun/comeonin/blob/master/UPGRADE_v5.md
2020-05-13Fix formatEgor Kislitsyn
2020-05-12Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.exminibikini
2020-05-12Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.exminibikini
2020-05-12Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.exminibikini
2020-05-12Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.exminibikini
2020-05-12Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.exminibikini