33691 Commits

Author SHA1 Message Date
Aurelsicoko
1c2f625a2b Allow plugin to add link into a specific left menu section 2017-11-27 12:22:20 +01:00
cyril lopez
baee801941 Add searchUsers and created mongoose query 2017-11-27 12:19:36 +01:00
Jim Laurie
ed6367eeb4 Fix use defaults middleware configs 2017-11-27 12:11:30 +01:00
Jim Laurie
5e2748f81f Send 401 if action is not enabled 2017-11-27 12:05:18 +01:00
Aurelsicoko
70667e0cba Fix setup 2017-11-27 11:04:30 +01:00
Jim Laurie
9a801e4ac1 Inject authentication policy 2017-11-27 10:59:24 +01:00
Aurélien GEORGET
4de8c5c0c8
Merge pull request #352 from lucaperret/master
Minor translations fixes
2017-11-27 10:46:12 +01:00
Aurelsicoko
ac2c2b55e9 Fix setup and apply design changes 2017-11-25 14:08:06 +01:00
Jim Laurie
a2c8e212fc Use default config middleware and load plugins middlewares 2017-11-24 15:15:02 +01:00
Luca Perret
55bf50768e Fix admin translation typo on keys 2017-11-23 18:41:18 +01:00
Luca Perret
c8933f69d5 Fix content-type-builder typo 2017-11-23 18:25:21 +01:00
cyril lopez
b00087c157 Delete dynamic (front end) 2017-11-23 18:08:14 +01:00
cyril lopez
76ef40448b Prevent from deleting specific role (front end) 2017-11-23 17:48:49 +01:00
cyril lopez
1fc0d0789a Fix user-permissions homepage notification bug 2017-11-23 17:20:11 +01:00
cyril lopez
38e6df838f Edit role 2017-11-23 17:13:46 +01:00
Aurélien GEORGET
484bcc81f1
Merge pull request #343 from strapi/build/path
Build/path
2017-11-23 16:45:07 +01:00
cyril lopez
47c375e83d Add plugin icon to permissions list 2017-11-23 16:27:41 +01:00
Jim Laurie
f719d7f1fb Fix conflict 2017-11-23 15:05:05 +01:00
cyril lopez
6d253cef87 Add user to role 2017-11-23 13:09:05 +01:00
cyril lopez
162e82086c Fetch users dynamic for EditPage role 2017-11-23 12:43:40 +01:00
cyril lopez
f4fbe455b5 Handle front end role post 2017-11-23 12:15:06 +01:00
Aurélien GEORGET
048f746ac5
Merge pull request #349 from mmmmmrob/patch-2
minor translation fixes
2017-11-23 11:29:03 +01:00
cyril lopez
97d20d5315 Created handler for POST role 2017-11-23 11:03:26 +01:00
Aurélien GEORGET
085691f69b
Merge branch 'master' into patch-2 2017-11-22 18:25:52 +01:00
Jim LAURIE
b5a7150e22
Merge pull request #348 from mmmmmrob/patch-1
minor fix to translation
2017-11-21 18:08:32 +01:00
Rob Styles
e7b3eb8cbb
minor translation fixes 2017-11-21 15:39:56 +00:00
Rob Styles
c6d333e2f0
minor fix to translation 2017-11-21 15:38:05 +00:00
Jim Laurie
ab62578fac Fix API assign 2017-11-21 10:07:49 +01:00
Aurelsicoko
a10fc2ee0d Fix setup 2017-11-20 17:04:48 +01:00
Jim LAURIE
1f29fde51a
Merge pull request #346 from strapi/user-permissions
User permissions
2017-11-20 17:02:16 +01:00
Aurélien GEORGET
9f6533e1a0
Merge pull request #345 from strapi/config/no-locales
Ensure server start where there are no locales
2017-11-20 16:36:43 +01:00
Jim Laurie
156e21f650 Review Auth response 2017-11-20 16:28:50 +01:00
Jim Laurie
fa329a05a7 Fix npm scripts 2017-11-20 15:36:37 +01:00
Jim Laurie
ab6434fb4d Fix plugin email dependencies 2017-11-20 15:10:40 +01:00
Aurelsicoko
47f75f601b Fix run setup 2017-11-20 15:01:49 +01:00
cyril lopez
b4539df31f Update branch
Merge branch 'user-permissions' of github.com:strapi/strapi into user-permissions
2017-11-20 14:48:01 +01:00
cyril lopez
cff3a2df29 Ignore roles.json file 2017-11-20 14:47:17 +01:00
cyril lopez
be3c4bd812 Refacto login werification 2017-11-20 14:45:27 +01:00
Jim Laurie
7b84df6fbc Merge branch 'user-permissions' of https://github.com/strapi/strapi into user-permissions 2017-11-20 14:38:09 +01:00
Jim Laurie
a0af2cdd4c Fix PR feedback 2017-11-20 14:35:24 +01:00
cyril lopez
659f3a52c8 Update branch
Merge branch 'user-permissions' of github.com:strapi/strapi into user-permissions
2017-11-20 14:23:06 +01:00
cyril lopez
f182189217 Remove log 2017-11-20 14:22:18 +01:00
cyril lopez
ac5f20a000 Add reset-password view and fix PR feedbacks 2017-11-20 14:21:08 +01:00
Jim Laurie
e8a5b76b23 Fix conflicts 2017-11-20 13:17:47 +01:00
Jim Laurie
e45b8c1f94 Update clean pre commit auto generated files 2017-11-20 11:08:57 +01:00
Aurélien GEORGET
c7a7cf21d0
Merge branch 'master' into config/no-locales 2017-11-20 10:11:35 +01:00
Aurélien GEORGET
5d2c914432
Merge pull request #344 from strapi/config/no-cache
Clear cache before loading configuration files
2017-11-20 10:11:21 +01:00
cyril lopez
804adb93ef Add admin folder to email plugin to majke the admin works (TEMPORARY FIX) 2017-11-17 17:49:50 +01:00
cyril lopez
51194f28b5 Fix conflict 2017-11-17 17:22:41 +01:00
Aurelsicoko
2050c3ec8f Ensure server start where there are no locales 2017-11-17 17:20:59 +01:00