408 Commits

Author	SHA1	Message	Date
soupette	86bc73e9d1	Fix conflict	2018-04-02 09:50:58 +02:00
Jim LAURIE	6e93e95d73	Merge branch 'master' into master	2018-03-31 15:11:59 +02:00
soupette	31b8e7cb34	Fixes #880	2018-03-30 20:27:37 +02:00
Inder Redni	1e914be7b7	polish language | update	2018-03-30 19:00:06 +02:00
soupette	0c8769138c	Fix conflict	2018-03-30 13:00:03 +02:00
Jim Laurie	8390106f59	3.0.0-alpha.11.2	2018-03-27 17:59:16 +02:00
cyril lopez	a4b517a193	Add info on wysiwyg in ctb	2018-03-23 15:47:00 +01:00
cyril lopez	fc995bb4a0	Fix ctb layout service	2018-03-22 13:36:36 +01:00
cyril lopez	7553172cf0	Fixes #828	2018-03-22 12:57:21 +01:00
cyril lopez	9354b7eeb1	Merge branch 'master' of github.com:strapi/strapi into wysiwyg	2018-03-20 16:13:27 +01:00
cyril lopez	c6b24f046b	Prevent the ctb from breaking if a user tries to edit an attribute that it cannot currently handle	2018-03-19 12:49:25 +01:00
cyril lopez	8207c2f45d	Merge branch 'wysiwyg' of github.com:strapi/strapi into wysiwyg	2018-03-15 11:32:22 +01:00
Jim Laurie	d77fb19592	Fix set attr name get model	2018-03-15 10:42:23 +01:00
cyril lopez	54e4531997	Fix ctb edit attribute	2018-03-15 00:41:34 +01:00
Jim Laurie	0a5b178ccc	Send appearance in model definition	2018-03-14 17:44:11 +01:00
Jim Laurie	e1b727ee09	Write appearance in layout.json file	2018-03-14 16:24:11 +01:00
cyril lopez	b010175ab1	Fix ctb appearance	2018-03-14 15:00:04 +01:00
cyril lopez	1d0ef6062e	Merge branch 'master' of github.com:strapi/strapi into wysiwyg	2018-03-13 10:16:36 +01:00
Jim Laurie	6cd0ec730e	3.0.0-alpha.11.1	2018-03-11 15:54:56 +01:00
cyril lopez	82b779aa6f	Fix conflict and start fixineg eslint on helper plugin	2018-03-09 16:41:24 +01:00
cyril lopez	1688e01be9	Display WYSIWYG in ctb	2018-03-09 12:10:58 +01:00
Jim Laurie	932bf6da23	3.0.0-alpha.11	2018-03-08 17:31:25 +01:00
cyril lopez	d04c1500b6	Merge branch 'master' of github.com:strapi/strapi into fix-ctb	2018-03-05 14:52:31 +01:00
Joseph Wang	a9ba025b24	add some chinese translation fix	2018-03-02 18:43:03 +08:00
Jim LAURIE	a1ab33660b	Merge branch 'master' into add-media-ctb	2018-03-01 14:45:14 +01:00
Jim LAURIE	9852794ee4	Merge branch 'master' into Chinese-Translation	2018-03-01 13:03:18 +01:00
Jim Laurie	bed6d144f9	Fix PR feedback ... More dynamic code Fix typo	2018-03-01 12:55:31 +01:00
Joseph Wang	f35b2519ba	language hot fix	2018-03-01 16:30:44 +08:00
cyril lopez	4d21ade9b5	Prevent from displaying the media field if the upload pliugin is not installed	2018-02-28 17:58:58 +01:00
Joseph Wang	036b904472	Add Tranditional Chinese Translation	2018-02-28 22:59:20 +08: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	7af7922f2b	Backend content type builder media type ... Co-authored-by: soupette <cyril.lpz@gmail.com>	2018-02-26 16:33:27 +01:00
Jim Laurie	d7279f4584	Merge branch 'master' of github.com:strapi/strapi into add-media-ctb	2018-02-26 11:22:46 +01:00
cyril lopez	b5192d9b61	Add media type to ctb ... Prevent error if enumeration type is displayed Add tab navigation to popup choose attr	2018-02-23 16:49:50 +01:00
Jim LAURIE	ae9880a374	Merge branch 'master' into file-upload-s3	2018-02-23 15:16:04 +01:00
Jim Laurie	543f21cdb1	Fix PR feedback	2018-02-23 14:57:58 +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
Jim LAURIE	3fb12f16ba	Merge branch 'master' into 3.0.0-alpha.10.2	2018-02-19 12:28:51 +01:00
Jim Laurie	0a5e80be93	3.0.0-alpha.10.2	2018-02-19 11:38:20 +01:00
cyril lopez	99ca8e7117	Merge branch 'master' into master	2018-02-16 13:39:38 +01:00
Freakspot	33826d8e91	Fixed even more spelling mistakes and made some strings prettier	2018-02-16 01:13:20 +01:00
Freakspot	f21f690645	Fixed a few spelling mistakes as well as enhanced some strings	2018-02-15 23:30:31 +01:00
Freakspot	095df2dffc	Translated most of all basic plugins and the admin into german	2018-02-15 16:26:19 +01:00
inder redni	1a38158e50	polish language | strapi-plugin-content-tyoe-builder	2018-02-15 15:03:03 +01:00
Jim Laurie	25d8217986	3.0.0-alpha.10.1	2018-02-14 11:03:00 +01:00
Jim Laurie	5bf1e51422	Fix conflicts	2018-02-12 13:25:43 +01:00
Jim LAURIE	a5ebf10787	Merge branch 'master' into master	2018-02-09 18:00:13 +01:00
Aurelsicoko	21893dc8e6	Optimize SVG icons	2018-02-09 17:22:18 +01:00