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

1035 Commits

Author SHA1 Message Date
Shannon
dadcbc8b31 U4-9107 Change BulkInsertRecords to use BulkCopy or TableDirect (SQLCE) 2016-10-25 12:29:17 +02:00
Stephan
07bb57fac8 U4-9018 - provide a way to disable server master election 2016-10-25 12:22:06 +02:00
Stephan
95af144ae9 Migrate locks to their own umbracoLocks table 2016-10-25 10:38:05 +02:00
Stephan
e8538cc035 Merge remote-tracking branch 'origin/dev-v7' into dev-v7-deploy 2016-10-20 12:23:22 +02:00
Sebastiaan Janssen
7b5670f275 U4-9076 Update to latest ImageProcessor 2016-10-18 16:45:16 +02:00
Stephan
e477c8b0b3 Merge branch origin/dev-v7 into dev-v7-deploy 2016-09-29 09:03:56 +02:00
Stephan
111a3ca6ac Refactor Shadow FileSystems 2016-09-22 21:45:59 +02:00
Stephan
3ab01a2164 Implement shadow filesystems, IFileSystem2.GetSize 2016-09-21 12:40:29 +02:00
Claus
d725f1362f U4-8984 Upgrade AutoMapper to latest 3.x 2016-09-16 21:23:31 +02:00
Claus
e79427619b Revert "U4-8984 Upgrade AutoMapper to latest 3.x" 
This reverts commit 4887302b51.
 2016-09-16 21:22:35 +02:00
Claus
4887302b51 U4-8984 Upgrade AutoMapper to latest 3.x 2016-09-16 21:21:14 +02:00
Stephan
597b9bbfcb Introduce SafeCallContext to fix breaking test 
(wondering if using logical call context a breaking change)
 2016-09-13 08:01:45 +02:00
Claus
b67855b7a3 xslt file repository and methods for getting xslt files in FileService. 2016-09-09 13:33:14 +02:00
Stephan
acae05d287 Merge branch origin/dev-v7 into dev-v7-deploy 2016-08-18 12:38:38 +02:00
Jeavon
9ed9aef1d3 Merge branch 'dev-v7' into temp-u4-7318 
# Conflicts:
#	src/Umbraco.Web/Umbraco.Web.csproj
 2016-08-17 10:16:05 +01:00
Sebastiaan Janssen
c1a8ea9df3 Merge pull request #1433 from umbraco/temp-U4-8850 
U4-8850 Configuring a custom BackOfficeUserManager type will not work if the type is not specifically BackOfficeUserManager
 2016-08-16 13:09:50 +02:00
Sebastiaan Janssen
808793edd8 Updating to latest ImageProcessor 2016-08-16 09:35:05 +02:00
Shannon
2ff3ce933b U4-8850 Configuring a custom BackOfficeUserManager type will not work if the type is not specifically BackOfficeUserManager 2016-08-12 12:20:00 +02:00
Sebastiaan Janssen
dd62a917fd Merge pull request #1411 from umbraco/temp-U4-8808 
U4-8808 Fixing up 301 redirects
 2016-08-05 13:06:18 +02:00
Sebastiaan Janssen
177b61bbf5 Merge pull request #1292 from darrenferguson/dev-v7 
Fix U4-8532 - No built in Active Directory authentication in Umbraco
 2016-08-04 16:25:22 +02:00
Claus
66c0d9dc12 removing migrations from solution 2016-08-04 15:45:58 +02:00
Shannon
3ebb3dc544 U4-7813 Enable MiniProfiler to profiler during startup 2016-08-01 12:04:02 +02:00
Sebastiaan Janssen
c206965f88 U4-8777 ImageProcessor fails to generate thumbnail for animated gif 
#U4-8777 Fixed

Updates to the latest ImageProcessor to ship in the zip release
 2016-07-26 12:09:05 +02:00
Shannon
1eef30710d U4-8522 cmsPropertyData needs unique constraint indexes and index refactoring 2016-07-12 17:34:11 +02:00
Shannon
856de5b9f3 Ensures Stylesheet tables are not re-added on install, and re-removes them for upgrades. 2016-07-11 15:32:22 +02:00
Stephan
6f6c7ede0a U4-8361 - fixing migrations 2016-07-07 16:56:52 +02:00
Stephan
560c0fbb33 U4-8361 - fixing and perfs 2016-07-06 21:53:08 +02:00
Stephan
3d2a0b4a29 U4-8361 - from ids to guids 2016-07-04 18:22:06 +02:00
Claus
4423f965d1 Merge pull request #1359 from umbraco/temp-U4-8592b 
U4-8592 - fix property conversions
 2016-06-28 11:13:22 +02:00
