33691 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jim LAURIE	851b644464	Merge pull request #331 from strapi/fix/node-modules ... Fix node modules	2017-11-07 15:59:26 +01:00
Aurelsicoko	8d833d8ebb	Handle case when there is no admin	2017-11-07 15:31:59 +01:00
Jim Laurie	255175a37a	Fix PR feedback - fse	2017-11-07 15:14:48 +01:00
cyril lopez	9c65e2824e	Handle delete dynamic and created EditPage container with associated route	2017-11-07 14:32:31 +01:00
Jim Laurie	f9d0bc4f9c	Handle undefined value for input validation	2017-11-07 12:02:03 +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	96e9d3ee86	Fix local installation	2017-11-06 19:05:25 +01:00
cyril lopez	c1131dfbf9	Add PopUpWarning to handle delete item	2017-11-06 18:25:40 +01:00
cyril lopez	4e030f1fa9	Complete design list views	2017-11-06 18:15:53 +01:00
cyril lopez	771cddcf48	Implemented List title dynamic and fetch data depending on url	2017-11-06 17:03:20 +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	c2659ca37f	Design HeaderNav component	2017-11-06 12:27:53 +01:00
cyril lopez	4325102586	Update generate-plugin package by removing unnecessary Button component	2017-11-06 11:53:41 +01:00
cyril lopez	69e0563d27	Add PluginHeader component, associated translations and remove component Button	2017-11-06 11:52:14 +01:00
cyril lopez	2ccfd4e8b5	Generate plugin users-permissions and add it to strapi-packages	2017-11-06 11:14:43 +01:00
cyril lopez	48119631df	Merge pull request #326 from strapi/fix/ctb-edit-temp-attribute ... Fix/ctb edit temp attribute	2017-11-06 10:56:28 +01:00
Jim Laurie	7c773f91b4	Merge branch 'master' of https://github.com/strapi/strapi into fix/node-modules	2017-11-03 17:17:23 +01:00
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