summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-03-07Merge branch 'restart-fix-for-mix-tasks' into 'develop'rinpatch
Wait in mix task while pleroma is rebooted See merge request pleroma/pleroma!2225
2020-03-07start gun upload pool, if proxy_remote is enabledAlexander Strizhakov
2020-03-07tests changesAlexander Strizhakov
2020-03-07using `stub` instead `expect`Alexander Strizhakov
2020-03-06Merge branch 'update/adminfe-2.0.0-release' into 'release/2.0.0'rinpatch
Remove EmojiPacks from AdminFE build See merge request pleroma/pleroma!2275
2020-03-06little polishingAlexander Strizhakov
2020-03-06little refactorAlexander Strizhakov
2020-03-06removing GunMock to use MoxAlexander Strizhakov
2020-03-06Merge branch 'revert-67cc4dce' into 'develop'feld
Revert "Merge branch 'update/admin-fe-without-emojipack' into 'develop'" See merge request pleroma/pleroma!2276
2020-03-06Revert "Merge branch 'update/admin-fe-without-emojipack' into 'develop'"feld
This reverts merge request !2274
2020-03-06Remove EmojiPacks from AdminFE buildMark Felder
Once more, with feeling
2020-03-06Merge branch 'update/admin-fe-without-emojipack' into 'develop'lain
Remove emoji support from AdminFE See merge request pleroma/pleroma!2274
2020-03-06Remove emoji support from AdminFEMark Felder
2020-03-06Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
1560-non-federating-instances-routes-restrictions
2020-03-05pleroma-fe bundle: update to 83d8343777050f6ee5fad09832b3878885eda4ddrinpatch
2020-03-05Merge branch 'stable' into release/2.0.0rinpatch
2020-03-05Merge branch 'stable' into release/2.0.0rinpatch
2020-03-05version bump changelog and mix versionrinpatch
2020-03-05changelog: sync with stablerinpatch
2020-03-05[#1560] Misc. improvements in ActivityPubController federation state ↵Ivan Tashkinov
restrictions.
2020-03-05removing integration testsAlexander Strizhakov
2020-03-05returning, not neededAlexander Strizhakov
2020-03-05removing try block in tesla requestAlexander Strizhakov
added mocks for tests which fail with Tesla.Mock.Error
2020-03-05Exclude private and direct statuses visible to the admin when using godmodeeugenijm
2020-03-05Merge branch 'proper_error_messages' into 'develop'lain
MastodonController: Return 404 errors correctly. See merge request pleroma/pleroma!2270
2020-03-05Admin API tests: Fix wrong test.lain
2020-03-05Merge branch 'fix/stats-on-startup' into 'develop'Haelwenn
Generate instance stats on startup Closes #1598 See merge request pleroma/pleroma!2271
2020-03-05removing try block in getting gun infoAlexander Strizhakov
2020-03-04Document the instance stats fixMark Felder
2020-03-04Generate instance stats on startupMark Felder
2020-03-04Merge branch 'exclude-reblogs-from-admin-api-by-default' into 'develop'feld
Exclude reblogs from `GET /api/pleroma/admin/statuses` by default Closes #1596 See merge request pleroma/pleroma!2267
2020-03-04adding descriptionsAlexander Strizhakov
2020-03-04MastodonController: Return 404 errors correctly.lain
2020-03-04updating tesla refAlexander Strizhakov
2020-03-04moving some logic to tesla adapterAlexander Strizhakov
- checking original inside gun adapter - flushing streams on max_body error
2020-03-04Merge branch 'fix/no-email-no-fail' into 'develop'lain
Do not fail when user has no email See merge request pleroma/pleroma!2249
2020-03-04same copyright date formatAlexander Strizhakov
2020-03-04otp versionAlexander Strizhakov
2020-03-04retry_timeout description changeAlexander Strizhakov
2020-03-03Update Copyrights for gun related filesMark Felder
2020-03-03Merge branch 'develop' into gunMark Felder
2020-03-03Merge branch 'chore/update-copyrights' into 'develop'Haelwenn
Update Copyrights See merge request pleroma/pleroma!2269
2020-03-03Older copyright updatesMark Felder
2020-03-03Update CopyrightsMark Felder
2020-03-03[#1560] ActivityPubController federation state restrictions adjustments. ↵Ivan Tashkinov
Adjusted tests.
2020-03-03refactoring for gun api modulesAlexander Strizhakov
2020-03-03don't test gun itselfAlexander Strizhakov
2020-03-03adapter renaming to adapter_helperAlexander Strizhakov
2020-03-03retry and retry_timeout settings default changeAlexander Strizhakov
2020-03-03no try block in checkout connectionAlexander Strizhakov
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-15 09:37:20 +0000