968d7490b6
[ #114 ] User.Info: renamed `confirmation_update` to `confirmation_changeset`.
2018-12-19 16:31:03 +03:00
59fc5d15df
[ #114 ] User.Info: renamed `confirmation_update` to `confirmation_change`.
2018-12-19 16:27:16 +03:00
f98ee9402f
Merge branch 'userless-admin' into 'develop'
...
Add a way to use the admin api without a user.
See merge request pleroma/pleroma!576
2018-12-19 00:12:39 +00:00
a3da8a56b6
Merge branch 'fix/ci-cache-improved' into 'develop'
...
Per-branch CI cache with force-recompilation of Pleroma
See merge request pleroma/pleroma!574
2018-12-18 21:11:40 +00:00
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
2018-12-18 20:23:21 +00:00
facd30c9e8
Compile pleroma before ecto migrate
2018-12-18 21:20:49 +01:00
f3eb414e28
Add a way to use the admin api without a user.
2018-12-18 21:08:52 +01:00
f685351c1e
Improve CI cache
2018-12-18 21:06:53 +01:00
196d9c0fd0
Fix tests
2018-12-18 20:30:04 +01:00
8a67677d77
Add test
2018-12-18 22:10:56 +03:00
ef318fb8a9
Merge branch 'develop' into fix/formatter-ignore-html-chars
2018-12-18 21:39:36 +03:00
059dd6f681
Ignore HTML characters in formatter.ex
2018-12-18 21:38:15 +03:00
d6b133ec51
Pleroma-API.md: Additionnal endpoints
2018-12-18 18:33:39 +01:00
6adea5a7b2
Move to docs
2018-12-18 17:16:26 +01:00
a6dfe1fc6b
Documentation: Move generated files to priv/static/doc, add it to endpoint.ex
2018-12-18 17:05:36 +01:00
443d59baa0
Merge branch 'feature/new-user-routes' into 'develop'
...
Use "~" as a route namespace symbol on FE
See merge request pleroma/pleroma!530
2018-12-18 15:42:07 +00:00
c9ddcd803b
Merge branch 'new-routes-integration' into 'develop'
...
update frontend
See merge request pleroma/pleroma!573
2018-12-18 15:41:38 +00:00
9c4344e16c
update frontend
2018-12-18 16:28:13 +01:00
5177426ec5
Merge branch 'ci-test-fix' into 'develop'
...
SetUserSessionIdPlugTest: try to fix random ci failures
See merge request pleroma/pleroma!570
2018-12-18 15:18:10 +00:00
468d472d2b
[ #114 ] Added info on `account_activation_required` setting to config readme.
2018-12-18 17:52:38 +03:00
f58f20abbb
Twitter ActivityView: fix crash when activity content is nil
2018-12-18 15:34:27 +01:00
3371a45884
[ #114 ] Formatting fix.
2018-12-18 17:30:30 +03:00
b096e30cff
[ #114 ] Added email confirmation resend action. Added tests
...
for registration, authentication, email confirmation, confirmation resending.
Made admin methods create confirmed users.
2018-12-18 17:22:46 +03:00
aed0f90287
[ #114 ] Added `pleroma.confirmation_pending` to user views, adjusted view tests.
2018-12-18 17:22:45 +03:00
b86057cc7f
[ #114 ] Refactored User.register_changeset to init confirmation data.
...
Introduced User.register/1 to encapsulate User record creation and post-registration actions.
2018-12-18 17:22:42 +03:00
1de0aa2f10
[ #114 ] Account confirmation email, registration as unconfirmed (config-based), auth prevention for unconfirmed.
2018-12-18 17:21:05 +03:00
a05cb10a95
[ #114 ] Email confirmation route, action, node setting, User.Info fields.
2018-12-18 17:18:53 +03:00
a300336459
Merge branch 'develop' into oembed_provider
2018-12-18 14:59:32 +01:00
08b6294f47
Pleroma-API.md: Import from /wikis/Pleroma-only-api-endpoints
2018-12-18 13:58:34 +01:00
daaa8cd66a
SetUserSessionIdPlugTest: try to fix random ci failures
2018-12-18 13:40:25 +01:00
b6ae412fcd
Merge branch 'runtime-static-plug' into 'develop'
...
Instance/Runtime static plug
See merge request pleroma/pleroma!567
2018-12-18 10:42:56 +00:00
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.
2018-12-17 22:50:59 +01:00
3879500c87
Merge branch '2018-12-17-update-frontend' into 'develop'
...
2018 12 17 update frontend
See merge request pleroma/pleroma!565
2018-12-17 20:36:21 +00:00
7d9254fb4a
Merge branch 'fix-test' into 'develop'
...
Fix uploads test.
See merge request pleroma/pleroma!564
2018-12-17 20:24:58 +00:00
eb2d34eb6c
Merge remote-tracking branch 'origin/develop' into 2018-12-17-update-frontend
2018-12-17 21:19:00 +01:00
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
2018-12-17 20:16:15 +00:00
3e1816fcd5
update frontend
2018-12-17 21:13:04 +01:00
ebbe11f33b
Merge branch 'support/issue_449' into 'develop'
...
[#449 ] fix text field
See merge request pleroma/pleroma!563
2018-12-17 20:11:46 +00:00
52bda3b456
Fix uploads test.
2018-12-17 20:55:24 +01:00
92a5133c42
fix text field
2018-12-17 22:53:16 +03:00
52ac7dce5c
Merge branch 'captcha' into 'develop'
...
Captcha
See merge request pleroma/pleroma!550
2018-12-17 19:45:14 +00:00
c6d5f189d9
Merge branch 'fix-tags' into 'develop'
...
Fix tagging problems for existing instances.
See merge request pleroma/pleroma!562
2018-12-17 19:38:24 +00:00
98c31deaa9
Merge branch 'test-mix-tasks' into 'develop'
...
Add tests for Mix tasks
See merge request pleroma/pleroma!555
2018-12-17 19:37:05 +00:00
078b8b6d22
Merge branch 'phoenix14' into 'develop'
...
Upgrade to Phoenix 1.4
Closes #451
See merge request pleroma/pleroma!560
2018-12-17 19:30:05 +00:00
0f67c1d487
don't re-use build
2018-12-17 20:26:48 +01:00
e4763cd459
Fix tagging problems for existing instances.
2018-12-17 20:12:01 +01:00
de981ac5a2
Alias Kocaptcha in the test
2018-12-17 20:53:42 +03:00
35522fef09
Use :ets.match_delete to delete old captchas
2018-12-17 20:35:21 +03:00
ba9ef77b6a
Switch to phoenixframework/phoenix as the needed change is merged.
2018-12-17 17:28:03 +01:00
b12a904911
Integration tests for mastodon websocket
2018-12-17 17:09:06 +01:00
Ivan Tashkinov