yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-14 11:48:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,691 Commits 116 Branches 489 Tags
Commit Graph

33691 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
cyril lopez
302ab06b1d
Merge branch 'master' into fix/overlay-blocker-stm 2018-01-25 13:13:06 +01:00
Jim LAURIE
a7c9d2bbbc
Merge pull request #499 from strapi/auth-provider/configs 
Auth provider/configs
 2018-01-25 13:04:49 +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
cyril lopez
1e81d96e91 Update branch 
Merge branch 'fix/overlay-blocker-stm' of github.com:strapi/strapi into fix/overlay-blocker-stm
 2018-01-25 11:00:29 +01:00
cyril lopez
68cdf67d31 Remove custom OverlayBlocker in stm 
As discussed with @Aurelsicoko this feature is not needed when adding or editing a connection
 2018-01-25 10:59:33 +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
d3efb41e10
Merge pull request #512 from strapi/improve-issue-template 
Improve template issue github
 2018-01-25 09:46:54 +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
11d325389c Improve template issue github 2018-01-24 22:56:38 +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
Amit Yadav
1edb583176
Merge branch 'master' into hot_fix_-467 2018-01-24 20:16:41 +05:30
Amit Yadav
bae0159208 Fixes strapi#467 2018-01-24 20:15:11 +05:30
Aurelsicoko
ed696f70a0 Refetch roles after delete 2018-01-24 13:51:22 +01:00
cyril lopez
578d2e2916 Fix css backheader and logout 2018-01-24 13:06:20 +01:00
cyril lopez
8ef21b0a49 Allow editing redirect_uri 2018-01-24 13:02:16 +01:00
Aurelsicoko
cf1cb7050b Resolve conflicts and disallow to edit and remove default roles 2018-01-24 11:52:09 +01:00
Aurelsicoko
f2bff7f17d Return an error if a non-admin user try to connect to the admin 2018-01-24 11:38:42 +01:00
Aurelsicoko
0a62003af6 Fix plugin load due to autoReload 2018-01-24 11:06:24 +01:00
Jim LAURIE
4bb6e2b5b2
Merge pull request #502 from lucaperret/feat/database-auth-env 
feat(generate-new): env on database auth
 2018-01-24 08:26:32 +01:00
Luca Perret
8c0c2010d1 feat(generate-new): env on database auth 2018-01-23 22:19:34 +01:00
Aurelsicoko
0b771f425d Fix delete role with Bookshelf 2018-01-23 19:08:36 +01:00
Aurelsicoko
8f85d85349 Improve roles in database to work with Bookshelf 2018-01-23 18:54:17 +01:00
cyril lopez
9e5d0e991b Fix provider auth 2018-01-23 17:25:58 +01:00
cyril lopez
06ab6ba8cd Add translations for twitter 2018-01-23 16:43:16 +01:00
cyril lopez
32ca068afb Fixes #498 2018-01-23 16:26:04 +01:00
cyril lopez
6050643757 Update branch 
Merge branch 'master' of github.com:strapi/strapi into auth-provider/configs-front
 2018-01-23 16:00:56 +01:00
cyril lopez
db23c22ee4 Update branch 
Merge branch 'auth-provider/configs' of github.com:strapi/strapi into auth-provider/configs-front
 2018-01-23 15:58:48 +01:00
cyril lopez
5df8e05884
Merge branch 'master' into fix/overlay-blocker-stm 2018-01-23 15:40:19 +01:00
cyril lopez
85dd7a902a Clean svg 2018-01-23 15:39:31 +01:00
Aurelsicoko
187f6cb748 Display logs for every missing tables or attributes & update delete/add role feature 2018-01-23 15:38:43 +01:00
cyril lopez
55ea0eb9e5 Update OverlayBlocker documentation, use context to prevent Overlay from being displayed 2018-01-23 15:34:34 +01:00
Jim LAURIE
702cff7b89
Merge pull request #442 from lucaperret/master 
feat(plugin-users-permissions): auth email case-insensitive
 2018-01-23 15:05:02 +01:00
Jim LAURIE
66c516a7d3
Merge branch 'master' into master 2018-01-23 14:49:00 +01:00
Jim LAURIE
401445d667
Merge pull request #473 from lucaperret/fix/mongoose-connect-auth 
fix(mongoose): unescaped character in username/password
 2018-01-23 14:47:39 +01:00
cyril lopez
bdf19f2d45 Hide modal when edit db 2018-01-23 14:40:57 +01:00
cyril lopez
2ea56af040 Hide modal when adding a language or a db in stm 2018-01-23 14:09:54 +01:00
Luca
202d5d97c4
Merge branch 'master' into master 2018-01-23 14:02:31 +01:00
Luca
adc532cf74
feat(plugin-users-permissions): lowercase email 2018-01-23 13:35:51 +01:00
Luca
5e6d770601
Merge branch 'master' into fix/mongoose-connect-auth 2018-01-23 12:41:58 +01:00
Jim Laurie
9ddd7f12a8 Fix missing save conflict 2018-01-23 11:32:40 +01:00
Jim LAURIE
170b534542
Merge pull request #490 from gluxon/master 
Fix undefined rootAdminpath in admin dev mode
 2018-01-23 11:29:08 +01:00
Jim LAURIE
650b91b728
Merge branch 'master' into master 2018-01-23 10:59:02 +01:00