yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-10-17 02:53:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,803 Commits 110 Branches 504 Tags
Commit Graph

329 Commits

Author SHA1 Message Date
Jim Laurie
a6e78f023b Fix conflicts 2018-01-23 10:55:57 +01:00
Jim LAURIE
eb1d1645fd
Merge branch 'master' into auth-provider/update-user-models 2018-01-23 10:45:26 +01:00
Jim Laurie
33437439a6 Fix missing koa grant dep 2018-01-23 10:43:49 +01:00
Jim Laurie
6b418b1460 Fix PR feedback and add twitter provider 2018-01-23 09:30:25 +01:00
Jim LAURIE
e6eff3b98e
Merge branch 'master' into add-repo-link 2018-01-22 16:04:37 +01:00
Jim LAURIE
bf69ea7de9
Merge branch 'master' into alpha.8.3 2018-01-19 17:55:24 +01:00
Aurelsicoko
5b93cc5242 3.0.0-alpha.8.3 2018-01-19 16:49:57 +01:00
Aurelsicoko
086b42f079 Improve deployment workflow and fix setup 2018-01-19 14:50:34 +01:00
Jim Laurie
c66e2b382a update strapi plugin email package 2018-01-19 13:38:33 +01:00
Jim Laurie
19ee51376b Add repo location in plugins package 2018-01-19 12:06:08 +01:00
Jim LAURIE
2e55706fdb
Merge branch 'master' into alpha.8.1 2018-01-19 09:15:28 +01:00
Jim Laurie
7b0a106cb2 3.0.0-alpha.8.2 2018-01-19 08:52:34 +01:00
Jim Laurie
5accaf30e3 Hot fix permission detection 2018-01-19 07:38:30 +01:00
Jim Laurie
f9920a4739 Disable local provider 2018-01-18 16:01:52 +01:00
Jim Laurie
5e8259af73 Can disable a provider 2018-01-18 15:45:02 +01:00
Jim Laurie
fc22f13cfc Merge branch 'auth-provider/update-user-models' of github.com:strapi/strapi into auth-provider/configs 2018-01-18 15:15:25 +01:00
Jim Laurie
6da09af501 Fix plugin multi middleware 2018-01-18 14:53:25 +01:00
Jim Laurie
6ae2f6dfee Add unique email verification on user update 2018-01-18 14:10:26 +01:00
Jim Laurie
cf6b240451 Merge branch 'master' of github.com:strapi/strapi into auth-provider/configs 2018-01-18 13:45:46 +01:00
Jim Laurie
b2e07979c7 Template forgot password email object 2018-01-18 10:03:29 +01:00
Jim LAURIE
77b068ef07
Merge branch 'master' into add-overlay-blocker 2018-01-18 09:33:00 +01:00
Jim Laurie
66617e31c8 Merge branch 'auth-provider/update-user-models' of github.com:strapi/strapi into auth-provider/configs 2018-01-18 09:08:27 +01:00
Jim Laurie
7442e01abb Fix conflict documentation 2018-01-18 08:32:44 +01:00
Jim Laurie
03643bfb13 3.0.0-alpha.8 2018-01-17 16:59:28 +01:00
Jim Laurie
ef2be5c6ee Fix postgres and mysql logs user table creation 2018-01-17 14:32:38 +01:00
cyril lopez
d9895fc431 Remove the OverlayBlocker from users plugin pass set lockApp in the strapi object 2018-01-17 12:58:14 +01:00
Jim Laurie
1bcae6c73e Add unique email restriction on provider and local register 2018-01-15 17:58:11 +01:00
Jim Laurie
1b2897bd83 Get and update advanced settings 2018-01-15 16:23:54 +01:00
Jim Laurie
072dc10137 Add registration restriction on provider and local register 2018-01-15 15:19:59 +01:00
Jim Laurie
02a89fbb5b Generate advanced configs 2018-01-15 15:01:21 +01:00
Jim Laurie
3a9cb9b453 Use email templte config reset password 2018-01-15 14:50:53 +01:00
Jim Laurie
7ab44d4b0f Update email template config 2018-01-15 12:05:01 +01:00
Jim Laurie
24d5a5116f Get email template 2018-01-15 11:59:10 +01:00
cyril lopez
950d020082 Add overlay blocker to user plugin when creating/updating a role 2018-01-15 11:36:48 +01:00
Jim Laurie
eb64d8fe7d Create email template config file 2018-01-15 11:29:38 +01:00
cyril lopez
17fd135ac1 Add overlayBlocker when deleting a role in users plugin 2018-01-15 11:28:43 +01:00
cyril lopez
c838b90e21 Add serverRestart to users-permissions 2018-01-15 11:07:40 +01:00
cyril lopez
977a79eaff Fix up plugin required props error 2018-01-12 17:50:18 +01:00
Jim Laurie
82d85d781c Fix grant file creation 2018-01-12 16:07:21 +01:00
Jim Laurie
1eb7b12934 Omit grant.json config file 2018-01-12 16:04:01 +01:00
Jim Laurie
6e44e2e274 Add provider connection 2018-01-12 15:20:13 +01:00
cyril lopez
5d470d890d Update branch 
Merge branch 'master' of https://github.com/strapi/strapi into verify/user-jwtToken
 2018-01-11 17:28:08 +01:00
cyril lopez
310f7b4b68 Rename setHasUserPlugin function 2018-01-11 17:26:46 +01:00
cyril lopez
1a07c2caad Enable /user/me route for guest users 2018-01-11 17:13:09 +01:00
cyril lopez
2af14f24c5 Throw error when trying to get /user/me with no headers 2018-01-11 16:24:16 +01:00
cyril lopez
c9a07da1e8 Check user token validity when receiving a 401 && set jwt expiration date 2018-01-11 15:59:00 +01:00
Jim LAURIE
09e7f0fc67
Merge branch 'master' into user-schema-logs 2018-01-11 15:01:47 +01:00
Jim Laurie
f545f373aa Fix PR feedback 2018-01-11 15:00:34 +01:00
Jim Laurie
054df448a9 Merge branch 'user-schema-logs' of github.com:strapi/strapi into user-schema-logs 2018-01-11 13:44:25 +01:00
Luca Perret
7cf77a9d57 fix(plugin-users-permissions): Config layout - 
Duplicate key email
 2018-01-11 00:23:28 +01:00