yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,929 Commits 4 Branches 7 Tags
a4f7c49f50392d3f30ee97edeb4b821bf9acb261
Commit Graph

2110 Commits

Author SHA1 Message Date
Shannon Deminick
dbb70a8646 Merge pull request #607 from gertdc/U4-6060 
Added dutch translations for the grid layout
 2015-01-02 15:49:50 +11:00
Shannon
201464cb44 Fixes: U4-5918 Update Underscore.js and also updates our usage of bower with the correct grunt-bower plugin, this massively simplifies bower usage and paves the way to start using bower for all JS components. 2015-01-02 14:25:11 +11:00
Shannon
2286c0899c reverts UseTempStorage sync from examine settings on dev branch. 2015-01-02 11:55:18 +11:00
gertdc
ae257d0f50 Added dutch translations for the grid layout 2014-12-30 10:18:54 +01:00
Shannon
db087a9e78 pretty much got 5966 working just need to do some more tests. 2014-12-17 17:08:12 +11:00
Shannon
d564866b07 Merge branch 'Aaen-7.2.0' into dev-v7 2014-12-16 14:34:13 +11:00
Shannon
99a45d26ae Merge branch '7.2.0' of https://github.com/Aaen/Umbraco-CMS into Aaen-7.2.0 2014-12-16 14:33:21 +11:00
Shannon Deminick
d9925e3453 Merge pull request #589 from teeto/patch-1 
Update es.xml
 2014-12-16 11:08:16 +11:00
Shannon
e1106a9d67 Merge branch '7.2.1-doctype-fixes' into 7.2.1 
Conflicts:
	src/Umbraco.Core/Models/PropertyGroupCollection.cs
	src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs
	src/Umbraco.Core/Services/ContentTypeService.cs
	src/Umbraco.Tests/PublishedContent/PublishedContentExtensionTests.cs
	src/Umbraco.Tests/Services/ContentTypeServiceTests.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControlNew.ascx.cs
 2014-12-16 09:47:53 +11:00
Sebastiaan Janssen
84752babc8 Moved both new sections to the bottom so it's easier for upgraders to merge them 2014-12-15 09:04:25 +01:00
Sebastiaan Janssen
a480d7bbe6 U4-5959 Getting YSOD when wanting to create partial view in a subfolder in the backoffie 
#U4-5959 Fixed Due in version 7.2.1
 2014-12-14 17:22:10 +01:00
teeto
45241788b3 Update es.xml 
I have updated the es.xml file adding the values for grid section and the values marked as version="7.2" which were not translated
 2014-12-11 18:16:35 +01:00
Shannon
e1a93e9b3f updates the cdf mvc version to match the one in the nuspec 2014-12-11 19:57:59 +11:00
Shannon
2203db548a updates port 2014-12-11 19:01:32 +11:00
Shannon
8f35c8fb57 Fixes: U4-5996 CDF reference issue 2014-12-11 17:55:53 +11:00
Shannon
49e5493d52 Merge branch '7.2.1' of https://github.com/umbraco/Umbraco-CMS into 7.2.1 2014-12-11 15:59:06 +11:00
Shannon
a700258d92 WIP - updates to latest examine which exposes some methods needed to get this syncing done. This will not build until i put that examine version on nuget (soon). Ensures all readers/writers uses the same deletion policy, ensure segments file is copied across on sync restore. Changes the config to use an enum instead of a boolean which will give us some more flexibility. 2014-12-11 15:58:54 +11:00
Sebastiaan Janssen
da2bc6764b Version also updates in the csproj 2014-12-10 12:59:08 +01:00
Stephan
c8f80453b9 U4-5929 - support IDN in hostnames 2014-12-09 09:34:58 +01:00
Shannon
f08320bd81 Fixes: U4-5976 When no Examine indexes exist they are rebuilt at startup, however the rebuilding happens too soon before any Examine event handlers are actually wired up. 
Updates examine version to facilitate this. Adds ability to tokenize the {machinename} in an examine index path.
 2014-12-09 19:07:14 +11:00
