81 Commits

Author	SHA1	Message	Date
Aurelsicoko	3d7dacef70	Apply options on Mongoose instance	2018-11-16 15:53:00 +01:00
ByoungYong Kim	12cc6d6039	Added provider into user model as it seems to be required for SSO.	2018-10-08 13:16:28 +02:00
Jim LAURIE	2aebb74424	Fix private key in User model	2018-09-25 14:42:15 +02:00
Jim LAURIE	cee9fe2811	Merge branch 'master' into email-validation	2018-08-23 18:46:48 +02:00
soupette	8003982b08	Fix conflicts	2018-08-22 14:17:09 +02:00
soupette	38c4fd6a47	Fix first part of PR feedback	2018-08-21 14:01:15 +02:00
Jim LAURIE	f27b2ae2f6	Merge branch 'master' into email-validation	2018-08-21 11:54:22 +02:00
Aurelsicoko	4f16144ee9	Update & enhance CSS	2018-08-20 14:18:37 +02:00
soupette	688defca70	Fix conflict	2018-08-10 12:52:11 +02:00
Jim LAURIE	9c17701163	Merge branch 'master' into block-user	2018-08-10 10:02:52 +02:00
Jim LAURIE	eec423a2cd	Add confirmation email	2018-08-08 17:57:02 +02:00
Jim LAURIE	3f2576cb68	Can block a user	2018-08-06 17:46:58 +02:00
Jim LAURIE	1fc9513d80	Change lodash version	2018-08-06 16:03:09 +02:00
soupette	ccb4fe0270	Pull enhancement/sortable-input because master is too buggy with my modifications	2018-08-02 15:51:10 +02:00
Aurelsicoko	6a4a07428a	Split component and put logic into the reducer	2018-08-02 15:27:30 +02:00
Jim LAURIE	57d5a6afd9	Remove relations	2018-08-01 09:53:30 +02:00
Aurelsicoko	120f515e5e	Better design many-to-many and add jump link	2018-07-31 16:57:16 +02:00
Aurélien GEORGET	065792bea6	Update User.settings.json	2018-07-31 14:16:27 +02:00
Aurelsicoko	d8e5d0403b	Update design, behavior and add link for selectMany	2018-07-30 16:33:50 +02:00
soupette	6bf3ddeea9	Update displayed fields when removing a field from the content type builder	2018-07-30 13:59:25 +02:00
soupette	54aef15b75	Handle add attr logic	2018-07-27 17:24:58 +02:00
soupette	4e05bd6359	Use the layout from the core_store in Manager.js	2018-07-24 15:16:47 +02:00
Jim LAURIE	87a051e712	Move layout files in core store	2018-07-23 15:12:33 +02:00
cyril lopez	26c53c977e	Handle remove logic when removing the edited relation	2018-07-23 12:34:35 +02:00
cyril lopez	2a419dd92e	Created Manager class for dnd fields	2018-07-19 02:37:12 +02:00
soupette	6cc063e98c	Add new key in schema to display the editView fields ... Design the relation drag & sort	2018-07-16 12:29:57 +02:00
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