9273 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jim Laurie	c2925d98e8	Change gitignore for generated admin	2017-11-03 17:15:53 +01:00
Aurelsicoko	d129bcc22e	Resolve conflicts	2017-11-03 16:22:17 +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
Aurelsicoko	971207c115	Harmonize plugins configurations during server start	2017-11-03 16:04:02 +01:00
Jim LAURIE	315dd81714	Merge pull request #323 from strapi/alpha.7 ... Alpha 6.5	2017-11-03 16:03:04 +01:00
Aurelsicoko	6ec618c677	Allow custom URL by env for plugins and admin	2017-11-03 15:59:03 +01:00
cyril lopez	606dedf9cd	Fix edit temp attribute	2017-11-03 15:52:30 +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	2418686b7b	Fix conflict	2017-11-03 15:02:45 +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	10ac7b9f4b	Remove log	2017-11-03 15:01:06 +01:00
Jim LAURIE	13ee2cfedd	Merge pull request #321 from strapi/improvement/database-port-sm ... Auto add database port	2017-11-03 14:56:33 +01:00
Jim Laurie	b4c78489dc	Merge branch 'master' of https://github.com/strapi/strapi into improvement/database-port-sm	2017-11-03 14:44:03 +01:00
Jim LAURIE	ed754f38a8	Merge pull request #320 from strapi/fix/install-database-sm ... Install database dependencies	2017-11-03 14:42:49 +01:00
Jim Laurie	40a9abe37b	New manifest	2017-11-03 14:30:39 +01:00
Jim Laurie	1edccdf39a	Fix conflict	2017-11-03 14:16:19 +01:00
cyril lopez	56d48f6da0	Use strapiBin instead of global to uninstall a plugin	2017-11-03 14:13:47 +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	1d20d59452	Fix confilct	2017-11-03 12:11:29 +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
Aurelsicoko	b81f8f3b89	Update plugin installation process to handle plugin config file	2017-11-02 19:36:09 +01:00
cyril lopez	ae6fa58747	Merge pull request #313 from strapi/fix/plugins ... Fix/plugins	2017-11-02 17:11:45 +01:00
cyril lopez	8c9f9e496d	Add uninstall plugin dynamic	2017-11-02 17:05:37 +01:00
cyril lopez	f8866e09f3	Design list-plugins page and handle front end uninstall plugin	2017-11-02 16:49:10 +01:00
Jim Laurie	2db9dc5d08	Install admin dependencies	2017-11-02 14:46:41 +01:00
Jim Laurie	49901024cd	Delete useless variable	2017-11-02 13:57:52 +01:00
Jim Laurie	76f7f6644d	Change logs wording	2017-11-02 13:34:56 +01:00
Jim Laurie	c0eac6b04d	Auto add database port	2017-11-02 12:27:52 +01:00
Aurelsicoko	3ef25764c7	Serve admin assets using public middleware	2017-11-02 12:11:57 +01:00
Aurélien GEORGET	09c38cfbbd	Merge pull request #319 from strapi/improvement/installation ... Clean package.json after setup to create an app w/out --dev	2017-11-02 11:44:42 +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
cyril lopez	f275da8500	Fix checkboxLabel style	2017-11-02 10:15:37 +01:00
Jim Laurie	ee280a2bc4	Install database dependencies and add logs	2017-11-01 16:52:00 +01:00
Jim Laurie	084cb3c49e	Fix PR feedback	2017-11-01 15:16:28 +01:00
Aurélien GEORGET	a6b99cc6a9	Merge pull request #288 from strapi/fix/ejs ... Fix ejs	2017-11-01 12:12:32 +01:00
Aurelsicoko	917dff6c39	Clean package.json after setup to create an app w/out --dev	2017-11-01 12:11:10 +01:00
Aurélien GEORGET	ff1c7cdce1	Merge pull request #317 from ogonkov/patch-1 ... Fix local installation	2017-11-01 11:55:32 +01:00
Alexey	8a8d85356a	Fix path to strapi bin	2017-10-31 23:17:26 +03:00
Alexey	dc3ecb02ca	Fix local installation ... Fallback to `process.cwd()` in case of local installation	2017-10-31 22:57:18 +03:00
Jim Laurie	f6b97addfd	Fix generate model bookshelf collectionName	2017-10-31 14:58:28 +01:00
Jim Laurie	14b2676524	Fix relation create one to one object	2017-10-31 14:44:34 +01:00
cyril lopez	68bcfcb3b4	Improve lib Input	2017-10-31 14:19:54 +01:00
cyril lopez	9b0f7366f9	Fix relationComponent update	2017-10-31 14:01:12 +01:00
Jim Laurie	c479480d34	Fix relation create one to one	2017-10-31 13:43:48 +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