yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-28 02:35:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,273 Commits 116 Branches 491 Tags
Commit Graph

9273 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jim LAURIE
f55883a713
Merge pull request #464 from strapi/auth-provider/update-user-models 
Auth provider/update user models
 2018-01-23 10:58:27 +01:00
Jim Laurie
a6e78f023b Fix conflicts 2018-01-23 10:55:57 +01:00
Aurélien GEORGET
4debeb0797
Merge branch 'master' into master 2018-01-23 10:48:02 +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
Luca
97da3ba12d
fix(mongoose): password require username 2018-01-23 07:26:57 +01:00
Luca
ec106bce41
fix(mongoose): allow to connect without password 2018-01-23 07:26:00 +01:00
Luca
d17a50dd87
fix(mongoose): allow to connect without password 2018-01-23 07:23:15 +01:00
Aurelsicoko
a06336cdbb Update permissions from UI in database 2018-01-22 18:19:44 +01:00
Jim LAURIE
974c709e04
Merge pull request #480 from strapi/add-repo-link 
Add repo location in plugins package
 2018-01-22 16:53:02 +01:00
Jim LAURIE
8a2b312c55
Update dependency version 2018-01-22 16:14:45 +01:00
Jim LAURIE
e6eff3b98e
Merge branch 'master' into add-repo-link 2018-01-22 16:04:37 +01:00
Brandon Cheng
a3700a93d5
Fix undefined rootAdminpath in admin dev mode 
It looks like rootAdminpath is used in the development webpack config
file (copied from one of the other webpack configs), but its definition
was omitted accidentally.

Fixes #415
 2018-01-22 08:53:15 -05: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