Aurélien GEORGET
0165144938
Update ROADMAP.md
2018-01-31 13:37:15 +01:00
Jim LAURIE
d4d3440d07
Merge pull request #543 from memolipd/patch-1
...
moved config out of middleware and into app config
2018-01-31 13:21:57 +01:00
Jim LAURIE
8e236588b9
Merge branch 'master' into patch-1
2018-01-31 13:06:07 +01:00
Jim Laurie
9ef20e40b9
Create migration guide from alpha.8 to alpha.9
...
Co-authored-by: soupette
2018-01-31 12:25:18 +01:00
Jim LAURIE
f626f6c868
Merge pull request #538 from strapi/3.0.0-alpha.9
...
3.0.0-alpha.9
2018-01-31 08:37:41 +01:00
Jim LAURIE
80d327da8d
Merge branch 'master' into 3.0.0-alpha.9
2018-01-31 08:10:32 +01:00
Jim LAURIE
79bbd9088c
Merge pull request #537 from strapi/fix-providers-restrictions
...
Fix disable register and provider login
2018-01-31 08:08:00 +01:00
Jim LAURIE
1dd08597cd
Merge branch 'master' into fix-providers-restrictions
2018-01-31 07:51:24 +01:00
Paolo
f07a99542a
moved config out of middleware and into app config
...
noticed the defaults object was not being merged with the config, as a work around I've added the settings manually
2018-01-30 15:34:09 +00:00
Kristian Frølund
28cd762009
Rephrased error-text
2018-01-29 19:30:56 +01:00
Kristian Frølund
280109c034
Moved user validation logic from JWT service to permissions policy
2018-01-29 19:26:28 +01:00
Jim Laurie
8825f2fe2c
3.0.0-alpha.9
2018-01-29 17:24:10 +01:00
Jim Laurie
c044b105fc
Fix block provider conditions
2018-01-29 17:12:49 +01:00
Jim LAURIE
30d382652e
Merge pull request #536 from strapi/fix/user-relation
...
Fix content type builder bug #529 front-end
2018-01-29 14:06:36 +01:00
Jim LAURIE
236e65c54a
Merge branch 'master' into fix/user-relation
2018-01-29 13:46:09 +01:00
Jim LAURIE
40d0a17201
Merge pull request #518 from Froelund/master
...
Added default options to enable re-use
2018-01-29 13:45:51 +01:00
Jim Laurie
0164a76d4c
Fix disable register and provider login
2018-01-29 13:12:49 +01:00
Aurélien GEORGET
7f2fbc8453
Merge branch 'master' into master
2018-01-29 13:08:01 +01:00
cyril lopez
3e65ca8059
Merge branch 'fix/user-relation' of github.com:strapi/strapi into fix/user-relation
2018-01-29 12:06:11 +01:00
cyril lopez
ed5074318f
Add missing trad keys in admin
2018-01-29 11:58:18 +01:00
Jim LAURIE
62e5ccec63
Merge pull request #525 from strapi/fix/users-front
...
Fix/users front
2018-01-29 11:28:16 +01:00
cyril lopez
956365cacf
Merge branch 'master' into fix/user-relation
2018-01-29 11:20:15 +01:00
cyril lopez
1258fb7db4
Fix content type builder bug #529 front-end
...
The error was due to the notification provider which was passed an array instead of a string. It causes the UI to break becaus of FormattedMessage
2018-01-29 11:18:06 +01:00
Jim LAURIE
717287cec8
Merge branch 'master' into fix/users-front
2018-01-29 11:15:04 +01:00
Jim LAURIE
b33080e4fb
Merge pull request #534 from Adriang71/fix/save-user-permission-model
...
Fix/save user permission model
2018-01-29 11:14:57 +01:00
Jim LAURIE
eaae50c70f
Merge branch 'master' into fix/save-user-permission-model
2018-01-29 10:57:32 +01:00
Jim LAURIE
0b07b8c648
Merge pull request #526 from strapi/doc/email_variables
...
Add email template documentation
2018-01-29 09:10:33 +01:00
Jim LAURIE
059ededf2b
Merge branch 'master' into doc/email_variables
2018-01-29 08:44:26 +01:00
AdrianGunia
84365091f6
drop usless change
2018-01-28 19:50:37 +01:00
AdrianGunia
ad2a455466
fix bug(save user via gui)
2018-01-28 19:45:48 +01:00
Jørgensen
b0c915c34b
Merge branch 'master' into master
2018-01-27 08:09:19 +01:00
Jørgensen
69d6ed748b
Implemented review suggestion.
2018-01-27 08:08:59 +01:00
Aurelsicoko
ae9272925c
Add email template documentation
2018-01-26 18:04:39 +01:00
cyril lopez
54a4f33371
Merge branch 'master' into fix/users-front
2018-01-26 17:37:01 +01:00
cyril lopez
6e23c90434
Fix css and wording
...
As seen in the demo I removed the test transform capitalize in the ListRow component.
Add width to the iconContainer so it s now perfectly aligned.
Add missing trad key and change wording for the toggle label
2018-01-26 17:31:52 +01:00
cyril lopez
fc2afe93db
Fix design user permissions
...
Change font weight, button for closing modals
2018-01-26 14:06:44 +01:00
Jim LAURIE
d1f8fd8f9b
Merge pull request #523 from strapi/Update-doc/front-end-use-case
...
Update front-end use cases
2018-01-26 12:05:28 +01:00
Jim LAURIE
63da286937
Merge branch 'master' into Update-doc/front-end-use-case
2018-01-26 11:44:22 +01:00
Jim LAURIE
2493b8c3ac
Merge pull request #521 from strapi/update-email-template
...
Change data format email template
2018-01-26 11:44:05 +01:00
Jim LAURIE
6ac7692214
Merge branch 'master' into update-email-template
2018-01-26 11:30:58 +01:00
Jim LAURIE
dfa1fa742f
Merge pull request #519 from strapi/fix-unique-email-user
...
Fix unique email for user API
2018-01-26 11:30:31 +01:00
Jim LAURIE
75de294ef5
Merge branch 'master' into fix-unique-email-user
2018-01-26 11:18:07 +01:00
Jim LAURIE
d90439aae6
Merge pull request #522 from strapi/fix/providers-front
...
Fix/providers front
2018-01-26 11:17:50 +01:00
Jim LAURIE
5e94a2d70b
Merge branch 'master' into fix/providers-front
2018-01-26 11:05:03 +01:00
Jim LAURIE
f80858739f
Merge pull request #520 from strapi/fix/providers
...
Fix/providers
2018-01-26 11:04:48 +01:00
cyril lopez
5cb68df548
Update fron-end use cases
...
Remove the handle user navigation section and fix some typos
2018-01-26 10:59:22 +01:00
cyril lopez
3d43ee72a6
Merge branch 'master' into fix/providers-front
2018-01-26 10:41:14 +01:00
cyril lopez
9751165c20
Fix separator css
2018-01-26 10:39:48 +01:00
Aurélien GEORGET
73df48142e
Merge branch 'master' into fix/providers
2018-01-26 10:21:37 +01:00
Jim Laurie
7f78cc9f84
Change data format email template
2018-01-26 10:18:36 +01:00