Dennis Aaen
3a919b67ea U4-5973 Fix casing of word XSLT when saving a XSLT file 2014-12-08 20:09:05 +01:00
arknu
77fd2c9444 Update translations for Grid 2014-12-08 18:36:51 +01:00
arknu
30042aae6d U4-5101: Localize Grid property editor 2014-12-08 17:46:32 +01:00
arknu
8bc9fb9242 U4-5101: Localize Image Cropper property editor 2014-12-08 17:41:03 +01:00
arknu
0b61546633 U4-5101: Localize Tags property editor 2014-12-08 17:41:01 +01:00
arknu
ca69e64846 U4-5101: Localize Related Link property editor 2014-12-08 17:37:47 +01:00
Shannon
0a7bbfb1ca Merge remote-tracking branch 'origin/6.2.5' into 7.2.1 
Conflicts:
	src/Umbraco.Core/Configuration/UmbracoSettings.cs
	src/Umbraco.Core/Sync/ServerEnvironmentHelper.cs
	src/Umbraco.Tests/Scheduling/BackgroundTaskRunnerTests.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web.UI/install/steps/defaultUser.ascx
	src/Umbraco.Web.UI/web.Template.Debug.config
	src/Umbraco.Web/Scheduling/BackgroundTaskRunner.cs
	src/Umbraco.Web/Scheduling/IBackgroundTask.cs
	src/Umbraco.Web/Scheduling/KeepAlive.cs
	src/Umbraco.Web/Scheduling/LogScrubber.cs
	src/Umbraco.Web/Scheduling/ScheduledPublishing.cs
	src/Umbraco.Web/Scheduling/ScheduledTasks.cs
	src/Umbraco.Web/Scheduling/Scheduler.cs
	src/Umbraco.Web/Scheduling/TaskEventArgs.cs
	src/Umbraco.Web/Umbraco.Web.csproj
 2014-12-08 17:16:16 +11:00
Shannon
4d8732d925 The only way i could get this project to build and run was to change the transform to explicitly target 4.0.0.1 for mvc and webapi, otherwise nothing works and horribly cryptic build errors. Added the tests for the BackgroundTaskRunner 2014-12-08 14:59:32 +11:00
Chriztian Steinmeier
cbcbc128ff Typo change "differnt" -> "different" 2014-12-04 23:40:28 +01:00
Sebastiaan Janssen
cae600ac2f Merge pull request #574 from readingdancer/Fix_for_U4-4125 
Fix for U4 4125 - Spanish Localization file updated.
 2014-12-03 17:12:23 +01:00
Chris Houston
5e4702a4ab Final changes (for now) for the Spanish localization file. 2014-12-03 16:04:26 +00:00
Sebastiaan Janssen
8442b2e8e7 Updates installer backgrounnd and nonodes page 2014-12-03 16:51:16 +01:00
Chris Houston
b8f3f93d83 Added more Spanish translations. 2014-12-03 14:24:13 +00:00
Sebastiaan Janssen
d54f35f5f7 Merge pull request #570 from readingdancer/Fix_for_U4-5911 
Fixed issue U4-5911 & part of U4-5101 - Allow descriptions on property editors to be localized
 2014-12-02 11:25:21 +01:00
Sebastiaan Janssen
6b92e47631 Unfortunately, we HAVE to point to MVC 4.0.0.0 else you get YSODs on machines with 4.0.0.1 in the GAC (and we can't point to 4.0.0.1 because 4.0.0.0 might be in the GAC and then it'll YSOD for THOSE people). BOOOO 2014-12-01 10:57:24 +01:00
Chris Houston
d0bafc6184 Removed "description" as Shaz pointed out this was not required. 
Fixed a couple of UK English spelling mistakes.
 2014-11-30 23:54:46 +00:00
