29765 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
cyril lopez	ef2c076a84	Fix Li css	2018-02-19 17:47:11 +01:00
cyril lopez	79b9a01c14	Add Pagination	2018-02-19 17:41:05 +01:00
cyril lopez	28c3155e5f	Created PageFooter component ... Component that handles the entries limit number and the page navigation	2018-02-19 17:05:23 +01:00
Jim Laurie	9ef00e217d	Delete file upload	2018-02-19 16:00:37 +01:00
Jim Laurie	cf029dac07	Create db entry on upload and get uploads	2018-02-19 15:41:26 +01:00
cyril lopez	9a13f1e0d0	Handle delete file	2018-02-19 15:14:32 +01:00
Jim Laurie	848db478e3	Create route to upload on local server	2018-02-19 14:26:20 +01:00
cyril lopez	601661ae92	Created FileIcon componen	2018-02-19 14:23:47 +01:00
cyril lopez	976ac68543	Add CopytoClipboard	2018-02-19 13:48:02 +01:00
cyril lopez	85f3b5c6d2	Desgin upload list	2018-02-19 13:10:35 +01:00
Jim LAURIE	a1019a0335	Merge pull request #657 from strapi/3.0.0-alpha.10.2 ... 3.0.0 alpha.10.2	2018-02-19 12:55:54 +01:00
Jim LAURIE	3fb12f16ba	Merge branch 'master' into 3.0.0-alpha.10.2	2018-02-19 12:28:51 +01:00
Jim LAURIE	c98338942b	Merge pull request #649 from strapi/relations/polymorphic ... Relations/polymorphic	2018-02-19 11:49:51 +01:00
Jim Laurie	0a5e80be93	3.0.0-alpha.10.2 v3.0.0-alpha.10.2	2018-02-19 11:38:20 +01:00
Jim LAURIE	e2be148071	Merge branch 'master' into relations/polymorphic	2018-02-19 11:32:06 +01:00
Jim LAURIE	97acced7da	Merge pull request #663 from denislutz/docImprove ... Some minor doc improvements on english level	2018-02-19 11:09:51 +01:00
Jim LAURIE	71298adb53	Merge branch 'master' into docImprove	2018-02-19 10:58:23 +01:00
Jim LAURIE	771ea7662b	Merge pull request #665 from jamesdbruner/patch-2 ... Renaming 'Cancel' to 'Reset'	2018-02-19 10:38:03 +01:00
Jim LAURIE	2f704ea3c3	Merge branch 'master' into patch-2	2018-02-19 10:26:42 +01:00
Jim LAURIE	1277517159	Merge pull request #658 from strapi/fix-update-provider-email ... Fix update email provider	2018-02-19 10:26:26 +01:00
Jim LAURIE	d0c7d8768b	Merge pull request #666 from igghera/master ... Fix #660: Allow side menu to scroll when content requires it	2018-02-18 17:44:45 +01:00
Jim LAURIE	8f06a9c250	Merge branch 'master' into master	2018-02-18 17:09:00 +01:00
Jim LAURIE	8e060c3fdb	Merge pull request #662 from lucaperret/master ... fix(generate-new): prevent delete the node_modules dir	2018-02-18 17:08:49 +01:00
Jim LAURIE	115283ac37	Merge branch 'master' into master	2018-02-18 16:54:33 +01:00
Denis Lutz	79128d35d1	fix writing mistakes	2018-02-18 16:17:19 +01:00
Denis Lutz	95bbc50553	Merge branch 'master' into docImprove	2018-02-18 16:03:06 +01:00