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

2932 Commits

Author SHA1 Message Date
Shannon
547351a719 Merge remote-tracking branch 'refs/remotes/origin/dev-v7.6' into temp-U4-9310 2017-01-28 00:25:25 +11:00
Shannon
371c4ae1a3 Starts creating new UDI picker property editors 2017-01-28 00:22:12 +11:00
Mads Rasmussen
ab00ba8a12 Merge branch 'dev-v7.6' into temp-U4-9352 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/templates/edit.controller.js
 2017-01-27 10:39:31 +01:00
Mads Rasmussen
b334e0ccb2 Fixes: U4-9440 Update the last few Danish translations for template editor 2017-01-26 19:45:05 +01:00
Sebastiaan Janssen
0a2e5badd0 Merge branch 'temp-template-editor' into dev-v7.6 2017-01-26 18:27:10 +01:00
Sebastiaan Janssen
90b0bf9d82 Merge branch 'dev-v7.6' into temp-template-editor 2017-01-26 18:26:32 +01:00
Sebastiaan Janssen
6bcd1e44f9 If translation is not done yet, better to leave it English so at least it kind of makes sense 2017-01-26 18:24:56 +01:00
Warren Buckley
c1fcb37642 Adds keys for DA file but appends them with DA to try & make it clear they need some translation love as my Danish is to be desired :) 2017-01-23 16:08:38 +00:00
Warren Buckley
0bba68a7f5 Added keys needed in EN lang files 2017-01-23 16:06:37 +00:00
Per Ploug
eefd13547c More localization of querybuilder 2017-01-19 12:53:39 +01:00
Claus
29d86b8675 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.6 2017-01-19 12:08:23 +01:00
Sebastiaan Janssen
fc3b08e374 Merge pull request #1626 from Mark320/U4-9192 
U4-9192 Add jQuery migrate for user controls used in tabs
 2017-01-19 11:35:44 +01:00
Mads Rasmussen
86ffd66c8a update danish translations 2017-01-19 09:50:18 +01:00
Niels Hartvig
051af5c48e Wire up the editors and controllers 2017-01-19 09:49:27 +01:00
Sebastiaan Janssen
54e460cf5b U4-9392 Upgrade ImageProcessor with cache header and high CPU fix 
U4-9393 Upgrade to Examine 0.1.80
 2017-01-18 11:47:23 +01:00
Mads Rasmussen
01f50a243b translate master template and no macros 2017-01-17 14:13:20 +01:00
Shannon
44732e5f52 Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into dev-v7.6 
# Conflicts:
#	build/UmbracoVersion.txt
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Core/DatabaseContext.cs
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
 2017-01-17 18:21:45 +11:00
Claus
e0d281bb4b Merge pull request #1616 from abryukhov/patch-6 
Update UI lang file for ru-ru
 2017-01-16 11:26:23 +01:00
Sebastiaan Janssen
b7d37af933 Bumps version 2017-01-16 11:04:28 +01:00
Per Ploug
7a0ac625ff Last remaining dk translation strings 
This needs a review by the dynamic writing duo vera and martin.
 2017-01-16 10:13:32 +01:00
Claus
2f3d926c08 Merge pull request #1638 from enkelmedia/dev-v7 
Fixed english typo for modelsbuilder
 2017-01-16 08:11:45 +01:00
Per Ploug
99f66fe6a3 The danish language files - WIP 
The danish language has such elements when used to discusssed
semi-technical-english terms
 2017-01-13 13:21:37 +01:00
Per Ploug
b413a6eeae English translations 2017-01-13 13:20:49 +01:00
Warren Buckley
5041a459d4 Merge pull request #1681 from umbraco/temp-template-editor 
Temp template editor
 2017-01-12 15:56:08 +00:00
Per Ploug
32abebd0a0 Main template editor translated 2017-01-12 11:33:31 +01:00
Shannon
cfd8d39878 Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into dev-v7.6 
# Conflicts:
#	build/NuSpecs/UmbracoCms.nuspec
#	src/Umbraco.Tests/Umbraco.Tests.csproj
 2017-01-12 13:39:15 +11:00
