33691 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
cyril lopez	7b7725d4f4	Fix settings-manager plugin left menu active class	2017-09-26 10:01:55 +02:00
cyril lopez	c77b681a89	Fix button props	2017-09-26 09:52:44 +02:00
Aurélien GEORGET	b93159b9a4	Merge pull request #253 from strapi/plugin/content-manager ... Plugin/content manager	2017-09-25 18:29:46 +02:00
Aurelsicoko	51d936b559	Resolve conflicts	2017-09-25 18:28:45 +02:00
Aurélien GEORGET	c930519b61	Merge pull request #251 from strapi/plugin/content-manager-dev ... Plugin/content manager dev	2017-09-25 18:15:00 +02:00
Aurélien GEORGET	5ae05119b1	Merge pull request #252 from strapi/plugin/content-type-builder-dev ... Plugin content type builder dev	2017-09-25 17:58:09 +02:00
Aurelsicoko	cb1527c023	Remove test folders	2017-09-25 17:40:41 +02:00
Aurelsicoko	fae170fe24	Fix notification and expose react-transition-group	2017-09-25 17:27:04 +02:00
Jim Laurie	81c3169425	Fix bookshelf dependencies	2017-09-25 17:12:04 +02:00
Jim Laurie	274bb5fee9	Active request log by default	2017-09-25 16:32:01 +02:00
Aurelsicoko	f9d81bad1d	Solve issues and translate notifications	2017-09-25 15:54:43 +02:00
Aurelsicoko	b97d6e5660	Use lowerCase lodash	2017-09-25 15:40:11 +02:00
Aurelsicoko	cb00ac2a31	Apply feedback	2017-09-25 15:35:27 +02:00
cyril lopez	e77321e97a	Remove unecessary includes import in modelPage container	2017-09-25 15:35:07 +02:00
Jim Laurie	2338604609	Fix PR feedback	2017-09-25 14:17:40 +02:00
Jim Laurie	1d2ac86467	Pull alpha 6	2017-09-25 13:42:39 +02:00
Aurelsicoko	b8accc03b9	Use React and React-DOM through global to use the exact same dependency everywhere	2017-09-22 16:56:09 +02:00
cyril lopez	013c6ac189	Add antialiased to button	2017-09-21 18:02:16 +02:00
cyril lopez	6c33c9a2cc	Fix button bug	2017-09-21 17:29:53 +02:00
Jim Laurie	64a8df9e71	Dont load connectors if not used	2017-09-21 17:28:46 +02:00
cyril lopez	3ce1bdbc4c	Update branch ... Merge branch 'plugin/content-type-builder-dev' of github.com:strapi/strapi into plugin/content-type-builder-dev	2017-09-21 17:28:46 +02:00
cyril lopez	62d8213897	Fix button loader and close button modal	2017-09-21 17:27:48 +02:00
Aurelsicoko	c6d97090c1	Merge branch 'plugin/content-type-builder-dev' of github.com:strapi/strapi into plugin/content-type-builder-dev	2017-09-21 17:20:07 +02:00
Aurelsicoko	786dd63c1e	Increase click zone	2017-09-21 17:19:13 +02:00
cyril lopez	ceb2f9fced	Add tabindex to input lib	2017-09-21 16:52:54 +02:00
Jim Laurie	8702d73a81	Delete some command line	2017-09-21 16:40:19 +02:00
cyril lopez	cdfed813b7	Remove link in content type input name description	2017-09-21 16:23:39 +02:00
cyril lopez	aa1ef273fb	Update branch ... Merge branch 'plugin/content-type-builder-dev' of github.com:strapi/strapi into plugin/content-type-builder-dev	2017-09-21 16:13:49 +02:00
cyril lopez	bbc78f5218	Fix input addon width	2017-09-21 16:12:35 +02:00
cyril lopez	3d86aa732e	Fix popups design	2017-09-21 16:07:56 +02:00
Jim Laurie	514b7d3d83	Fix load cron tasks	2017-09-21 15:58:55 +02:00
Aurelsicoko	015ba88544	Merge branch 'plugin/content-type-builder-dev' of github.com:strapi/strapi into plugin/content-type-builder-dev	2017-09-21 15:44:59 +02:00
Aurelsicoko	97292fc65b	Order attribute parameters correctly and handle dominant case	2017-09-21 15:43:33 +02:00
cyril lopez	78a9b77086	Update branch ... Merge branch 'plugin/content-type-builder-dev' of github.com:strapi/strapi into plugin/content-type-builder-dev	2017-09-21 15:43:20 +02:00
cyril lopez	35f8311cfd	Fix design and add notifications	2017-09-21 15:42:22 +02:00
Aurelsicoko	2e534cd64d	Merge branch 'plugin/content-type-builder-dev' of github.com:strapi/strapi into plugin/content-type-builder-dev	2017-09-21 15:02:13 +02:00
Aurelsicoko	4b3954633b	Import new icon and fix design	2017-09-21 15:01:38 +02:00
Jim Laurie	3ed43d8b82	Use database connections fot sessions	2017-09-21 14:46:50 +02:00
cyril lopez	a5bb67f723	Make checkbox label clickable	2017-09-21 14:21:18 +02:00
cyril lopez	d66a1f6dd6	Fix design, add dominant when relation many to many	2017-09-21 14:07:34 +02:00
Aurelsicoko	00c77824a9	Generate relation attribute in right order and fix select on relation modal	2017-09-21 14:03:17 +02:00
Jim Laurie	68495606b2	Migration koa-generic-session to koa-session	2017-09-21 12:24:27 +02:00
Aurelsicoko	a67229496e	Resolve conflicts	2017-09-20 18:17:10 +02:00
Aurelsicoko	67cd222c07	Avoid mistake on deletion with Bookshelf	2017-09-20 18:15:06 +02:00
Aurelsicoko	cefaff4c45	Fix delete on Mongoose	2017-09-20 18:14:18 +02:00
cyril lopez	ead60f4aca	Fix e.preventDefault on toggleModalWarning bug	2017-09-20 16:34:40 +02:00
cyril lopez	46ce57ecf9	Fix redirection after editing a record, fix enter key submit	2017-09-20 16:22:04 +02:00
Aurelsicoko	bd16913b02	Merge branch 'plugin/content-manager-dev' of github.com:strapi/strapi into plugin/content-manager-dev	2017-09-20 15:25:39 +02:00
Aurelsicoko	0c270b387f	Remove relationships on deletion	2017-09-20 15:25:10 +02:00
cyril lopez	f750be8bad	Updtae branch ... Merge branch 'plugin/content-manager-dev' of github.com:strapi/strapi into plugin/content-manager-dev	2017-09-20 15:23:53 +02:00