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
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
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
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
Aurelsicoko
187f6cb748 Display logs for every missing tables or attributes & update delete/add role feature 2018-01-23 15:38:43 +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
Jim Laurie
9ddd7f12a8 Fix missing save conflict 2018-01-23 11:32:40 +01:00
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
Aurelsicoko
a06336cdbb Update permissions from UI in database 2018-01-22 18:19:44 +01:00
Jim LAURIE
e6eff3b98e
Merge branch 'master' into add-repo-link 2018-01-22 16:04:37 +01:00
cyril lopez
1ffedf9726 Update branch 
Merge branch 'master' of github.com:strapi/strapi into auth-provider/configs-front
 2018-01-22 13:12:16 +01:00
cyril lopez
8ca48eec29 Remove useless render functions 2018-01-22 13:10:58 +01:00
cyril lopez
2b099e3a2f Handle form errors for email-templates 2018-01-22 12:25:50 +01:00
cyril lopez
46ecdd1e17 Handle formValidation for providers 2018-01-22 12:05:22 +01:00
cyril lopez
88204154f9 Update list when PUT providers 2018-01-22 11:00:41 +01:00
cyril lopez
e425125f82 Put providers 2018-01-22 10:23:04 +01:00
Aurelsicoko
9daf29be78 Be able to retrieve role data with populate 2018-01-19 17:57:10 +01:00
Jim LAURIE
bf69ea7de9
Merge branch 'master' into alpha.8.3 2018-01-19 17:55:24 +01:00
cyril lopez
9b1347d092 Add link to documentation for templating emails 2018-01-19 17:43:00 +01:00
cyril lopez
308b8ee04b Created users-permissions documentation folder 2018-01-19 17:31:45 +01:00
cyril lopez
e10309145e Edit providers 2018-01-19 17:16:14 +01:00
Aurelsicoko
5b93cc5242 3.0.0-alpha.8.3 2018-01-19 16:49:57 +01:00
cyril lopez
630e06d7fa Get providers 2018-01-19 15:14:51 +01:00
Aurelsicoko
086b42f079 Improve deployment workflow and fix setup 2018-01-19 14:50:34 +01:00
cyril lopez
9572bf9749 Put email templates 2018-01-19 13:52:43 +01:00
Jim Laurie
c66e2b382a update strapi plugin email package 2018-01-19 13:38:33 +01:00
cyril lopez
11c5905d25 form to edit email templates 2018-01-19 13:34:55 +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
Luca Perret
0641c7b279 fix(plugin-users-permissions): undefined value 2018-01-18 23:27:59 +01:00
Luca Perret
2816863cfc fix(plugin-users-permissions): auth register lower case identifier 2018-01-18 23:27:59 +01:00
Luca Perret
d0d70976c9 feat(plugin-users-permissions): auth email case-insensitive 2018-01-18 23:27:59 +01:00
cyril lopez
f6497639e7 List email-templates 2018-01-18 18:21:49 +01:00
cyril lopez
405272eadf Refacto onChange action 2018-01-18 17:27:59 +01:00
cyril lopez
97d6f49f93 Update branch 
Merge branch 'auth-provider/configs' of github.com:strapi/strapi into auth-provider/configs-front
 2018-01-18 16:25:31 +01:00
cyril lopez
c453954f3b Add submit dynamic 2018-01-18 16:23:31 +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