Commit Graph

8763 Commits (d63dca8d99196c91dc3e20e2d27f61ea753b84af)
 

Author SHA1 Message Date
Ivan Tashkinov bd40880fa0 Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
5 years ago
rinpatch 00d1752031 Merge branch 'docs/new_user' into 'develop'
5 years ago
feld 2019f3b3ff Merge branch 'fix/signup-without-email' into 'develop'
5 years ago
rinpatch 7cdabdc0df Merge branch 'fix/1610-release-compilation-config-fix' into 'develop'
5 years ago
feld f92c447bbc Merge branch 'relay-list-change' into 'develop'
5 years ago
rinpatch c3b9fbd3a7 Revert "Set better Cache-Control header for static content"
5 years ago
Alexander Strizhakov fce090c1de
using Pleroma.Config instead of ets
5 years ago
Alexander Strizhakov 193d67cde5
compile fix
5 years ago
Alexander Strizhakov 282a93554f
merging release default config on app start
5 years ago
Ivan Tashkinov 5b696a8ac1 [#1560] Enforced authentication for non-federating instances in StaticFEController.
5 years ago
rinpatch 9dbf493b65 Merge branch 'docs/debian-install' into 'develop'
5 years ago
Haelwenn (lanodan) Monnier 6316726a5f
CLI_tasks: Use manpage formatting conventions
5 years ago
Haelwenn (lanodan) Monnier a06104b9d5
CLI_tasks/user.md: Fix `pleroma.user new` documentation
5 years ago
Haelwenn 8ad73445cd Merge branch 'bugfix/bad-pleromafe-bundle' into 'develop'
5 years ago
Ivan Tashkinov 972889550d Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
5 years ago
Haelwenn (lanodan) Monnier a747eb6df9
static-fe.css: Restore from before a65ee8ea
5 years ago
lain 953aece848 Merge branch 'fix/post-length-validation' into 'develop'
5 years ago
Mark Felder 5af798f246 Fix enforcement of character limits
5 years ago
Haelwenn (lanodan) Monnier d9134d4430
installation/otp_en.md: Fix pleroma.nginx target [deb]
5 years ago
Ivan Tashkinov 5fc92deef3 [#1560] Ensured authentication or enabled federation for federation-related routes. New tests + tests refactoring.
5 years ago
lain 841e4e4d83 Merge branch 'patch-1' into 'develop'
5 years ago
rinpatch 5b74976c8d Merge branch 'chore/mix-version-bump' into 'develop'
5 years ago
rinpatch 86e7709a4d mix.exs: bump version to development one
5 years ago
rinpatch 663e466067 Merge branch 'stable' into 'develop'
5 years ago
rinpatch e8493431bf Merge branch 'release/2.0.0' into 'stable'
5 years ago
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
rinpatch 6d797b9928 Merge branch 'restart-fix-for-mix-tasks' into 'develop'
5 years ago
rinpatch f259b1adab Merge branch 'update/adminfe-2.0.0-release' into 'release/2.0.0'
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
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
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