12 Commits

Author	SHA1	Message	Date
Aurelsicoko	51d936b559	Resolve conflicts	2017-09-25 18:28:45 +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
Aurelsicoko	9ef6618f3a	Run test on port 1338 and remove deprecated PropTypes warning	2017-09-20 11:12:04 +02:00
cyril lopez	7c6a3f4687	Fix conflict	2017-09-14 15:10:08 +02:00
Aurelsicoko	ad856bea8d	Fix links menu	2017-09-14 12:19:24 +02:00
Pierre Burgy	3917c7ae1b	Improve LeftMenuLinkContainer map syntax	2017-09-13 23:11:22 +02:00
Pierre Burgy	efb591601a	Fix tests	2017-09-09 17:00:35 +02:00
Pierre Burgy	5e2b93abb1	Translate home page sentence	2017-09-09 16:59:30 +02:00
Pierre Burgy	6c4310b19d	Translate no plugins installed sentence	2017-09-09 16:10:38 +02:00
Pierre Burgy	3b517dc0c0	Fix no plugins string alignement	2017-09-09 16:06:19 +02:00
Pierre Burgy	cb9730283a	Merge alpha.5	2017-09-08 14:48:06 +02:00
Pierre Burgy	9caf5b8203	Move admin files in strapi-admin folder	2017-08-22 18:29:02 +02:00