16155 Commits

Author	SHA1	Message	Date
Claus	ca752f74bc	updating array length.	2017-07-04 17:29:32 +02:00
Claus	b840a0992c	adding shadow filesystems.	2017-07-04 14:47:29 +02:00
Claus	51997d0651	U4-10098 Update FileService to support legacy MacroScript and UserControl folders	2017-07-04 14:28:15 +02:00
Shannon Deminick	9482104ec5	Merge pull request #2028 from umbraco/temp-U4-4905 ... Removed "remove paragraph tags" field	2017-07-04 12:33:25 +10:00
Robert	7053c175f8	Removed "remove paragraph tags" field	2017-07-03 13:44:37 +02:00
Claus	b2116480fc	fix formatting.	2017-07-03 11:17:05 +02:00
Claus	caef6cc623	Merge pull request #2026 from wanddy/dev-v7 ... Improve Chinese translation	2017-07-03 08:32:47 +02:00
Claus	44cfe5da84	missing nullcheck.	2017-06-30 10:46:44 +02:00
Claus	d5fd266b19	missing semicolon.	2017-06-30 10:34:58 +02:00
wanddy	5768992ccc	Improve Chinese translation to match the newest version based on en.xml file. ... Signed-off-by: wanddy <wanddy@163.com>	2017-06-30 12:10:59 +08:00
Mads Rasmussen	81aae79b42	Merge pull request #2015 from umbraco/temp-U4-9839 ... U4-9839 Media Picker: If I only upload one photo then select it as a …	2017-06-29 14:54:49 +02:00
Claus	9edbb3fc26	Merge pull request #1634 from soreng/patch-2 ... use already defined variable, instead of mapping the path twice	2017-06-29 14:47:21 +02:00
Claus	7fdd2bcdfc	Merge pull request #2018 from AndyButland/u4-4090 ... Fixes U4-4090 - by preserved line breaks in property descriptions...	2017-06-29 14:43:13 +02:00
Claus	ba90fdeb56	Merge pull request #1778 from bjarnef/dev-v7-U4-9585 ... Allow leading whitespace in textstring prevalue editor	2017-06-29 14:40:10 +02:00
Claus	d6bae1b58f	Merge pull request #1958 from poornimanayar/U4-9661 ... U4-9661 Remove "move" button in member section	2017-06-29 14:37:00 +02:00
Claus	ef53db52f7	Merge pull request #1850 from pijemcolu/temp-U4-9710 ... U4-9710 ImageCropDataSet.HasImage returns wrong value	2017-06-29 14:07:59 +02:00
Claus	863b97039c	Merge pull request #1632 from bjarnef/dev-v7-U4-9181 ... U4-9181 - Fix sorting of grid editor config	2017-06-29 13:55:12 +02:00
Claus	1a1adbf647	Merge pull request #2024 from greystate/drobar-partialviews ... Updates to partialviews	2017-06-29 13:47:54 +02:00
Claus	5dec54badb	U4-8988 Adding translations for Chinese (Taiwan)	2017-06-29 13:27:31 +02:00
Claus	f0f25c67c6	refactoring method signatures to prevent breaking changes.	2017-06-29 10:00:16 +02:00
Claus	da8c0726b1	Merge branch 'U4-5454' of git://github.com/trt/Umbraco-CMS into temp-U4-5454	2017-06-29 08:59:45 +02:00
Claus	2fbb9721fa	updating language files.	2017-06-29 08:53:22 +02:00
Claus	de6ffd456c	Merge pull request #1972 from wanddy/dev-v7-chnfixnew ... Fix translation didn't work in some tree node	2017-06-29 08:47:37 +02:00
Claus	5b3ff58ad8	Merge pull request #1964 from esn303/patch-2 ... Update "Element hinzufügen" (Add grid element)	2017-06-29 08:14:08 +02:00
Claus	b993ce953b	Revert "Removing unused v6 images"	2017-06-28 14:48:41 +02:00
Claus	dde0f1aa36	Merge pull request #2008 from umbraco/temp-old-client-files-clean-up ... Removing unused v6 images	2017-06-28 13:07:19 +02:00
Stephan	3fd6754057	Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7	2017-06-28 12:46:46 +02:00
Stephan	8fbb459233	fix and annotate some tests	2017-06-28 12:46:40 +02:00
Shannon	cb6f934792	fixes cache bust value	2017-06-27 19:40:24 +10:00
Shannon Deminick	7adbecf9a1	Merge pull request #2019 from lars-erik/U4-6695-internalsvisibleto-unittesting-adapter ... U4-6695 Adds InternalsVisibleTo("Umbraco.UnitTesting.Adapter")	2017-06-27 10:06:36 +10:00
Claus	2fdf148610	localizing text https://github.com/umbraco/Umbraco-CMS/pull/1250	2017-06-26 15:41:17 +02:00
Claus	89895dd592	Merge branch 'patch-1' of git://github.com/rodyvansambeek/Umbraco-CMS into rodyvansambeek-patch-1 ... # Conflicts: # src/Umbraco.Web.UI/umbraco/config/lang/nl.xml	2017-06-26 15:32:47 +02:00
Lars-Erik Aabech	f9252372ea	Adds InternalsVisibleTo("Umbraco.UnitTesting.Adapter") for more imperative exposure to custom unit test adapters.	2017-06-26 12:39:57 +02:00
Claus	ee775a2fde	adding a few more tests.	2017-06-26 11:31:46 +02:00
Claus	22af206626	Merge branch 'temp-U4-9464' of git://github.com/benjaminketron/Umbraco-CMS into benjaminketron-temp-U4-9464	2017-06-26 11:23:24 +02:00
AndyButland	67e109c0e6	Preserved line breaks in property descriptions when rendering in content area	2017-06-23 11:40:43 +02:00
Sebastiaan Janssen	8a4d85771b	Merge pull request #2016 from mikecp/U4-10047 ... U4 10047	2017-06-23 11:14:49 +02:00
Sebastiaan Janssen	4688ac104e	Merge pull request #1494 from AndyButland/u4-8999 ... U4-8999 - health check, debug compilation mode is being reported in error when config missing	2017-06-23 08:31:29 +02:00
Michael Latouche	032dbe5bf5	Update fr.xml	2017-06-23 00:52:10 +02:00
Michael Latouche	a7695163b9	Update fr.xml	2017-06-23 00:21:33 +02:00
Michael Latouche	cb4569677e	Update fr.xml	2017-06-23 00:10:22 +02:00
Michael Latouche	4be704b968	Update fr.xml	2017-06-23 00:09:52 +02:00
Michael Latouche	b7a5cb046a	Update fr.xml	2017-06-22 23:56:33 +02:00
Claus	eb52dafb33	U4-9839 Media Picker: If I only upload one photo then select it as a part of the upload process	2017-06-22 13:01:29 +02:00
Sebastiaan Janssen	af382c171b	Merge pull request #2009 from umbraco/temp-U4-10034 ... U4-10034 Package install may not wait for app domain restart in all cases	2017-06-22 11:22:18 +02:00
Claus	54fdfdd639	adding grunt watch interval to prevent insane cpu load.	2017-06-22 11:05:42 +02:00
Stephan	0bd233815e	deploy-348 - add support for languages	2017-06-22 10:04:48 +02:00
Claus	3d65afabbf	Merge branch 'temp-U4-10043' into dev-v7	2017-06-21 14:27:34 +02:00
Claus	ef9bf155ef	typo.	2017-06-21 14:21:39 +02:00
Sebastiaan Janssen	e947f661a9	Merge pull request #2011 from akierczynska/patch-1 ... Updating pl.xml language version to cover en.xml	2017-06-21 14:20:19 +02:00