55 Commits

Author SHA1 Message Date
Jim LAURIE
157c249382 Merge branch 'master' of github.com:strapi/strapi into tests/split 2018-06-27 14:28:30 +02:00
Jim LAURIE
561e910558
Fix empty string not require 2018-06-26 17:14:42 +02:00
Jim LAURIE
75c1c4bac5 Fix JSON type format SQL fix #1425 2018-06-20 16:21:09 +02:00
Aurelsicoko
c2d0e81f22 Run Jest in the monorepo packages 2018-06-12 17:41:28 +02:00
soupette
c8492a6b11 Clean code 2018-06-06 16:49:25 +02:00
soupette
127179cd76 Fix conflicts 2018-06-06 16:24:11 +02:00
soupette
e7357e025c Handle delete many with models from users-permissions 2018-06-06 16:20:52 +02:00
Jim Laurie
8085a2deaf Update oneToOne test with id 2018-06-03 20:46:43 +02:00
soupette
44d3519130 remove relations 2018-04-19 17:23:23 +02:00
soupette
81383f3562 Fixes #959 2018-04-19 15:45:35 +02:00
Jim Laurie
bb114a592d Clean model 2018-04-12 14:19:22 +02:00
Jim Laurie
bdd1583543 Handle polymorphic in admin
Only for collection: * poly side
2018-04-10 14:46:36 +02:00
Jim Laurie
5d03c350e4 Clean user model 2018-03-27 16:44:25 +02:00
Jim Laurie
54af44901b Remove useless clone object 2018-03-15 12:01:10 +01:00
Jim Laurie
6c4e837c7c Hotfix users models relations 2018-02-24 14:35:12 +01:00
Jim LAURIE
acfbd8bcaf
Merge branch 'master' into relations/polymorphic 2018-02-23 15:29:29 +01:00
Aurelsicoko
946f0f17b3 Enhance polymorphic syntax 2018-02-22 15:34:33 +01:00
cyril lopez
e5513d3cd6 Display relations when editing 2018-02-22 10:35:19 +01:00
Aurelsicoko
dc75b51d6f [WIP] Polymorphic associations with Bookshelf 2018-02-20 19:59:05 +01:00
Aurelsicoko
2cb0e2c3d5 Hide resetPasswordToken from response 2018-02-08 14:59:39 +01:00
Aurelsicoko
2f8169c792 Hide specific model fields from response 2018-02-06 18:09:04 +01:00
Aurelsicoko
8a66873405 Display better error message & lock fields 2018-01-25 18:12:29 +01:00
Aurelsicoko
fc21d5f30a Resolve conflicts 2018-01-25 13:25:09 +01:00
Aurelsicoko
cf1cb7050b Resolve conflicts and disallow to edit and remove default roles 2018-01-24 11:52:09 +01:00
Aurelsicoko
b84976fbbd Improve init action to check if there is an administrator 2018-01-17 19:22:35 +01:00
Aurelsicoko
4aa28a196e [WIP] Read and update roles & permissions using database 2018-01-17 18:50:12 +01:00
Jim Laurie
1bcae6c73e Add unique email restriction on provider and local register 2018-01-15 17:58:11 +01:00
Jim Laurie
6e44e2e274 Add provider connection 2018-01-12 15:20:13 +01:00
cyril lopez
a976284786 Add required fields to user model 2017-12-18 13:31:33 +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
cyril lopez
b260ebd9d7 Display model source in ctb homepage and ctb left menu 2017-12-15 13:58:53 +01:00
Aurelsicoko
4bdfddaca8 Clean relation model user 2017-12-14 14:13:06 +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
Aurelsicoko
b08a4d811c Use local global to expose model for Bookshelf & move globalId definition in the core 2017-12-13 11:38:38 +01:00
Aurelsicoko
628ad4add4 Fix strapi-bookshelf to work w/ associations w/ plugins & JWT condition 2017-12-12 16:14:38 +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
Aurelsicoko
bf8b434f4b Allow relation with plugin's models 2017-12-11 12:29:05 +01:00
Jim Laurie
427b4b3903 Reverse fetchable data 2017-12-06 12:25:08 +01:00
Jim Laurie
bef37d0cec Remove password and token from fetchable data 2017-12-06 11:54:19 +01:00
Aurelsicoko
8f8fa6b158 Update doc and generated template 2017-11-29 15:46:28 +01:00
Aurelsicoko
c971f9c054 Allow redirect action in CM & harmonize pre/post event with Promises 2017-11-29 15:00:50 +01:00
Aurelsicoko
5d6f035384 Merge branch 'user-permissions' of github.com:strapi/strapi into user-permissions 2017-11-28 16:10:03 +01:00
Aurelsicoko
b63cd80a13 Add type email & password, and fix layout system 2017-11-28 16:01:50 +01:00
Jim Laurie
aecbbcf3ba Handle default connection for mongoose 2017-11-28 14:28:30 +01:00