274 Commits

Author SHA1 Message Date
Aurelsicoko
b0fc115cd7 Use i18n when there is no description available for a plugin 2018-01-10 16:55:12 +01:00
Jim LAURIE
502b101598
Fix PR feedback 2018-01-10 13:39:42 +01:00
Jim Laurie
ff46faf306 Execute controller action out of authorization try 2018-01-09 13:53:52 +01:00
Jim LAURIE
3a4ca8ea49
Merge branch 'master' into enhancement/one-way 2018-01-09 11:00:34 +01:00
cyril lopez
fd41a77e11 Fix EditRole page InputSearch label 2018-01-08 14:15:27 +01:00
Aurélien GEORGET
8a1b95f2b5
Merge branch 'master' into enhancement/one-way 2018-01-08 12:12:01 +01:00
Aurelsicoko
10db375825 Fix #379 - Support one-way relationship 2018-01-08 12:10:48 +01:00
Aurelsicoko
c9d47b1fed Retrieve plugins' icons URL from API and name Redux store 2018-01-05 16:19:53 +01:00
Jim Laurie
cc4973b65b 3.0.0-alpha.7.3 2018-01-05 12:10:41 +01:00
Aurelsicoko
12d1357d36 Update behavior on plugin card and retrieve logo & description from API 2018-01-04 19:04:22 +01:00
cyril lopez
a976284786 Add required fields to user model 2017-12-18 13:31:33 +01:00
Aurelsicoko
c6a1dcf5cd Only uppercase first letter of labels 2017-12-18 11:57:09 +01:00
Aurelsicoko
92c891e341 Improve error when association fail and handle configurable key in models 2017-12-16 18:26:04 +01:00
Aurelsicoko
6d8b81ecbd Resolve conflicts 2017-12-16 17:08:58 +01:00
Aurelsicoko
6ac1bca417 Update algorithm to correctly add, edit and delete relationships between models and plugins' models 2017-12-16 17:03:34 +01:00
Aurelsicoko
0230184619 Apply same algorithm to clearRelation method 2017-12-15 18:04:56 +01:00
Jim Laurie
5b6127876d 3.0.0-alpha.7.2 2017-12-15 15:04:31 +01:00
Jim Laurie
4cb88af247 Fix PR feedback 2017-12-15 14:22:11 +01:00
cyril lopez
b260ebd9d7 Display model source in ctb homepage and ctb left menu 2017-12-15 13:58:53 +01:00
cyril lopez
aa02d5408a Improve login errors 2017-12-15 13:24:08 +01:00
Jim Laurie
b5c813e5f8 Can not set role 0 to someone user API 2017-12-15 10:49:01 +01:00
Jim Laurie
f12927d2ce Delete role collapse chevron if no API 2017-12-14 17:06:26 +01:00
Jim Laurie
78c2b252cd Fix find users 2017-12-14 16:29:13 +01:00
Jim Laurie
22a7e91036 Fix get user info link in search list 2017-12-14 16:15:32 +01:00
Jim Laurie
2715f2693f Check if token user still exist 2017-12-14 16:12:39 +01:00
Jim Laurie
c7ef225238 Replace id to _id for fetch user mongoose 2017-12-14 15:14:53 +01:00
Aurelsicoko
4bdfddaca8 Clean relation model user 2017-12-14 14:13:06 +01:00
Jim Laurie
1ab6ae71d8 3.0.0-alpha.7.1 2017-12-14 10:27:08 +01:00
cyril lopez
b541e6cc4f Fix conflict 2017-12-13 16:47:35 +01:00
Aurelsicoko
859e2985c8 Fix many-to-many association with Bookshelf 2017-12-13 16:28:50 +01:00
cyril lopez
c6d74d58f0 Add plugins models to ctb and fix navigation 2017-12-13 15:22:16 +01:00
Aurelsicoko
74e1f0529d Fix specific case in one-to-one relation 2017-12-13 14:36:07 +01:00
cyril lopez
13383d9f7c Open the application s permissions section if there are APIs 2017-12-13 13:43:36 +01:00
Aurelsicoko
b08a4d811c Use local global to expose model for Bookshelf & move globalId definition in the core 2017-12-13 11:38:38 +01:00
cyril lopez
09d4183f1e Update branch
Merge branch 'master' of github.com:strapi/strapi into fix-login-redirect
2017-12-13 10:41:06 +01:00
Aurelsicoko
628ad4add4 Fix strapi-bookshelf to work w/ associations w/ plugins & JWT condition 2017-12-12 16:14:38 +01:00
Jim Laurie
832617159d Fix auto set config if doent exist 2017-12-12 15:13:27 +01:00
cyril lopez
02e2016a7a Prevent user from going to login page id no user is registered 2017-12-12 15:12:08 +01:00
Aurelsicoko
8db92c22fd Split Content-Manager logic into service & allow CRUD and associations w/ plugin's models w/ Mongoose 2017-12-11 18:23:15 +01:00
Jim Laurie
6d39c26568 3.0.0-alpha.7 2017-12-11 15:11:29 +01:00
Jim Laurie
a5ef1aa0ca Fix user fetch service with id 2017-12-11 12:31:26 +01:00
Aurelsicoko
bf8b434f4b Allow relation with plugin's models 2017-12-11 12:29:05 +01:00
Jim Laurie
5f4a5971d7 Last fix PR 2017-12-11 11:14:07 +01:00
Jim Laurie
62925b9864 Add npmignore 2017-12-08 17:32:34 +01:00
cyril lopez
3da6faac05 Fix feedback PR 2017-12-08 14:40:42 +01:00
cyril lopez
1d64d827be Add roles key to permissions 2017-12-08 12:03:37 +01:00
cyril lopez
96506e5643 Fix middleware usp .policies of undefined 2017-12-08 11:21:51 +01:00
cyril lopez
4074846b5b Refacto service 2017-12-08 10:42:45 +01:00
cyril lopez
3ebd86b2e1 Update branch
Merge branch 'user-permissions' of github.com:strapi/strapi into user-permissions
2017-12-07 18:42:40 +01:00
cyril lopez
f471a98f90 Fix manage user role bookshelf 2017-12-07 18:40:55 +01:00