Commit Graph

8858 Commits (7f9b5284fa7dd1d9100de730a6fe0c93739d1b30)
 

Author SHA1 Message Date
rinpatch e7c49d51d7 pleroma-fe bundle: update to 38455294120a27d254b6cbe237a1adcf9d27e6af
5 years ago
rinpatch 80ca06227a Merge branch 'fix/moderation-log-crashes' into 'release/2.0.0'
5 years ago
rinpatch 6cf1958b02 moderation log: fix improperly migrated data
5 years ago
Alexander Strizhakov 474ef512df wait in mix task while pleroma is rebooted
5 years ago
Alexander Strizhakov b2eb1124d1
Merge branch 'develop' into gun
5 years ago
rinpatch 6d797b9928 Merge branch 'restart-fix-for-mix-tasks' into 'develop'
5 years ago
Alexander Strizhakov 5f42ecc4c7
start gun upload pool, if proxy_remote is enabled
5 years ago
Alexander Strizhakov 9f884a2639
tests changes
5 years ago
Alexander Strizhakov 14678a7708
using `stub` instead `expect`
5 years ago
rinpatch f259b1adab Merge branch 'update/adminfe-2.0.0-release' into 'release/2.0.0'
5 years ago
Alexander Strizhakov 78282dc983
little polishing
5 years ago
Alexander Strizhakov c93c3096d5
little refactor
5 years ago
Alexander Strizhakov 56ff02f2ef
removing GunMock to use Mox
5 years ago
feld 46f118d7e1 Merge branch 'revert-67cc4dce' into 'develop'
5 years ago
feld 15d36b7f5f Revert "Merge branch 'update/admin-fe-without-emojipack' into 'develop'"
5 years ago
Mark Felder e25bacabb1 Remove EmojiPacks from AdminFE build
5 years ago
lain 67cc4dceb5 Merge branch 'update/admin-fe-without-emojipack' into 'develop'
5 years ago
Mark Felder d283c9abc1 Remove emoji support from AdminFE
5 years ago
Ivan Tashkinov 027714b519 Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
5 years ago
rinpatch a65ee8ead6 pleroma-fe bundle: update to 83d8343777050f6ee5fad09832b3878885eda4dd
5 years ago
rinpatch 4271cfb81a Merge branch 'stable' into release/2.0.0
5 years ago
rinpatch 7605fe5065 Merge branch 'stable' into release/2.0.0
5 years ago
rinpatch 3508ae7039 version bump changelog and mix version
5 years ago
rinpatch 69a85e9c82 changelog: sync with stable
5 years ago
Ivan Tashkinov 40765875d4 [#1560] Misc. improvements in ActivityPubController federation state restrictions.
5 years ago
Alexander Strizhakov 931111fd55
removing integration tests
5 years ago
Alexander Strizhakov 058c9b01ac
returning, not needed
5 years ago
Alexander Strizhakov f0753eed0f
removing try block in tesla request
5 years ago
eugenijm ad22e94f33 Exclude private and direct statuses visible to the admin when using godmode
5 years ago
lain 47604907c9 Merge branch 'proper_error_messages' into 'develop'
5 years ago
lain f1750b4658 Admin API tests: Fix wrong test.
5 years ago
Haelwenn 927079e2ff Merge branch 'fix/stats-on-startup' into 'develop'
5 years ago
Alexander Strizhakov eb324467d9
removing try block in getting gun info
5 years ago
Mark Felder ec3dc462ff Document the instance stats fix
5 years ago
Mark Felder cdb05633a6 Generate instance stats on startup
5 years ago
feld 9b740cfb23 Merge branch 'exclude-reblogs-from-admin-api-by-default' into 'develop'
5 years ago
Alexander Strizhakov b34bc669b9
adding descriptions
5 years ago
lain 4bce13fa2f MastodonController: Return 404 errors correctly.
5 years ago
Alexander Strizhakov fe47bcde8c
updating tesla ref
5 years ago
Alexander Strizhakov d6bebd4f9c
moving some logic to tesla adapter
5 years ago
lain 6f7a8c43a2 Merge branch 'fix/no-email-no-fail' into 'develop'
5 years ago
Alexander Strizhakov 22d52f5691
same copyright date format
5 years ago
Alexander Strizhakov 6b2fb9160c
otp version
5 years ago
Alexander Strizhakov 8d9dee1ba9
retry_timeout description change
5 years ago
Mark Felder d9c5ae7c09 Update Copyrights for gun related files
5 years ago
Mark Felder 4427161ca3 Merge branch 'develop' into gun
5 years ago
Haelwenn 5992c256ad Merge branch 'chore/update-copyrights' into 'develop'
5 years ago
Mark Felder 5592db4757 Older copyright updates
5 years ago
Mark Felder 05da5f5cca Update Copyrights
5 years ago
Ivan Tashkinov b6fc98d9cd [#1560] ActivityPubController federation state restrictions adjustments. Adjusted tests.
5 years ago