29765 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
cyril lopez	01d98ae0aa	Change notif color	2018-03-06 09:47:37 +01:00
cyril lopez	627e241c94	Merge branch 'feature/upload' of github.com:strapi/strapi into feature/upload	2018-03-06 09:33:12 +01:00
cyril lopez	3e32741114	Add loading button to ctm and to upload && modify design	2018-03-06 09:31:44 +01:00
Luca	28cf166241	doc(tutorials): add getting started category	2018-03-06 07:35:04 +01:00
Marcus Geißler	3f6ba9256f	Merge branch 'master' into patch-1	2018-03-05 20:28:48 +01:00
cyril lopez	abc4598aa7	Init Wysiwyg focus and value	2018-03-05 19:23:06 +01:00
Aurelsicoko	670f1d8434	Merge branch 'feature/upload' of github.com:strapi/strapi into feature/upload	2018-03-05 18:40:57 +01:00
Jim Laurie	36cf601a84	Format updatedAt date in file list	2018-03-05 17:37:48 +01:00
Jim Laurie	be7e95b48c	Add createdAt updatedAt for mongoose	2018-03-05 17:26:55 +01:00
Aurelsicoko	2f69111506	Merge branch 'master' of github.com:strapi/strapi into feature/upload	2018-03-05 16:23:17 +01:00
Aurelsicoko	be40cd7392	Update icon upload plugin	2018-03-05 15:51:26 +01:00
Jim LAURIE	4bca88c070	Merge pull request #717 from strapi/fix-ctb ... Fix ctb	2018-03-05 15:36:06 +01:00
Aurelsicoko	06181c3f09	Update icon color	2018-03-05 15:25:13 +01:00
Jim LAURIE	ac7545b53e	Merge branch 'master' into fix-ctb	2018-03-05 15:17:10 +01:00
Jim LAURIE	6b4e948571	Merge pull request #723 from strapi/fix-upload-front ... Fix upload front	2018-03-05 15:15:04 +01:00
Aurelsicoko	7dfc184a2e	Don't loose oneToManyMorph relationship on update	2018-03-05 15:04:10 +01:00
Aurelsicoko	48694067be	Merge branch 'feature/upload' of github.com:strapi/strapi into feature/upload	2018-03-05 14:56:23 +01:00
cyril lopez	d04c1500b6	Merge branch 'master' of github.com:strapi/strapi into fix-ctb	2018-03-05 14:52:31 +01:00
Jim LAURIE	03a540631c	Merge branch 'master' into fix-upload-front	2018-03-05 14:52:18 +01:00
cyril lopez	3e468a1b9c	Wysiwyg is coming	2018-03-05 14:30:28 +01:00
cyril lopez	71e4009317	Fix css and add redirection when modofiying the upload provider	2018-03-05 12:28:29 +01:00
Marcus Geißler	fb0b5e6a07	Changed syntax for strapi new database arguments ... https://github.com/strapi/strapi/issues/732	2018-03-05 11:49:10 +01:00
Aurelsicoko	8bd9f62541	Merge branch 'feature/upload' of github.com:strapi/strapi into feature/upload	2018-03-05 11:32:23 +01:00
cyril lopez	20dd39127b	Update InputFile design and change associated translations	2018-03-05 11:09:32 +01:00
Aurelsicoko	cf08bf43e5	Update plugin menu name	2018-03-05 11:07:37 +01:00
Minh Tri Nguyen	a18ba8805e	Add authSource & ssl options to MongoDB connector fix	2018-03-04 23:02:29 +08:00
Jim LAURIE	eab59ad395	Merge pull request #725 from rockmandash/Fix-some-Chinese-Translation ... add some chinese translation fix	2018-03-03 13:10:04 +01:00
Aurelsicoko	a9f4a43ac9	Enhance cleanData utils to handle Mongo ObjectId	2018-03-02 23:31:30 +01:00
Aurelsicoko	933254f1d1	Replace null by empty array on single file field	2018-03-02 17:00:00 +01:00
Aurelsicoko	2bdf226490	Add/remove one file in Content Manager for Bookshelf	2018-03-02 16:31:32 +01:00
Aurelsicoko	5f0618f94c	Add icon plugin upload	2018-03-02 15:08:42 +01:00
Aurelsicoko	63d1d31490	Fix config upload AWS S3	2018-03-02 15:06:35 +01:00
Aurelsicoko	d7aa3eef7e	Resolve conflicts	2018-03-02 14:21:51 +01:00
Aurelsicoko	1490e06003	Remove useless association login in create method for Mongoose	2018-03-02 12:32:35 +01:00
Aurelsicoko	61fee2c03e	Set ctx.status when Boom method is called	2018-03-02 12:27:59 +01:00
Aurelsicoko	2d5f607052	Add/remove single file from Content Manager	2018-03-02 12:01:18 +01:00
Aurelsicoko	b896d96061	Fix one file upload input	2018-03-02 11:49:23 +01:00
Joseph Wang	a9ba025b24	add some chinese translation fix	2018-03-02 18:43:03 +08:00
cyril lopez	2f90e52e6a	Fix translation typo	2018-03-02 09:28:53 +01:00
cyril lopez	094e2d6f66	Fix InputSearch transition css	2018-03-02 09:27:29 +01:00
cyril lopez	247d308e26	Fix ctm formvalidations ... This logic needs to be redone Fix overflow on upload list	2018-03-01 22:51:48 +01:00
cyril lopez	1b2f94938b	Increase InputFileDetails fonts	2018-03-01 22:09:50 +01:00
cyril lopez	c22a1cc39c	Check if the relation is manyToManyMorph in order to send the correct object when deleting a file	2018-03-01 22:03:23 +01:00
cyril lopez	51058d6e9b	Send empty array when removing file	2018-03-01 18:34:29 +01:00
Aurelsicoko	e435b01953	Merge branch 'feature/upload' of github.com:strapi/strapi into feature/upload	2018-03-01 17:40:24 +01:00
Aurelsicoko	234d913c1b	Add/remove images file Content Manager for SQL databases	2018-03-01 17:39:31 +01:00
Jim Laurie	354a69c5f3	Hotfix strapi.log	2018-03-01 16:53:58 +01:00
Jim LAURIE	359c48e301	Merge pull request #719 from strapi/update-generators ... Add locales to plugin generators	2018-03-01 16:21:04 +01:00
Jim LAURIE	952024373e	Merge branch 'master' into update-generators	2018-03-01 15:53:39 +01:00
Jim LAURIE	036c0d7584	Merge pull request #718 from strapi/improve-reactintl ... Take en default translation message if there are not present in the c…	2018-03-01 15:52:09 +01:00