162 Commits

Author	SHA1	Message	Date
Jim Laurie	6d39c26568	3.0.0-alpha.7	2017-12-11 15:11:29 +01:00
cyril lopez	795950c7cb	Remove X-Forwarded-Host header in strapi-generate-new	2017-12-07 14:11:06 +01:00
cyril lopez	1084e88826	Catch register errors and handle it in front	2017-12-06 12:19:43 +01:00
Jim Laurie	f719d7f1fb	Fix conflict	2017-11-23 15:05:05 +01:00
cyril lopez	51194f28b5	Fix conflict	2017-11-17 17:22:41 +01:00
Aurelsicoko	3ccef3e3ba	Fix symlink creation on Windows and .gitignore update	2017-11-17 16:35:52 +01:00
Jim Laurie	a512d232d3	Add plugin send email	2017-11-16 16:58:45 +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
Aurelsicoko	2ceed9b1cf	Add rimraf as dependency	2017-11-14 11:44:38 +01:00
Aurelsicoko	98cbcd6940	Don't execute npm prune on every npm install	2017-11-13 19:38:16 +01:00
Aurelsicoko	aeb43d925c	Introduce new configurations for admin	2017-11-10 16:04:57 +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
Aurelsicoko	93abc5a348	Add uuid dependency	2017-11-08 15:09:06 +01:00
Aurelsicoko	bc7f89719c	Retrieve usage	2017-11-08 15:03:55 +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	1604ffe658	Change gitignore generated app	2017-11-06 14:47:00 +01:00
cyril lopez	2ccfd4e8b5	Generate plugin users-permissions and add it to strapi-packages	2017-11-06 11:14:43 +01:00
Jim Laurie	1d33ae9768	Merge branch 'alpha.7' of https://github.com/strapi/strapi into fix/node-modules	2017-11-03 15:37:31 +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
Jim Laurie	2db9dc5d08	Install admin dependencies	2017-11-02 14:46:41 +01:00
Alexey	8a8d85356a	Fix path to strapi bin	2017-10-31 23:17:26 +03:00
Jim Laurie	4b562ed94f	Move plugin setup on strapi	2017-10-23 17:53:49 +02:00
Jim Laurie	e1f6af4911	Fix plugin install node modules dependencies	2017-10-23 17:32:18 +02:00
Aurelsicoko	b0d2a3c838	3.0.0-alpha.6.4	2017-10-23 12:24:44 +02:00
Aurelsicoko	3bb952d58f	Update dependencies	2017-10-18 18:39:32 +02:00
Aurelsicoko	9586a8cabc	3.0.0-alpha.6.3	2017-10-16 15:13:28 +02:00
Aurelsicoko	81763a3281	Fix issues for release	2017-10-16 15:09:43 +02:00
Aurelsicoko	b5955739da	3.0.0-alpha.6.2	2017-10-16 12:29:47 +02:00
Aurelsicoko	5d06875a20	3.0.0-alpha.6.1	2017-10-16 11:44:29 +02:00
Aurelsicoko	287b5e17f9	3.0.0-alpha.6	2017-10-16 11:07:41 +02:00
Aurelsicoko	0cda615702	Update generated .gitignore	2017-10-16 09:29:41 +02:00
Aurelsicoko	2e0788ff2e	Fix ESLint file	2017-10-11 12:09:16 +02:00
Aurelsicoko	9eb3fafb13	Use arrow function in CRON file	2017-10-11 12:08:45 +02:00
Pierre Burgy	44eeeaad0b	Install every plugins on project creation	2017-10-06 17:49:21 +02:00
Jim Laurie	41718d31d1	Merge branch 'alpha.6' of https://github.com/strapi/strapi into improvement/configs	2017-09-29 14:45:00 +02:00
Aurelsicoko	1d6d91435e	Create development project based on symlinks and update default configs	2017-09-27 17:55:51 +02:00
Jim Laurie	c2d35be9b5	Fix conflicts	2017-09-27 13:56:10 +02:00
cyril lopez	7b7725d4f4	Fix settings-manager plugin left menu active class	2017-09-26 10:01:55 +02:00
Aurelsicoko	51d936b559	Resolve conflicts	2017-09-25 18:28:45 +02:00
Jim Laurie	274bb5fee9	Active request log by default	2017-09-25 16:32:01 +02:00
Jim Laurie	1d2ac86467	Pull alpha 6	2017-09-25 13:42:39 +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
Jim Laurie	68495606b2	Migration koa-generic-session to koa-session	2017-09-21 12:24:27 +02:00