4274 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Aurelsicoko	f62c5f52fc	Remove duplicate permissions	2018-05-02 11:40:42 +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
Jim Laurie	ba16a0b7c5	Set asc as default	2018-04-30 17:48:43 +02:00
Jim Laurie	596adb5f61	Fix 1059	2018-04-30 17:14:13 +02:00
Zhuang	7634ff5602	add simplify chineses translation for plugins	2018-04-30 22:09:53 +08: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	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
Jim LAURIE	85c2f1a58a	Merge branch 'master' into update-contributing	2018-04-27 23:22:04 +02:00
Jim LAURIE	04f8f051d0	Merge pull request #1052 from strapi/fix/802 ... Remove plugin key for API model	2018-04-27 16:52:57 +02:00
soupette	b22929f006	Add new setup command to the contributing guide	2018-04-27 16:45:34 +02:00
Jim LAURIE	49ced583f3	Merge branch 'master' into fix/802	2018-04-27 16:40:57 +02:00
Jim LAURIE	b994e33b82	Merge pull request #1025 from strapi/sql-xp ... Improve SQL experience	2018-04-27 16:40:23 +02:00
Jim LAURIE	9cc62373f0	Merge branch 'master' into sql-xp	2018-04-27 16:29:49 +02:00
Jim Laurie	b82cfc4676	Change email and password as string	2018-04-27 16:29:18 +02:00
Jim Laurie	ee75653cdd	Handle required	2018-04-27 16:07:18 +02:00
Aurelsicoko	af41ef444c	Fixes #802	2018-04-27 15:50:37 +02:00
Aurelsicoko	dffbf3bbb3	Concat promise to return a single array	2018-04-27 15:48:52 +02:00
Jim Laurie	d986cb4cc8	Fix relation table creation	2018-04-27 14:53:09 +02:00
Jim Laurie	8adc8ec200	Diff text / string	2018-04-27 14:17:50 +02:00
Jim Laurie	a6c0616dfc	Handle update type	2018-04-27 13:47:09 +02:00
Jim LAURIE	29ac0efacf	Merge pull request #1047 from strapi/fix-978 ... Fixes WYSIWYG insert image position	2018-04-27 11:33:00 +02:00
cyril lopez	941726ba0c	Merge branch 'master' into fix-978	2018-04-27 09:27:51 +02:00
Jim LAURIE	98ca83cf5d	Merge pull request #1049 from Luukth/master ... Fix for host not in config.url	2018-04-26 16:37:55 +02:00
Jim LAURIE	b07f20392e	Merge branch 'master' into master	2018-04-26 16:25:53 +02:00
Jim LAURIE	c3ad5fdd74	Merge pull request #1046 from strapi/fix-838 ... Fixes settings-manager language deletion bug	2018-04-26 16:25:37 +02:00
Jim LAURIE	0410f12cb1	Merge branch 'master' into fix-838	2018-04-26 16:12:55 +02:00
Luukth	fbd060d49a	Merge pull request #1 from Luukth/Luukth-patch-1 ... Update configurations.js	2018-04-26 16:02:00 +02:00
Luukth	4f83965fa9	Update configurations.js ... Fix for issue #800 this.config.url will now contain the host from the configuration file.	2018-04-26 16:00:05 +02:00