33691 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jim LAURIE	bf35de5190	Merge branch 'master' into master	2018-02-22 12:12:37 +01:00
cyril lopez	a51f83312f	Fix eslint	2018-02-22 12:08:11 +01:00
Jim LAURIE	ee6c7a3c30	Merge pull request #681 from strapi/add-code-of-conduct-1 ... Create CODE_OF_CONDUCT.md	2018-02-22 11:46:11 +01:00
cyril lopez	98be104bf8	Enable InputDate	2018-02-22 11:46:00 +01:00
cyril lopez	3c060263cb	Fix bug in Upload	2018-02-22 11:43:45 +01:00
cyril lopez	aef9c88c4c	Add submit request	2018-02-22 11:33:01 +01:00
cyril lopez	e5513d3cd6	Display relations when editing	2018-02-22 10:35:19 +01:00
Özgür ERSOY	398709900f	fixed word	2018-02-22 02:34:27 +03:00
Özgür ERSOY	8821818028	turkish language | strapi-plugins	2018-02-22 02:34:00 +03:00
cyril lopez	6d9d272481	Fix conflict	2018-02-21 23:44:00 +01:00
Aurélien GEORGET	c85b8b8f01	Create CODE_OF_CONDUCT.md	2018-02-21 23:18:38 +01:00
Özgür ERSOY	cabe93a549	turkish language | strapi-admin	2018-02-22 00:50:45 +03:00
cyril lopez	f5571af1c1	Fixes https://github.com/strapi/strapi/issues/670	2018-02-21 18:59:13 +01:00
cyril lopez	fbcce82f8e	Add errors and prepare for submit request	2018-02-21 18:45:18 +01:00
Aurelsicoko	26c10cddd0	Handle morphToOne and morphToMany verbose	2018-02-21 17:33:30 +01:00
Jim Laurie	3f2111cbf9	Add some comments	2018-02-21 17:18:33 +01:00
cyril lopez	10599cfab8	Add new input lib to ctm	2018-02-21 17:14:35 +01:00
Aurelsicoko	dd354caf60	Handle most polymorphic use cases with Bookshelf	2018-02-21 16:35:25 +01:00
cyril lopez	1db543653a	Created Edit and EditRelations components	2018-02-21 15:33:58 +01:00
cyril lopez	77b660fb36	Get Data dynamic and handleChange	2018-02-21 15:09:33 +01:00
Jim Laurie	b7ee56d78f	Add sizeLimit	2018-02-21 14:46:10 +01:00
Jim Laurie	5f51b6b767	Fix previous PR feedback	2018-02-21 14:23:12 +01:00
Jim Laurie	9c663d2361	Add s3 upload	2018-02-21 14:06:57 +01:00
cyril lopez	e56a2639e0	Created EditPage container and display PluginHeader	2018-02-21 13:59:08 +01:00
cyril lopez	a7e6e3b8ae	Fix delete for bookshelf	2018-02-21 11:05:44 +01:00
Jim LAURIE	e41a788aef	Merge pull request #671 from strapi/file-upload-backend ... File upload backend	2018-02-21 11:05:38 +01:00
Aurelsicoko	dc75b51d6f	[WIP] Polymorphic associations with Bookshelf	2018-02-20 19:59:05 +01:00
cyril lopez	9c22dc85d5	Fix delete request	2018-02-20 19:29:30 +01:00
cyril lopez	47340cd08e	Handle delete record	2018-02-20 19:20:31 +01:00
Jim Laurie	f12b0503ff	Get and update configs	2018-02-20 17:10:25 +01:00
cyril lopez	8a7dd16a95	Add Table to ListPage	2018-02-20 16:58:05 +01:00
Jim Laurie	ab93e7113f	Move upload in modules	2018-02-20 15:57:34 +01:00
cyril lopez	45246d3467	Get records dynamic	2018-02-20 15:51:20 +01:00
cyril lopez	5df2517c43	Add getdata dynamic	2018-02-20 14:25:45 +01:00
Jim Laurie	37d00cae42	Merge branch 'master' of github.com:strapi/strapi into file-upload-backend	2018-02-20 13:37:41 +01:00
Jim LAURIE	819c16bcdb	Merge pull request #656 from strapi/plugin/img-upload-front ... Plugin/img upload front	2018-02-20 13:21:39 +01:00
cyril lopez	5081061b98	Merge branch 'master' into plugin/img-upload-front	2018-02-20 12:32:45 +01:00
cyril lopez	8581e774b8	Clean svg	2018-02-20 12:31:31 +01:00
cyril lopez	ed46226872	Fix css	2018-02-20 12:29:27 +01:00
cyril lopez	2475b10538	Merge branch 'plugin/img-upload-front' of github.com:strapi/strapi into plugin/img-upload-front	2018-02-20 12:17:16 +01:00
cyril lopez	9b62413044	Fix PR review	2018-02-20 12:16:11 +01:00
cyril lopez	1e82268f25	Add Translations to plugin upload	2018-02-20 11:53:18 +01:00
cyril lopez	03378761e2	Created ListPage component	2018-02-20 11:34:15 +01:00
cyril lopez	269b228841	Merge branch 'master' of github.com:strapi/strapi into improve-ctm	2018-02-20 11:02:06 +01:00
Jim LAURIE	1af0377590	Merge pull request #668 from abdonrd/cancel-to-reset ... Rename cancel to reset	2018-02-20 10:33:49 +01:00
Abdón Rodríguez Davila	a70192ec7f	Fix the file indent	2018-02-20 10:20:04 +01:00
Abdón Rodríguez Davila	f1b2eed015	Rename cancel to reset	2018-02-20 10:20:04 +01:00
Jim Laurie	de3da8eaf7	Fix conflicts	2018-02-19 19:56:23 +01:00
Jim Laurie	44ec9e9e02	Route count uploads	2018-02-19 19:54:45 +01:00
cyril lopez	15f573585f	Add default Props to Pagefooter	2018-02-19 17:48:54 +01:00