4547 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Aurelsicoko	2fe530e334	Merge branch 'master' of github.com:strapi/strapi into upload/bookshelf	2018-05-02 17:08:07 +02:00
Aurelsicoko	e3fc6ad30b	Remove the return to avoid the loop break	2018-05-02 17:07:03 +02:00
Jim LAURIE	fc6e126165	Merge pull request #1089 from strapi/fix-cm-entry-relations ... Fix entry create relations	2018-05-02 17:06:32 +02:00
Jim LAURIE	e6a14367f3	Merge branch 'master' into fix-cm-entry-relations	2018-05-02 17:04:41 +02:00
Jim LAURIE	63bc6bf5c0	Merge pull request #1087 from strapi/upload/bookshelf ... Fix single upload with Bookshelf	2018-05-02 17:04:25 +02:00
Aurelsicoko	ce3d52d73e	Fix single upload with Bookshelf	2018-05-02 16:15:36 +02:00
Jim Laurie	3ea2c8a775	Fix entry create relations	2018-05-02 15:39:12 +02:00
soupette	2ab212b195	Undo changes	2018-05-02 15:31:08 +02:00
soupette	5edbd8551a	Add strapi-lint to all setup packages	2018-05-02 14:28:02 +02:00
soupette	18edd24790	Add strapi-lint to strapi-utils strapi-generate -api	2018-05-02 14:08:28 +02:00
soupette	613940c1d9	Add eslint to email and graphql backend	2018-05-02 12:28:27 +02:00
Aurelsicoko	f62c5f52fc	Remove duplicate permissions	2018-05-02 11:40:42 +02:00
Jim LAURIE	bb26c6ea8e	Merge pull request #1084 from strapi/eslint-admin ... Add eslint to strapi-admin backend	2018-05-02 11:20:03 +02:00
Jim LAURIE	ddc3aaf142	Merge pull request #1074 from strapi/eslint-users-permissions ... Add eslint to users-permissions backend	2018-05-02 11:16:01 +02:00
Jim LAURIE	a4c14774ae	Merge pull request #1073 from strapi/eslint-upload ... Add eslint to plugin-upload backend	2018-05-02 11:13:55 +02:00
Jim LAURIE	6d8e9e3bf0	Merge pull request #1071 from strapi/eslint-ctb ... Add eslint to ctb backend	2018-05-02 11:12:21 +02:00
soupette	30528f40ec	Add eslint to strapi-admin backend	2018-05-02 11:01:27 +02:00
Aurelsicoko	a6fd8fc460	Fixes #886	2018-05-01 14:36:17 +02:00
Jim LAURIE	11a92c8f61	Merge pull request #1080 from strapi/delete-logs ... Delete log	2018-05-01 14:31:44 +02:00
Jim LAURIE	806904c498	Delete log	2018-05-01 14:31:26 +02:00
stephledev	d924db42fc	Merge branch 'master' of github.com:strapi/strapi	2018-05-01 13:04:10 +02:00
stephledev	760a6d9a9a	add translations for EN and DE for authenticationDatabase and SSl in admin panel	2018-05-01 12:59:28 +02:00
stephledev	5e5815e309	add authenticationDatabase and SSL to admin panel	2018-05-01 12:56:51 +02:00
Jim LAURIE	238c0c8141	Merge pull request #1072 from strapi/fix-sort-default ... Set asc as default for sorting	2018-05-01 12:00:06 +02:00
Jim LAURIE	d92bd283b6	Merge branch 'master' into fix-sort-default	2018-05-01 11:50:13 +02:00
Jim LAURIE	fa0ec2e016	Merge pull request #1070 from strapi/fix-1059 ... Fix relation detection OneToManyMorph for OneToMany	2018-05-01 11:49:53 +02:00
Jim LAURIE	36a60be839	Merge branch 'master' into fix-1059	2018-05-01 11:38:29 +02:00
Jim LAURIE	dded34eae9	Merge pull request #1068 from strapi/fix-ctb ... Fix open modal relation bug	2018-05-01 11:37:56 +02:00
Jim LAURIE	a3d9454ee0	Merge branch 'master' into fix-ctb	2018-05-01 11:29:31 +02:00
Jim LAURIE	b1fec9c02f	Merge pull request #1067 from strapi/improve-dev-setup ... Add steps in the CONTRIBUTING_GUIDE and plugin development sections	2018-05-01 11:29:15 +02:00
Jim LAURIE	15e62b477e	Merge branch 'master' into improve-dev-setup	2018-05-01 11:20:27 +02:00
Jim LAURIE	1e41c08378	Merge pull request #993 from zhuang17/add_simply_chinese_translation ... Add Simplified Chinese translation	2018-05-01 11:20:09 +02:00
soupette	68504fbe16	Add eslint to users-permissions backend	2018-04-30 18:26:56 +02:00
soupette	e439333b42	Add eslint to plugin-upload backend	2018-04-30 18:00:01 +02:00
Jim Laurie	ba16a0b7c5	Set asc as default	2018-04-30 17:48:43 +02:00
soupette	1a5c9d45da	Change front eslint config	2018-04-30 17:30:00 +02:00
soupette	4f498cea06	Add eslint to ctb backend	2018-04-30 17:27:46 +02:00
Jim Laurie	596adb5f61	Fix 1059	2018-04-30 17:14:13 +02:00
soupette	85cf6dfb91	Rename eslint folder	2018-04-30 16:56:45 +02:00
soupette	8a4412d6d6	Add eslint to ctm backend folders	2018-04-30 16:32:48 +02:00
Zhuang	7634ff5602	add simplify chineses translation for plugins	2018-04-30 22:09:53 +08:00
soupette	80dd0ef7d8	Fix setup	2018-04-30 16:04:29 +02:00
soupette	67c6c1902f	Fixes #1065	2018-04-30 15:37:26 +02:00
soupette	ba6011beda	Fix popuprelation bug	2018-04-30 15:30:49 +02:00
soupette	62246d185f	Fix conflicts	2018-04-30 14:04:08 +02:00
soupette	7088f70e94	Add steps in the CONTRIBUTING_GUIDE and plugin development sections	2018-04-30 14:00:08 +02:00
Zhuang	97531cc3d2	Merge branch 'master' of https://github.com/strapi/strapi into add_simply_chinese_translation	2018-04-30 16:56:19 +08:00
Jim LAURIE	f91be5ce63	Merge pull request #1060 from strapi/migration-doc-menu ... Add migration guide 11 to 12 in the menu	2018-04-29 12:44:47 +02:00
Jim LAURIE	5ada6ebc72	Add migration guide 11 to 12 in the menu	2018-04-29 12:43:51 +02:00
Jim LAURIE	faf3ac98ca	Merge pull request #1056 from strapi/update-contributing ... Update CONTRIBUTING GUIDE	2018-04-28 13:06:57 +02:00