2651 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Aurelsicoko	39d21388a3	Merge branch 'relation/users' of github.com:strapi/strapi into relation/users	2017-12-16 18:30:16 +01:00
Aurelsicoko	92c891e341	Improve error when association fail and handle configurable key in models	2017-12-16 18:26:04 +01:00
cyril lopez	b619632662	Update branch ... Merge branch 'master' of github.com:strapi/strapi into relation/users	2017-12-16 17:46:05 +01:00
cyril lopez	669cdcf104	Merge pull request #384 from strapi/fix/ctm-back-header ... Fix ctm editview backheader	2017-12-16 17:45:00 +01:00
cyril lopez	61392cc476	Add install plugin route	2017-12-16 17:35:16 +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
cyril lopez	4726c52a9c	Change install plugin design	2017-12-16 16:51:23 +01:00
cyril lopez	f43d7e75cc	Update branch ... Merge branch 'master' of github.com:strapi/strapi into install-plugins	2017-12-16 14:57:19 +01:00
cyril lopez	83500c4e3b	Update branch ... Merge branch 'master' of github.com:strapi/strapi into fix/ctm-back-header	2017-12-16 14:54:40 +01:00
cyril lopez	f9d1e98644	Merge pull request #380 from strapi/fix-language ... Fix stm add language bug	2017-12-16 14:54:07 +01:00
cyril lopez	93c32d17c1	Add plugin icons	2017-12-16 13:56:52 +01:00
cyril lopez	769200f60f	Add icons to list plugins	2017-12-16 13:50:57 +01:00
cyril lopez	0ff0b2e2aa	Fix ctm editview backheader	2017-12-16 12:26:47 +01:00
Jim LAURIE	9b9ee3bc83	Remove spaces	2017-12-15 18:15:38 +01:00
Aurelsicoko	1f55ca1d04	Merge branch 'relation/users' of github.com:strapi/strapi into relation/users	2017-12-15 18:11:41 +01:00
Aurelsicoko	975d24ec9a	Remove unnecessary directory read to define model's path	2017-12-15 18:10:48 +01:00
cyril lopez	78e1442342	Update branch ... Merge branch 'master' of github.com:strapi/strapi into fix-language	2017-12-15 18:06:06 +01:00
Aurelsicoko	0230184619	Apply same algorithm to clearRelation method	2017-12-15 18:04:56 +01:00
cyril lopez	4f3ab874dd	Created email and password attributes	2017-12-15 18:03:20 +01:00
cyril lopez	9d8daec9fb	Update branch ... Merge branch 'relation/users' of github.com:strapi/strapi into relation/users	2017-12-15 17:37:34 +01:00
cyril lopez	5148987589	Prevent from editing or deleting models from a plugin	2017-12-15 17:36:21 +01:00
cyril lopez	a4638c26ad	Handle ctb post/put actions for plugin s models	2017-12-15 17:30:23 +01:00
Aurelsicoko	1ec7c988f2	Merge branch 'relation/users' of github.com:strapi/strapi into relation/users	2017-12-15 16:37:11 +01:00
Aurelsicoko	492c688344	Remove unnecessary directory read when building relations	2017-12-15 16:36:21 +01:00
cyril lopez	d87a273196	Display plugin model in ctb relation box	2017-12-15 16:36:06 +01:00
Jim LAURIE	fff73de9c7	Merge pull request #381 from strapi/fix/alpha.7.1 ... Fix alpha.7.1	2017-12-15 15:27:40 +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	8d74849d9c	Display plugin source in ctb attributerow	2017-12-15 14:21:28 +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
cyril lopez	5b542cff20	Fix left menu content manager links	2017-12-15 11:30:51 +01:00
Jim Laurie	b5c813e5f8	Can not set role 0 to someone user API	2017-12-15 10:49:01 +01:00
cyril lopez	9132d64dda	Fix design	2017-12-14 17:37:33 +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
cyril lopez	55d839113d	Fix stm add language bug	2017-12-14 16:28:51 +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	5962052287	Merge pull request #377 from strapi/3.0.0-alpha.7.1 ... 3.0.0-alpha.7.1	2017-12-14 14:08:53 +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
cyril lopez	1ef46dffea	Get plugins models and adapt from to display plugins models	2017-12-13 16:41:49 +01:00
Jim LAURIE	f39a675690	Merge pull request #376 from strapi/fix/gitignore ... Fix .gitignore file generation	2017-12-13 16:33:33 +01:00
Aurelsicoko	859e2985c8	Fix many-to-many association with Bookshelf	2017-12-13 16:28:50 +01:00
Jim Laurie	feb0fd3931	Merge branch 'master' of https://github.com/strapi/strapi into fix/gitignore	2017-12-13 16:16:48 +01:00
Jim LAURIE	bd2ea33de6	Merge pull request #375 from strapi/update/roadmap ... Update ROADMAP	2017-12-13 16:15:47 +01:00