summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-12-20Fix config.md path in READMErinpatch
2018-12-20Fix config.md path in READMErinpatch
2018-12-20Merge branch 'readme' into 'develop'kaniini
Improve systemd service documentation See merge request pleroma/pleroma!580
2018-12-20Merge branch 'documentation/copy-pleroma-api' into 'develop'kaniini
Pleroma-API.md: Import from /wikis/Pleroma-only-api-endpoints See merge request pleroma/pleroma!571
2018-12-19Improve systemd service documentationFrancis Dinh
Use `systemctl` instead of `service` since it's not guaranteed the latter will be on the system (e.g. Arch does not have it).
2018-12-19Merge branch 'userless-admin' into 'develop'kaniini
Add a way to use the admin api without a user. See merge request pleroma/pleroma!576
2018-12-18Merge branch 'fix/ci-cache-improved' into 'develop'lambda
Per-branch CI cache with force-recompilation of Pleroma See merge request pleroma/pleroma!574
2018-12-18Merge branch 'fix/formatter-ignore-html-chars' into 'develop'lambda
[#441] Fix characters converted to HTML being picked up by hashtag parser See merge request pleroma/pleroma!575
2018-12-18Compile pleroma before ecto migrateRin Toshaka
2018-12-18Add a way to use the admin api without a user.lain
2018-12-18Improve CI cacheRin Toshaka
2018-12-18Fix testsRin Toshaka
2018-12-18Add testrinpatch
2018-12-18Merge branch 'develop' into fix/formatter-ignore-html-charsrinpatch
2018-12-18Ignore HTML characters in formatter.exrinpatch
2018-12-18Pleroma-API.md: Additionnal endpointsrinpatch
2018-12-18Move to docsHaelwenn (lanodan) Monnier
2018-12-18Documentation: Move generated files to priv/static/doc, add it to endpoint.exHaelwenn (lanodan) Monnier
2018-12-18Merge branch 'feature/new-user-routes' into 'develop'lambda
Use "~" as a route namespace symbol on FE See merge request pleroma/pleroma!530
2018-12-18Merge branch 'new-routes-integration' into 'develop'lambda
update frontend See merge request pleroma/pleroma!573
2018-12-18update frontendlain
2018-12-18Merge branch 'ci-test-fix' into 'develop'lambda
SetUserSessionIdPlugTest: try to fix random ci failures See merge request pleroma/pleroma!570
2018-12-18Pleroma-API.md: Import from /wikis/Pleroma-only-api-endpointsHaelwenn (lanodan) Monnier
2018-12-18SetUserSessionIdPlugTest: try to fix random ci failureshref
2018-12-18Merge branch 'runtime-static-plug' into 'develop'lambda
Instance/Runtime static plug See merge request pleroma/pleroma!567
2018-12-17Instance/Static runtime plughref
This allows to set-up an arbitrary directory which overrides most of the static files: index.html static/ emoji/ packs/ sounds/ images/ instance/ favicon.png. If the files are not present in the directory, the bundled ones in priv/static will be used.
2018-12-17Merge branch '2018-12-17-update-frontend' into 'develop'lambda
2018 12 17 update frontend See merge request pleroma/pleroma!565
2018-12-17Merge branch 'fix-test' into 'develop'lambda
Fix uploads test. See merge request pleroma/pleroma!564
2018-12-17Merge remote-tracking branch 'origin/develop' into 2018-12-17-update-frontendlain
2018-12-17Merge branch '459_fix_user_profile_crash' into 'develop'lambda
Fix update_profile failing due to OAuth token record in assigns instead of string Closes #459 See merge request pleroma/pleroma!561
2018-12-17update frontendlain
2018-12-17Merge branch 'support/issue_449' into 'develop'lambda
[#449] fix text field See merge request pleroma/pleroma!563
2018-12-17Fix uploads test.lain
2018-12-17fix text fieldMaksim Pechnikov
2018-12-17Merge branch 'captcha' into 'develop'lambda
Captcha See merge request pleroma/pleroma!550
2018-12-17Merge branch 'fix-tags' into 'develop'lambda
Fix tagging problems for existing instances. See merge request pleroma/pleroma!562
2018-12-17Merge branch 'test-mix-tasks' into 'develop'lambda
Add tests for Mix tasks See merge request pleroma/pleroma!555
2018-12-17Merge branch 'phoenix14' into 'develop'lambda
Upgrade to Phoenix 1.4 Closes #451 See merge request pleroma/pleroma!560
2018-12-17don't re-use buildlain
2018-12-17Fix tagging problems for existing instances.lain
2018-12-17Alias Kocaptcha in the testEkaterina Vaartis
2018-12-17Use :ets.match_delete to delete old captchasvaartis
2018-12-17Switch to phoenixframework/phoenix as the needed change is merged.href
2018-12-17Integration tests for mastodon websockethref
2018-12-17Cowboy handler for Mastodon WebSockethref
2018-12-17Support both OAuth token record and token string in UserViewraeno
2018-12-17Merge branch 'testfix/webfinger-jrd' into 'develop'lambda
WebFinger: Sends a 400 when resource param is missing, fix XRD typo in test See merge request pleroma/pleroma!554
2018-12-17minutes->seconds_retained in config.mdvaartis
2018-12-16Clean captchas up periodically, not schedule it after theyre createdEkaterina Vaartis
2018-12-16Fix captcha testsEkaterina Vaartis