777 Commits

Author	SHA1	Message	Date
Rob Styles	c6d333e2f0	minor fix to translation	2017-11-21 15:38:05 +00:00
cyril lopez	ac5f20a000	Add reset-password view and fix PR feedbacks	2017-11-20 14:21:08 +01:00
cyril lopez	51194f28b5	Fix conflict	2017-11-17 17:22:41 +01:00
cyril lopez	31523b3f5d	Update branch ... Merge branch 'master' of github.com:strapi/strapi into user-permissions	2017-11-17 17:18:28 +01:00
Aurelsicoko	bcc9a652aa	Clear cache before loading configuration files	2017-11-17 17:12:55 +01:00
Aurelsicoko	b2603aab4d	Update path to use local strapi-helper-plugin	2017-11-17 16:05:47 +01:00
Jim Laurie	7a0d05346b	Fix conflict	2017-11-15 12:16:27 +01:00
Aurelsicoko	6f4086be2e	Merge from master	2017-11-14 11:53:51 +01:00
Jim Laurie	5148f10b12	Merge branch 'user-permissions' of github.com:strapi/strapi into user-permissions	2017-11-14 11:12:22 +01:00
cyril lopez	9e4fe1b7d3	Run setup	2017-11-14 09:11:31 +01:00
Aurelsicoko	f80b54f1e0	Avoid to rebuild admin during installation and remove useless dependencies	2017-11-13 19:24:29 +01:00
Aurelsicoko	0eab3d1219	Remove useless dependencies and silent strapi.log during test	2017-11-13 17:58:48 +01:00
Aurelsicoko	87a083134a	Change variable name	2017-11-13 12:45:39 +01:00
Aurelsicoko	d0c3f7f8b5	Avoid to rebuild on path change and override build configuration	2017-11-11 22:14:05 +01:00
cyril lopez	2604dafafa	Update branch ... Merge branch 'master' of github.com:strapi/strapi into fix/ctm-editView	2017-11-11 10:30:16 +01:00
cyril lopez	be14886b79	Fix ctm enter key press bug	2017-11-10 18:14:18 +01:00
Aurelsicoko	650e7dd6cb	Add remote and backend URLs and update global variable	2017-11-08 17:40:47 +01:00
Jim Laurie	790cee753e	3.0.0-alpha.6.7	2017-11-08 15:46:28 +01:00
Jim Laurie	ef601d6e9a	3.0.0-alpha.6.6	2017-11-07 17:20:06 +01:00
Jim Laurie	30e39254a6	Change strapi version to alpha.6.5	2017-11-06 15:52:36 +01:00
Jim LAURIE	5ccc49066d	Merge pull request #322 from strapi/list-plugins ... List plugins	2017-11-03 15:01:38 +01:00
Jim Laurie	b57382aa6f	New version and manifest build	2017-11-03 12:40:14 +01:00
Jim Laurie	8b8115bac1	Merge branch 'alpha.7' of https://github.com/strapi/strapi into alpha.7	2017-11-03 12:13:20 +01:00
Jim LAURIE	bf50390bb6	Merge pull request #316 from strapi/fix/api-relations-mongoose ... Fix api relations	2017-11-03 12:05:39 +01:00
Jim Laurie	77013bc4b2	Fix conflicts	2017-11-03 12:00:08 +01:00
Jim Laurie	6c376456fb	Fix conflicts	2017-11-03 11:51:55 +01:00
cyril lopez	c40c4c5013	Add plugin description to all plugins packages and pass it to the app context	2017-11-02 11:36:38 +01:00
cyril lopez	15fc39029e	Clean content manager image with svgo	2017-11-02 10:19:38 +01:00
Aurelsicoko	917dff6c39	Clean package.json after setup to create an app w/out --dev	2017-11-01 12:11:10 +01:00
cyril lopez	9b0f7366f9	Fix relationComponent update	2017-10-31 14:01:12 +01:00
cyril lopez	902ad42d9c	Handle delete entry in content manager when using bookshelf connector	2017-10-31 13:39:20 +01:00
cyril lopez	35d7993cf6	Fix content manager validations and solve setstate warning in ediotformrelation	2017-10-31 13:14:38 +01:00
cyril lopez	394e3a0a81	Created BackHeader component and implemented it in content manager Edit view	2017-10-31 11:23:49 +01:00
cyril lopez	1303fb775a	Add EmptyAttributes view to content manager	2017-10-31 10:51:43 +01:00
cyril lopez	9e48f925ab	Fix SelectMany label issue when null	2017-10-30 18:57:49 +01:00
Jim Laurie	e038a238e7	Handle template on create API content type builder	2017-10-30 14:40:46 +01:00
Jim Laurie	0a7b65be04	Remove relation on delete data bookshelf	2017-10-30 14:02:54 +01:00
cyril lopez	c9ce0070b1	Force string value in content-manager edit container PluginHeaderTitle	2017-10-30 13:40:24 +01:00
Jim Laurie	915dd37942	Merge branch 'alpha.7' of https://github.com/strapi/strapi into fix/api-relations-mongoose	2017-10-30 10:55:43 +01:00
Jim Laurie	08970eee3e	Handle manyToMany relations bookshelf by object	2017-10-27 18:22:58 +02:00
Jim Laurie	35b6a50810	Handle relation oneToMany dominant bookshelf	2017-10-26 17:21:23 +02:00
cyril lopez	6eff6abc57	Fix pagination design	2017-10-26 16:19:52 +02:00
cyril lopez	1ccef127b4	Add number of entries in List content-manager	2017-10-26 16:05:40 +02:00
cyril lopez	160ffe8626	Created dynamic to injectComponent from one plugin into another, write documentation accordingly	2017-10-24 14:35:08 +02:00
Aurelsicoko	1df5709085	Fix many-to-many relationships	2017-10-23 17:35:00 +02:00
Aurelsicoko	90e2993e0d	Fix Content-Manager relations management	2017-10-23 17:07:57 +02:00
cyril lopez	e109984181	Setup	2017-10-23 15:58:01 +02:00
Aurelsicoko	b0d2a3c838	3.0.0-alpha.6.4	2017-10-23 12:24:44 +02:00
Aurelsicoko	de162b3201	Use koa-router-joi instead of koa-joi-router	2017-10-23 10:48:19 +02:00
cyril lopez	fe56274217	Fix content-manager CANCEL_CHANGES action bug	2017-10-21 15:49:32 +02:00