942 Commits

Author	SHA1	Message	Date
Jim Laurie	9017c0d1d0	Add ga in admin to improve Strapi	2018-03-19 17:45:33 +01:00
cyril lopez	17aa4049d1	Merge branch 'master' of github.com:strapi/strapi into wysiwyg	2018-03-19 12:53:15 +01:00
Abdón Rodríguez Davila	1dd36a5eb6	Fix spaces path issues on npm run build --plugins	2018-03-18 13:11:11 +01:00
cyril lopez	98f0b6f3fc	Created ToggleToMArkdown button	2018-03-16 11:45:21 +01:00
cyril lopez	63575565b1	Merge branch 'master' of github.com:strapi/strapi into wysiwyg	2018-03-15 22:20:54 +01:00
Aurelsicoko	684a70c665	Fix dominant true when updating relationship	2018-03-15 12:56:21 +01:00
cyril lopez	3841ae20dd	Merge branch 'master' of github.com:strapi/strapi into wysiwyg	2018-03-14 16:59:00 +01:00
Aurelsicoko	d89888bb47	Add keep me updated checkbox on register	2018-03-14 13:18:05 +01:00
Aurelsicoko	1e9e684eb5	Remove no-cors from register request	2018-03-13 18:25:27 +01:00
cyril lopez	1d0ef6062e	Merge branch 'master' of github.com:strapi/strapi into wysiwyg	2018-03-13 10:16:36 +01:00
cyril lopez	fb70b174d2	Add fullscreen mode ... the wysiwyg in full screen is still buggy	2018-03-12 15:38:38 +01:00
cyril lopez	42bbaf1a28	Created WysiwygBottomControls component	2018-03-12 13:26:07 +01:00
Jim Laurie	6cd0ec730e	3.0.0-alpha.11.1	2018-03-11 15:54:56 +01:00
Jim LAURIE	1d91544b4f	Merge branch 'master' into fix-upload	2018-03-09 13:08:33 +01:00
cyril lopez	5542d32941	Fixes #759	2018-03-09 11:22:37 +01:00
cyril lopez	c7f2eaac9f	Fixes #758	2018-03-09 11:19:34 +01:00
Jim Laurie	932bf6da23	3.0.0-alpha.11	2018-03-08 17:31:25 +01:00
cyril lopez	589d3f5a3f	Fix app environments bug	2018-03-08 10:32:01 +01:00
Jim Laurie	94381bd24b	Remove log	2018-03-07 16:36:45 +01:00
Jim Laurie	1c581acb0e	Fix upload settings by env ... Co-authored-by: soupette <cyril.lpz@gmail.com>	2018-03-07 13:44:58 +01:00
Aurelsicoko	8904f2ef60	Improve animation upload timing	2018-03-06 18:32:39 +01:00
Aurelsicoko	800945eb32	Resolve conflicts	2018-03-06 15:50:41 +01:00
Aurelsicoko	cc1ec5c1ea	Make CSS improvements on upload plugin	2018-03-06 15:49:11 +01:00
cyril lopez	e4e65658e6	Add animation when uploading files	2018-03-06 14:02:56 +01:00
cyril lopez	01d98ae0aa	Change notif color	2018-03-06 09:47:37 +01:00
Aurelsicoko	2f69111506	Merge branch 'master' of github.com:strapi/strapi into feature/upload	2018-03-05 16:23:17 +01:00
cyril lopez	20dd39127b	Update InputFile design and change associated translations	2018-03-05 11:09:32 +01:00
Aurelsicoko	d7aa3eef7e	Resolve conflicts	2018-03-02 14:21:51 +01:00
Joseph Wang	a9ba025b24	add some chinese translation fix	2018-03-02 18:43:03 +08:00
Jim LAURIE	0988841ee0	Merge branch 'master' into improve-reactintl	2018-03-01 15:24:38 +01:00
Jim LAURIE	520373d047	Merge branch 'master' into upload-config-front	2018-03-01 15:06:10 +01:00
cyril lopez	b7d2af3ba2	Take en default translation message if there are not present in the current locale ... This fix aims to improve and facilitate the upcoming new language pull requests. It also remove the missing id error message in the console when developing on port 4000	2018-03-01 13:12:22 +01:00
Jim LAURIE	9852794ee4	Merge branch 'master' into Chinese-Translation	2018-03-01 13:03:18 +01:00
Jim LAURIE	d67d09ef90	Merge branch 'master' into alpha.10.3	2018-03-01 11:37:05 +01:00
Joseph Wang	f35b2519ba	language hot fix	2018-03-01 16:30:44 +08:00
Aurelsicoko	85fb0f5919	Fix non-polymorphic relations in strapi-bookshelf	2018-02-28 18:10:30 +01:00
cyril lopez	696cf002d5	Display dynamic form for upload providers	2018-02-28 16:20:23 +01:00
Joseph Wang	036b904472	Add Tranditional Chinese Translation	2018-02-28 22:59:20 +08:00
cyril lopez	439e9723b6	Fix conflict	2018-02-28 15:06:55 +01:00
cyril lopez	9c1b1e661c	Created shared HeaderNav component ... Init design upload ConfigPage Add shared translations for buttons	2018-02-28 11:38:50 +01:00
cyril lopez	03ee9f10fb	Add configurations to list-plugins page	2018-02-28 10:50:07 +01:00
cyril lopez	4c6343bed6	Get app env from the context	2018-02-27 18:43:33 +01:00
cyril lopez	da7382292c	Add redux to admin page so we can get the app environments required for the upload config settings	2018-02-27 17:45:12 +01:00
cyril lopez	fb762e7068	Design InputFileDetails	2018-02-27 14:31:41 +01:00
cyril lopez	6d7eb115bc	Improve Inputfile files slider dynamic	2018-02-27 13:50:20 +01:00
Abdón Rodríguez Davila	cc20511838	Avoid username capitalize	2018-02-27 10:00:59 +01:00
Jim LAURIE	f0706d474c	Merge branch 'master' into alpha.10.3	2018-02-26 18:15:49 +01:00
Jim Laurie	99559e20ea	3.0.0-alpha.10.3	2018-02-26 17:57:23 +01:00
Jim Laurie	03696df06a	Add t-shirt icon in marketplace	2018-02-24 16:22:59 +01:00
Jim LAURIE	ae9880a374	Merge branch 'master' into file-upload-s3	2018-02-23 15:16:04 +01:00