Stephan
db79690501 U4-8592 - fix decimal scaling factor issue 2016-06-28 10:09:11 +02:00
Shannon
eec0e4f946 Merge branch 'U4-8588' of https://github.com/JimBobSquarePants/Umbraco-CMS into dev-v7 
# Conflicts:
#	build/NuSpecs/UmbracoCms.Core.nuspec
#	src/Umbraco.Core/Umbraco.Core.csproj
#	src/Umbraco.Web.UI/packages.config
 2016-06-27 14:20:13 +02:00
Shannon
9463db7431 This ensures we are using the latest code from Log4Net.Async for these libs. there are very little changes and none breaking but it is now up-to-date and we will use the nuget package in v8 instead. 2016-06-22 11:48:52 +02:00
James Jackson-South
c9c1aea8ab Update ImageProcessor, clean up log message 2016-06-14 04:54:26 +10:00
Jeavon Leopold
36aa166a95 Converters and models to support existing GetPropertyValue<int> and GetPropertyValue<string> code 2016-06-13 16:16:12 +02:00
James Jackson-South
33cbcbb7d4 Save projects. 2016-06-13 22:47:49 +10:00
Stephan
79bbd6a70c U4-8361 - implement repository 2016-06-12 15:27:54 +02:00
Stephan
a7759c6175 U4-8361 - renaming 2016-06-12 13:07:00 +02:00
Stephan
36fbb9df86 U4-8361 - initial work 2016-06-12 12:38:35 +02:00
Darren Ferguson
b168923d5f http://issues.umbraco.org/issue/U4-7032 : Include a password checker for Active Directory - as ability to authenticate via AD was removed in 7.3 2016-05-29 15:46:42 +01:00
Stephan
0a4a230c07 Merge branch 'u4-8290' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-u4-8290 2016-05-24 08:15:47 +02:00
Sebastiaan Janssen
e54d374eb2 Add cmsPreviewXml table if it doesn't yet exist 2016-05-20 15:54:39 +02:00
Stephan
271f4e7a4a U4-8413 - fix missing ServersLock object 2016-05-10 12:29:13 +02:00
AndyButland
7858521c8b Converted usage of property editor value type strings to constants 2016-05-08 22:05:23 +02:00
Stephan
01990394dd Merge dev-v7 into dev-v7-deploy 2016-04-26 10:10:45 +02:00
Stephan
378e8f5cd9 deploy-30 - fixes 2016-04-15 13:25:11 +02:00
Shannon
1361e017a2 Merge branch 'u4-222' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-u4-222 
Conflicts:
	src/Umbraco.Core/Security/BackOfficeUserManager.cs
	src/Umbraco.Web.UI.Client/src/less/pages/login.less
	src/Umbraco.Web.UI.Client/src/routes.js
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.controller.js
	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
	src/Umbraco.Web.UI/web.Template.config
	src/Umbraco.Web/Editors/AuthenticationController.cs
	src/Umbraco.Web/Editors/BackOfficeController.cs
	src/Umbraco.Web/Umbraco.Web.csproj
 2016-04-12 18:07:25 +02:00
Stephan
4e9578bed4 Merge release-7.4.2 into dev-v7-deploy 2016-03-30 09:30:27 +02:00
Sebastiaan Janssen
7debe17c58 Merge remote-tracking branch 'origin/7.3.8' into dev-v7 
Conflicts:
	src/Umbraco.Web.UI/packages.config
 2016-02-17 11:56:24 +01:00
Sebastiaan Janssen
3d6fd2d785 Updates to SQL CE 4.0.0.1 2016-02-17 11:44:33 +01:00
Shannon
b6ef4bf6b5 Merge branch '7.3.8' into dev-v7 
Conflicts:
	build/UmbracoVersion.txt
	src/SolutionInfo.cs
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
 2016-02-16 13:29:59 +01:00