yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-01 13:29:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,761 Commits 108 Branches 487 Tags
Commit Graph

972 Commits

Author SHA1 Message Date
Jim LAURIE
717287cec8
Merge branch 'master' into fix/users-front 2018-01-29 11:15:04 +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
6ac7692214
Merge branch 'master' into update-email-template 2018-01-26 11:30:58 +01:00
Jim LAURIE
75de294ef5
Merge branch 'master' into fix-unique-email-user 2018-01-26 11:18:07 +01:00
Jim LAURIE
5e94a2d70b
Merge branch 'master' into fix/providers-front 2018-01-26 11:05:03 +01:00
cyril lopez
9751165c20 Fix separator css 2018-01-26 10:39:48 +01:00
Jim Laurie
7f78cc9f84 Change data format email template 2018-01-26 10:18:36 +01:00
cyril lopez
bcf122f3d0 Fix transitions that was not smooth when closing usr providers modal 
We could see the button going fro OFF to ON when closing the modal which was a bit weird. Added a lifecycle method to use state when the input has no value
so, it prevents weird transitions
 2018-01-26 10:12:16 +01:00
Jim Laurie
7c16f512e6 Fix unique email for user API 2018-01-26 09:37:24 +01:00
Jørgensen
3d9ba865f5
Added default options to enable re-use 2018-01-26 07:32:28 +01:00
Aurelsicoko
8a66873405 Display better error message & lock fields 2018-01-25 18:12:29 +01:00
cyril lopez
4b30900a4e Add overlay on Plugin banner in user-permissions (css) 2018-01-25 17:53:49 +01:00
cyril lopez
a80b0e18b7 Fix ctb and user-permission list item spacing 2018-01-25 17:39:56 +01:00
cyril lopez
415d826296 Fix PopUpForm disabled input background color in usrs-permissions 2018-01-25 17:16:41 +01:00
Aurelsicoko
7862899ed6 Lowercase action to avoid bug with permission 2018-01-25 17:08:39 +01:00
cyril lopez
47e034fc92 Add advanced.json to .gitignore 2018-01-25 16:43:16 +01:00
Aurelsicoko
1d98cdd8a4 Assign guest role to user using provider auth 2018-01-25 16:37:35 +01:00
cyril lopez
b88c32f16a Merge branch 'master' of github.com:strapi/strapi into fix/providers-front 2018-01-25 16:30:50 +01:00
cyril lopez
e732e44120 Redo reducer and fix PopUpForm for google provider 2018-01-25 16:28:44 +01:00
Jim LAURIE
319f17be4d
Merge branch 'master' into fix-providers 2018-01-25 16:01:20 +01:00
Jim Laurie
0e74eafc74 Fix second auth with provider 2018-01-25 15:48:56 +01:00
Aurelsicoko
717b2d07c4 Only create permissions for controller's functions 2018-01-25 15:46:15 +01:00
Jim Laurie
bdc3b273da Handle if no display name google login 2018-01-25 15:30:57 +01:00
Aurelsicoko
1ac6a56ce0 Resolve conflicts 2018-01-25 15:26:25 +01:00
Jim Laurie
7cddfd9340 Fix get twitter data 2018-01-25 15:04:42 +01:00
Aurelsicoko
a60e13799f Open route /connect 2018-01-25 14:36:12 +01:00
Aurelsicoko
b45f6777a6 Add translation for no admin access 2018-01-25 13:59:50 +01:00
cyril lopez
5e275e101d Display icon trash for deleting a role 2018-01-25 13:59:05 +01:00
cyril lopez
7da53f6fe5 Add important note to PopUpform 
Noteon the switch statement about what the user has to set in its provider s configurations
 2018-01-25 13:45:29 +01:00
cyril lopez
c4dac29bf6 Fix conflict 2018-01-25 13:43:07 +01:00
Aurelsicoko
add54f8ecb Remove variables.json file 2018-01-25 13:38:18 +01:00
Aurelsicoko
fc21d5f30a Resolve conflicts 2018-01-25 13:25:09 +01:00
Jim LAURIE
01bb4cd0e2
Remove last else condition 2018-01-25 12:26:09 +01:00
Jim Laurie
64d3149876 Fix PR feedback 2018-01-25 11:53:22 +01:00
cyril lopez
3a02cd9ac4 Fix error when trying to log with a provider when already used another one 
The error occured when login with GitHub and then trying to login with FB. It returned a 500 so to avoid 500 error I catched the error and return a badRequest
 2018-01-25 11:52:17 +01:00
Aurelsicoko
462b44a759 Fix PG queries 2018-01-25 11:19:53 +01:00
Aurelsicoko
04c3518dbc Remove unnecessary actions.json file from repository 2018-01-25 10:51:12 +01:00
Jim Laurie
2e1283f117 Fix conflict 2018-01-25 10:02:17 +01:00
Jim Laurie
2b57c3e6de Move grant middleware in controller action 2018-01-25 09:59:24 +01:00
Jim Laurie
4eb81abe5f Use async/await provider service 2018-01-25 08:54:17 +01:00
Jim Laurie
a2d7ffce74 User service to template email 2018-01-25 08:38:46 +01:00
cyril lopez
db0c1a007e Add info input in providers 2018-01-24 19:12:13 +01:00
Aurelsicoko
cc1e8e20aa Don't execute the action again if there is a policy 2018-01-24 19:00:12 +01:00
cyril lopez
2031b8c9d7 Set user role when registering with a provider 2018-01-24 17:31:22 +01:00
Aurelsicoko
ed696f70a0 Refetch roles after delete 2018-01-24 13:51:22 +01:00