295 Commits

Author	SHA1	Message	Date
Jim Laurie	6d39c26568	3.0.0-alpha.7	2017-12-11 15:11:29 +01:00
cyril lopez	cb1dbc8333	Fix PopUpForm close button position	2017-12-07 13:41:02 +01:00
cyril lopez	4b71c2b140	Fix ctb notification id	2017-12-07 13:31:32 +01:00
cyril lopez	9b5be00115	Add 404 in content type builder	2017-12-06 17:23:14 +01:00
Jim Laurie	80e4c1087c	Fix conflict	2017-12-05 10:28:53 +01:00
Aurelsicoko	b195ae0ef8	Merge branch 'alpha.7' of github.com:strapi/strapi into user-permissions	2017-12-04 11:43:53 +01:00
cyril lopez	eed26aeef7	Prevent plugins to execute the bootstrap file (frontend) if the plugin users-permissions is in the project or if the user is not logged in	2017-12-01 15:45:11 +01:00
Luca Perret	c8933f69d5	Fix content-type-builder typo	2017-11-23 18:25:21 +01:00
Jim Laurie	f719d7f1fb	Fix conflict	2017-11-23 15:05:05 +01:00
Rob Styles	e7b3eb8cbb	minor translation fixes	2017-11-21 15:39:56 +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
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
cyril lopez	1b9250f511	Write roles.sjon file	2017-11-17 14:22:59 +01:00
Jim Laurie	7a0d05346b	Fix conflict	2017-11-15 12:16:27 +01:00
cyril lopez	d9e3d80a22	Update content type builder storeData.js file for adapting with login	2017-11-14 13:27:25 +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
Jim Laurie	fe57abdb2f	Merge branch 'master' of github.com:strapi/strapi into user-permissions	2017-11-10 10:06:23 +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
cyril lopez	4352cece3d	Add input email to Input lib and associated validations	2017-11-08 14:31:06 +01:00
Jim Laurie	ef601d6e9a	3.0.0-alpha.6.6	2017-11-07 17:20:06 +01:00
Jim Laurie	02a82e7c8f	Merge branch 'master' of github.com:strapi/strapi into fix/node-modules	2017-11-06 20:09:58 +01:00
Jim Laurie	30e39254a6	Change strapi version to alpha.6.5	2017-11-06 15:52:36 +01:00
cyril lopez	a549688a4c	Update branch ... Merge branch 'master' of github.com:strapi/strapi into fix/ctb-edit-temp-attribute	2017-11-03 16:05:13 +01:00
cyril lopez	606dedf9cd	Fix edit temp attribute	2017-11-03 15:52:30 +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
Aurelsicoko	917dff6c39	Clean package.json after setup to create an app w/out --dev	2017-11-01 12:11:10 +01:00
cyril lopez	68bcfcb3b4	Improve lib Input	2017-10-31 14:19:54 +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	0cc377cc80	Rename strapi with Strapi	2017-10-30 13:46:40 +01:00
cyril lopez	9412b1c8b8	Send appropriate table_name in content-tyope-builder to check if a table exists	2017-10-30 13:19:56 +01:00
cyril lopez	30bae62bdd	Throw error if not model params	2017-10-30 10:38:18 +01:00
cyril lopez	8dfa961357	Remove double onClick props in Input lib and send error if connector does not exist in content type builder checkTableExists	2017-10-27 14:45:14 +02:00
cyril lopez	7ae11f90da	Missing semi	2017-10-27 06:00:07 +02:00
cyril lopez	3e0caba295	Add translations for NoTableWarning	2017-10-27 04:17:22 +02:00