aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-03-11static-fe.css: Restore from before a65ee8eaHaelwenn (lanodan) Monnier
Related: https://git.pleroma.social/pleroma/pleroma/issues/1616
2020-03-10Merge branch 'fix/post-length-validation' into 'develop'lain
Fix enforcement of character limits Closes #1618 See merge request pleroma/pleroma!2283
2020-03-10Fix enforcement of character limitsMark Felder
2020-03-10add verify tls_opts only when we open connectionAlexander Strizhakov
for other requests tesla will add tls_opts
2020-03-10tesla adapter can't be changed in adminFEAlexander Strizhakov
2020-03-10installation/otp_en.md: Fix pleroma.nginx target [deb]Haelwenn (lanodan) Monnier
Needs to be backported to stable. Related: https://git.pleroma.social/pleroma/pleroma-support/issues/29
2020-03-09[#1560] Ensured authentication or enabled federation for federation-related ↵Ivan Tashkinov
routes. New tests + tests refactoring.
2020-03-09Merge branch 'patch-1' into 'develop'lain
Better advice for vacuuming after restoring. See merge request pleroma/pleroma!2233
2020-03-09Merge branch 'develop' into gunAlexander Strizhakov
2020-03-08Merge branch 'chore/mix-version-bump' into 'develop'rinpatch
mix.exs: bump version to development one See merge request pleroma/pleroma!2279
2020-03-08mix.exs: bump version to development onerinpatch
2020-03-08Merge branch 'stable' into 'develop'rinpatch
Sync develop with stable Closes #1262, #1267, #1293, #1303, #1287, #1291, #1382, #1438, #1129, #1109, and #1606 See merge request pleroma/pleroma!2278
2020-03-08Merge branch 'release/2.0.0' into 'stable'v2.0.0rinpatch
Release/2.0.0 See merge request pleroma/pleroma!2273
2020-03-07pleroma-fe bundle: update to 38455294120a27d254b6cbe237a1adcf9d27e6afrinpatch
2020-03-07Merge branch 'fix/moderation-log-crashes' into 'release/2.0.0'rinpatch
moderation log: fix improperly migrated data See merge request pleroma/pleroma!2277
2020-03-07moderation log: fix improperly migrated datarinpatch
Some of the actions used to have a user map as a subject, which was then changed to an array of user maps. However instead of migrating old data there was just a hack to transform it every time, moreover this hack didn't include all possible actions, which resulted in crashes. This commit fixes the crashes by introducing a proper database migration for old data. Closes #1606
2020-03-07wait in mix task while pleroma is rebootedAlexander Strizhakov
2020-03-07Merge branch 'develop' into gunAlexander Strizhakov
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
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-22 09:32:59 +0000