Chris Houston
83d3882b9a - Added the GRID localization strings to the US English file. 
- Updated the umbControlGroup directive so that the Description files are now localized, for some reason only the label was being localized even though the text had been added to the UK English file?
 2014-11-30 01:27:26 +00:00
Sebastiaan Janssen
ef6a4139de Whoops, period should've been comma 2014-11-28 07:44:19 +01:00
Sebastiaan Janssen
98ceabaf7e Don't point web.config to MVC 4.0.0.1, it may not be installed (merge fail..) 2014-11-27 20:44:48 +01:00
Sebastiaan Janssen
adea6dd2f6 Final addition to disallowed upload files 2014-11-27 15:28:38 +01:00
Sebastiaan Janssen
cad0650223 #U4-5901 Fixed Due in version 7.2.0 
Remote Code Execution
 2014-11-27 14:29:49 +01:00
Sebastiaan Janssen
08432e8b23 U4-5895 follow up on U4-5889 2014-11-27 12:05:38 +01:00
Sebastiaan Janssen
caee5c6baf #U4-5889 Fixed Due in version 7.2.0 
Cross Site Scripting through umbraco uploader
 2014-11-26 14:42:24 +01:00
Sebastiaan Janssen
a1c223bc2b Revert to using MVC 4.0.0.0 OOB so that people who have only 4.0.0.0 in the GAC can actually install Umbraco. If 4.0.0.1 is in the GAC that version will be taken. 
Leaves the additional reference to System.Web.Http in web.config so that you don't get the System.Web.Http.ApiController when 4.0.0.1 is indeed in the GAC.
 2014-11-26 10:43:46 +01:00
Sebastiaan Janssen
3330c617b4 Merge branch '7.1.9' into 7.2.0 
Conflicts:
	src/SQLCE4Umbraco/SqlCEHelper.cs
 2014-11-25 17:04:47 +01:00
Sebastiaan Janssen
0df0b78b90 #U4-5453 Fixed 
Enabling IIS Compression gives ERR_CONTENT_DECODING_FAILED in backoffice
 2014-11-25 16:56:44 +01:00
per ploug
b876e34586 Merge branch '7.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.2.0 2014-11-25 14:41:50 +01:00
per ploug
935436203e Adds razor helper comments to all grid razor views 2014-11-25 14:41:43 +01:00
Shannon
fa0f15f5c4 fix merge 2014-11-25 10:05:10 +11:00
Shannon
6a15c2603d Merge branch '7.1.9' into 7.2.0 
Conflicts:
	src/Umbraco.Web.UI/umbraco/config/lang/da.xml
	src/Umbraco.Web.UI/umbraco/config/lang/de.xml
	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
	src/Umbraco.Web.UI/umbraco/config/lang/es.xml
	src/Umbraco.Web.UI/umbraco/config/lang/fr.xml
	src/Umbraco.Web.UI/umbraco/config/lang/he.xml
	src/Umbraco.Web.UI/umbraco/config/lang/it.xml
	src/Umbraco.Web.UI/umbraco/config/lang/ja.xml
	src/Umbraco.Web.UI/umbraco/config/lang/ko.xml
	src/Umbraco.Web.UI/umbraco/config/lang/nl.xml
	src/Umbraco.Web.UI/umbraco/config/lang/no.xml
	src/Umbraco.Web.UI/umbraco/config/lang/pl.xml
	src/Umbraco.Web.UI/umbraco/config/lang/pt.xml
	src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
	src/Umbraco.Web.UI/umbraco/config/lang/sv.xml
	src/Umbraco.Web.UI/umbraco/config/lang/zh.xml
	src/Umbraco.Web.UI/umbraco/create/nodeType.ascx
	src/Umbraco.Web/umbraco.presentation/umbraco/create/nodeType.ascx.cs
 2014-11-25 09:59:08 +11:00