Shannon
055ae0d126 updates latest IP mem leak fixes 2017-01-10 11:36:35 +11:00
Stephan
5e6f1a92ca Merge branch origin/dev-v7 into dev-v7.6 2017-01-09 15:31:41 +01:00
Sebastiaan Janssen
770f96b6d5 Merge branch 'dev-v7' into dev-v7.6 
# Conflicts:
#	build/NuSpecs/UmbracoCms.Core.nuspec
 2017-01-05 09:47:51 +01:00
Shannon
1df65bc3ce Updates to latest ImageProcessor.Web to fix mime types when stored outside web root 2017-01-05 16:00:45 +11:00
Sebastiaan Janssen
dc62272e6e Revert "Add Microsoft.IO.RecyclableMemoryStream to the nuspec, update to the latest version (1.2.1)" 
Keep the version the same as what ImageProcessor relies on to avoid confusion and conflicts

This reverts commit 56d2230251.

# Conflicts:
#	build/NuSpecs/UmbracoCms.Core.nuspec
 2017-01-03 17:04:38 +01:00
Sebastiaan Janssen
ccb8ac4cfc Merge branch 'dev-v7' into U-9333 
# Conflicts:
#	src/Umbraco.Web.UI/packages.config
 2017-01-03 14:19:43 +01:00
Claus
d866f1d74a Merge branch 'dev-v7' into dev-v7.6 2017-01-03 11:58:23 +01:00
Sebastiaan Janssen
d04510f5f2 Merge pull request #1661 from umbraco/temp-U4-9319 
U4-9319 Update to latest ImageProcessor v2.5.0 and ImageProcessor.Web…
 2017-01-03 10:21:26 +01:00
Sebastiaan Janssen
56d2230251 Add Microsoft.IO.RecyclableMemoryStream to the nuspec, update to the latest version (1.2.1) 2017-01-03 09:25:10 +01:00
Shannon
b9c90af8be U4-9329 ExamineIndex.config should not ship with the {machinename} token for Examine 
Removes Sync from being the default for developers locally (that shouldnt have been committed), actually removes the machinename token from release
 2017-01-03 17:37:15 +11:00
Shannon
d412d90b17 fixing more IP assembly/nuget refs 2017-01-03 11:14:34 +11:00
Shannon
2f74181262 fixing more IP assembly/nuget refs 2017-01-03 11:06:15 +11:00
Shannon
4e2fb8e5dc Fixes IP nuget references and fixes up several other Nuget assembly references. 2017-01-03 10:36:26 +11:00
Niels Hartvig
afbceca184 Makes EXIF data in resized images default 2017-01-02 17:29:37 +01:00
Shannon
903ce09426 Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into dev-v7.6 
# Conflicts:
#	build/UmbracoVersion.txt
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
 2016-12-29 13:57:55 +11:00
Shannon
b4ca04596c U4-9319 Update to latest ImageProcessor v2.5.0 and ImageProcessor.Web v4.7.0 2016-12-28 19:21:00 +11:00
Shannon
39505cd868 U4-9262 CleanForXss breaks rgba() values set as grid background color style 2016-12-20 13:27:53 +11:00
Shannon
0daaa3e785 Revert "Merge pull request #1618 from AliSheikhTaheri/U4-9180" 
This reverts commit 4050a375bc, reversing
changes made to a058f26462.
 2016-12-20 12:28:45 +11:00
Shannon Deminick
4050a375bc Merge pull request #1618 from AliSheikhTaheri/U4-9180 
U4-9180 Optimise Log4net
 2016-12-20 11:08:11 +11:00
Shannon
c8f0f05570 U4-9246 Should ship with numRecompilesBeforeAppRestart="50" to avoid max recompilations reached errors 2016-12-19 17:10:29 +11:00
Shannon
5c40a1f9e9 bumps version 2016-12-19 16:42:05 +11:00
Stephan
cb09681cb0 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.6 2016-12-13 10:36:33 +01:00
Warren Buckley
4b39f490f3 Merge pull request #1602 from cheeseytoastie/U4-9148_-_Splash_screen_apostophe_typo 
U4-9148 noNodes Splash screen apostrophe char typo fixed (in "Be a pa…
 2016-12-09 13:32:53 +00:00
Enkel Media
f62a9ed199 Fixed simple typo for modelsbuilder 2016-11-30 11:17:21 +01:00