c52453fbd6
Merge branch 'fix/readme-md-config-typo' into 'develop'
...
Fix config.md path in README
See merge request pleroma/pleroma!581
6 years ago
acfd98689b
Fix config.md path in README
6 years ago
6081c44961
Fix config.md path in README
6 years ago
2e4f73a9c4
Merge branch 'readme' into 'develop'
...
Improve systemd service documentation
See merge request pleroma/pleroma!580
6 years ago
fda148a9a2
Merge branch 'documentation/copy-pleroma-api' into 'develop'
...
Pleroma-API.md: Import from /wikis/Pleroma-only-api-endpoints
See merge request pleroma/pleroma!571
6 years ago
8c4fa68428
Improve systemd service documentation
...
Use `systemctl` instead of `service` since it's not guaranteed the
latter will be on the system (e.g. Arch does not have it).
6 years ago
f98ee9402f
Merge branch 'userless-admin' into 'develop'
...
Add a way to use the admin api without a user.
See merge request pleroma/pleroma!576
6 years ago
a3da8a56b6
Merge branch 'fix/ci-cache-improved' into 'develop'
...
Per-branch CI cache with force-recompilation of Pleroma
See merge request pleroma/pleroma!574
6 years ago
b7f6350107
Merge branch 'fix/formatter-ignore-html-chars' into 'develop'
...
[#441 ] Fix characters converted to HTML being picked up by hashtag parser
See merge request pleroma/pleroma!575
6 years ago
facd30c9e8
Compile pleroma before ecto migrate
6 years ago
f3eb414e28
Add a way to use the admin api without a user.
6 years ago
f685351c1e
Improve CI cache
6 years ago
196d9c0fd0
Fix tests
6 years ago
8a67677d77
Add test
6 years ago
ef318fb8a9
Merge branch 'develop' into fix/formatter-ignore-html-chars
6 years ago
059dd6f681
Ignore HTML characters in formatter.ex
6 years ago
d6b133ec51
Pleroma-API.md: Additionnal endpoints
6 years ago
6adea5a7b2
Move to docs
6 years ago
a6dfe1fc6b
Documentation: Move generated files to priv/static/doc, add it to endpoint.ex
6 years ago
443d59baa0
Merge branch 'feature/new-user-routes' into 'develop'
...
Use "~" as a route namespace symbol on FE
See merge request pleroma/pleroma!530
6 years ago
c9ddcd803b
Merge branch 'new-routes-integration' into 'develop'
...
update frontend
See merge request pleroma/pleroma!573
6 years ago
9c4344e16c
update frontend
6 years ago
5177426ec5
Merge branch 'ci-test-fix' into 'develop'
...
SetUserSessionIdPlugTest: try to fix random ci failures
See merge request pleroma/pleroma!570
6 years ago
08b6294f47
Pleroma-API.md: Import from /wikis/Pleroma-only-api-endpoints
6 years ago
daaa8cd66a
SetUserSessionIdPlugTest: try to fix random ci failures
6 years ago
b6ae412fcd
Merge branch 'runtime-static-plug' into 'develop'
...
Instance/Runtime static plug
See merge request pleroma/pleroma!567
6 years ago
b1860fe85a
Instance/Static runtime plug
...
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.
6 years ago
3879500c87
Merge branch '2018-12-17-update-frontend' into 'develop'
...
2018 12 17 update frontend
See merge request pleroma/pleroma!565
6 years ago
7d9254fb4a
Merge branch 'fix-test' into 'develop'
...
Fix uploads test.
See merge request pleroma/pleroma!564
6 years ago
eb2d34eb6c
Merge remote-tracking branch 'origin/develop' into 2018-12-17-update-frontend
6 years ago
3d980daa49
Merge branch '459_fix_user_profile_crash' into 'develop'
...
Fix update_profile failing due to OAuth token record in assigns instead of string
Closes #459
See merge request pleroma/pleroma!561
6 years ago
3e1816fcd5
update frontend
6 years ago
ebbe11f33b
Merge branch 'support/issue_449' into 'develop'
...
[#449 ] fix text field
See merge request pleroma/pleroma!563
6 years ago
52bda3b456
Fix uploads test.
6 years ago
92a5133c42
fix text field
6 years ago
52ac7dce5c
Merge branch 'captcha' into 'develop'
...
Captcha
See merge request pleroma/pleroma!550
6 years ago
c6d5f189d9
Merge branch 'fix-tags' into 'develop'
...
Fix tagging problems for existing instances.
See merge request pleroma/pleroma!562
6 years ago
98c31deaa9
Merge branch 'test-mix-tasks' into 'develop'
...
Add tests for Mix tasks
See merge request pleroma/pleroma!555
6 years ago
078b8b6d22
Merge branch 'phoenix14' into 'develop'
...
Upgrade to Phoenix 1.4
Closes #451
See merge request pleroma/pleroma!560
6 years ago
0f67c1d487
don't re-use build
6 years ago
e4763cd459
Fix tagging problems for existing instances.
6 years ago
de981ac5a2
Alias Kocaptcha in the test
6 years ago
35522fef09
Use :ets.match_delete to delete old captchas
6 years ago
ba9ef77b6a
Switch to phoenixframework/phoenix as the needed change is merged.
6 years ago
b12a904911
Integration tests for mastodon websocket
6 years ago
77b5154c82
Cowboy handler for Mastodon WebSocket
6 years ago
cc87880488
Support both OAuth token record and token string in UserView
6 years ago
567359790e
Merge branch 'testfix/webfinger-jrd' into 'develop'
...
WebFinger: Sends a 400 when resource param is missing, fix XRD typo in test
See merge request pleroma/pleroma!554
6 years ago
6e2f64a0a6
minutes->seconds_retained in config.md
6 years ago
ef6829382a
Clean captchas up periodically, not schedule it after theyre created
6 years ago
kaniini