29765 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Pierre BURGY	12706b6fbc	Merge pull request #222 from strapi/improvement/update-bootstrap ... Use Bootstrap alpha.6	2017-07-31 19:02:54 +02:00
Pierre Burgy	0be5c4d02c	Merge branch 'alpha.5' of https://github.com/strapi/strapi into plugin/content-manager	2017-07-31 17:45:04 +02:00
Pierre Burgy	25119b0c12	Merge branch 'alpha.5' of https://github.com/strapi/strapi into improvement/update-bootstrap	2017-07-31 17:44:34 +02:00
Aurélien GEORGET	e25afcc4fe	Merge pull request #221 from strapi/rewrite/strapi ... Rewrite/strapi	2017-07-31 17:42:48 +02:00
aurelsicoko	4e0ef33305	Comment 404 custom response return	2017-07-31 17:22:40 +02:00
aurelsicoko	2d7d893e9c	Fix custom responses	2017-07-31 17:18:32 +02:00
cyril lopez	0a4d5fd021	set nested data	2017-07-31 16:51:21 +02:00
aurelsicoko	0ffd6203ff	Display warning message when a dependency is missing	2017-07-31 16:49:15 +02:00
aurelsicoko	5dc0a06f96	Lint and fix typo on database configurations	2017-07-31 15:05:44 +02:00
Pierre Burgy	f9e686c994	Use Bootstrap alpha.6	2017-07-31 14:33:21 +02:00
Jim Laurie	09fe1bcb50	Fix require server on reload	2017-07-31 13:01:41 +02:00
aurelsicoko	14d76c835f	Be able to generate files through the CLI and fix Mongoose connect	2017-07-31 12:52:08 +02:00
aurelsicoko	937a4839bd	Fix path to retrieve defaults settings and remove useless files	2017-07-31 12:12:51 +02:00
aurelsicoko	8e55bd14a2	Move dictionary and update dependencies	2017-07-31 12:08:02 +02:00
Jim Laurie	ce897b30a6	Fix conflict	2017-07-31 12:04:40 +02:00
aurelsicoko	0157ca1c39	Clean middlewares	2017-07-31 11:51:30 +02:00
aurelsicoko	8d4bd40d18	Remove useless files	2017-07-31 11:42:14 +02:00
aurelsicoko	f853ae1de1	Remove hook/middleware listeners	2017-07-31 11:37:57 +02:00
aurelsicoko	316b7d897e	Freeze AST	2017-07-31 11:35:57 +02:00
aurelsicoko	4576b85dde	Resolve conflicts in bookshelf connector	2017-07-29 13:53:28 +02:00
aurelsicoko	202cf6f5a8	Resolve conflicts	2017-07-28 18:56:28 +02:00
aurelsicoko	48949d9f48	Update default configuration, and fix router for admin & plugins	2017-07-28 18:34:13 +02:00
Jim Laurie	51a2cfa232	Install strapi connector on create/update database	2017-07-28 16:56:17 +02:00
Jim Laurie	686c9aeb47	Change model config json format - enabled key	2017-07-28 16:39:34 +02:00
aurelsicoko	8013990ee4	Remove tableName property in model and update defaults configurations	2017-07-28 16:31:23 +02:00
Jim Laurie	c9f8a64c35	Review auto-reload with cluster and fs watch	2017-07-28 16:14:50 +02:00
cyril lopez	658f4a3ab8	Design databases view and add modal in home container	2017-07-28 15:54:50 +02:00
aurelsicoko	53ceb38fd7	Split security middleware, enable database hook by default, fix startup issue	2017-07-28 15:31:11 +02:00
cyril lopez	7c01e9eba2	Added databses needed translations	2017-07-28 15:01:51 +02:00
cyril lopez	1228e27a4e	Added blue div for active link	2017-07-28 14:38:17 +02:00
cyril lopez	4a91cd0e73	Center modal	2017-07-27 17:36:31 +02:00
aurelsicoko	cc01924787	Fix start CLI	2017-07-27 17:03:31 +02:00
aurelsicoko	626b6f4ba6	Remove global for count startup time and update package.json	2017-07-27 16:51:29 +02:00
aurelsicoko	99de59bdf6	Clean dependencies	2017-07-27 16:47:09 +02:00
aurelsicoko	bca6ead5cf	Harmonize configurations between adapters	2017-07-27 16:40:39 +02:00
cyril lopez	15c19d7f00	Design general languages and advanced	2017-07-27 16:07:09 +02:00
Pierre Burgy	74aef739ab	Set Node 8 compatibility as done in ROADMAP	2017-07-27 14:20:02 +02:00
aurelsicoko	8441d9b4be	Load custom hooks/middlewares and display warning message on missing enabled key	2017-07-27 13:06:05 +02:00
cyril lopez	25f3c91c6c	Update branch ... Merge branch 'plugin/settings-manager-dev' of https://github.com/strapi/strapi into plugin/settings-manager-dev	2017-07-27 10:15:36 +02:00
aurelsicoko	401d618a07	Take care of new configurations files	2017-07-26 18:53:48 +02:00
cyril lopez	a6a18abeca	Add notification for when deleting language and fix view design	2017-07-26 18:32:54 +02:00
Jim Laurie	6de2c52386	Merge branch 'plugin/settings-manager-dev' of github.com:strapi/strapi into plugin/settings-manager-dev	2017-07-26 18:30:28 +02:00
Jim Laurie	7396bc21bd	Fix force 404	2017-07-26 18:23:53 +02:00
cyril lopez	56eb510190	Fix EditForm buttonContainer alignment	2017-07-26 18:10:55 +02:00
Jim Laurie	c8a8f0f7ff	Add try/catch fs functions	2017-07-26 17:55:24 +02:00
cyril lopez	35bd7a2934	Fix css on inputs	2017-07-26 17:55:11 +02:00
Jim Laurie	256ef0ed93	API code review	2017-07-26 17:39:41 +02:00
cyril lopez	30ce8fdc1d	Design Input	2017-07-26 17:31:12 +02:00
Pierre Burgy	634fbb6ba0	Add survey link in README	2017-07-26 17:16:44 +02:00
Jim Laurie	d9743ffbd9	Delete database	2017-07-26 17:10:19 +02:00