yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,144 Commits 4 Branches 7 Tags
13aa615745d50ff40714e53b5707ba57352503bc
Commit Graph

2969 Commits

Author SHA1 Message Date
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
Stephan
44b90bd4f3 Merge branch 'dev-v7.6' into temp-u4-7318 2016-12-05 17:08:19 +01:00
Jeavon
3e558af18f Merge branch 'dev-v7' into temp-u4-7318 2016-12-05 12:21:02 +00:00
Enkel Media
f62a9ed199 Fixed simple typo for modelsbuilder 2016-11-30 11:17:21 +01:00
Stephan
a77763ee89 Merge origin/dev-v7 into dev-v7.6 2016-11-23 11:03:52 +01:00
Shannon
0e57d558f6 updates cdf version 2016-11-18 14:34:31 +01:00
Stephan
35aac2cdec Merge origin/dev-v7 into dev-v7.6 2016-11-18 09:52:45 +01:00
Mark320
9de3acfae2 U4-9192 Add jQuery migrate for user controls used in tabs that will improve backwards compatibility 2016-11-17 14:24:46 +00:00
Sebastiaan Janssen
0a883ae109 Make sure Umbraco runs in Visual Studio 2017 2016-11-16 18:55:12 +01:00
Warren Buckley
02bfe3ad72 Merge pull request #1603 from rjabreu/U4-9036 
added finish button so page only reloads after user input. also added…
 2016-11-16 16:14:53 +00:00
Stephan
ddf29c5875 Merge dev-v7.6 into dev-v7-deploy 2016-11-15 13:59:19 +01:00
Sebastiaan Janssen
26a04ca7e9 Merge pull request #1610 from umbraco/temp-U4-9134 
U4-9134 XSS security issue in the grid
 2016-11-15 12:56:21 +01:00
Claus
6f39439e3d removing string.empty checks for attributes. 
removing the redundant clean for outputting model.value in TextString.cshtml.
 2016-11-15 12:10:36 +01:00
Stephan
2b9ffdb6b9 Merge branch origin/dev-v7 into dev-v7-deploy 2016-11-14 18:53:53 +01:00
Sebastiaan Janssen
5b714572e3 Bump version 2016-11-14 17:04:55 +01:00
Ali Sheikh Taheri
19b24b5109 Added maximum number of backups to keep. 2016-11-14 11:56:21 +00:00
Ali Sheikh Taheri
3aaa33ebe9 added .log file extension for backup logs. 2016-11-14 11:55:09 +00:00
Ali Sheikh Taheri
4ae7a32e29 Fix for maximum file size. 2016-11-14 11:54:42 +00:00
Alexander Bryukhov
87814fa43c Update UI lang file for ru-ru 
All latest 7.5.5 changes
 2016-11-12 12:12:41 +07:00
Claus
7018969d14 removing unused language keys. 2016-11-09 09:29:43 +01:00