yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,729 Commits 4 Branches 7 Tags
226f8f60caa15031765e92539b156790047b223b
Commit Graph

12729 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent Baaij
226f8f60ca As discussed in cg15 Grid workshop 
If you use more than one grid datatype in one doctype, the editors are shown the text 'Choose a layout for the page' more than once. By showing 'Choose a layout for this section', the text is in line with the documentation
 2015-06-15 10:10:05 +02:00
Shannon
a3d4ccc062 Merge remote-tracking branch 'origin/dev-v7' into 7.3.0 
Conflicts:
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.html
 2015-06-15 09:41:50 +02:00
Shannon Deminick
7ca323d8d3 Merge pull request #704 from bjarnef/dev-v7-loginview 
Add ng-cloak for login view
 2015-06-15 09:29:25 +02:00
hartvig
e639869bb1 Update index.html 2015-06-10 09:20:25 +02:00
hartvig
09552d282f Update canvasdesigner.controller.js 2015-06-10 09:19:44 +02:00
Sebastiaan Janssen
0695839717 Updates version 2015-06-09 19:39:45 +02:00
Sebastiaan Janssen
12dba80553 Removes zzaaa from version number 2015-06-09 14:38:01 +02:00
Sebastiaan Janssen
f1d26d0990 Bring web.config in line with the nuget one 2015-06-09 14:35:30 +02:00
Stephan
83d5eda63c Bugfix xdt upgrade to 7.3 2015-06-09 12:22:08 +02:00
Shannon
2f80d5466d Merge branch '7.3.0' of https://github.com/umbraco/Umbraco-CMS into 7.3.0 2015-06-09 12:17:53 +02:00
Shannon
e90766ad06 Ensures that during install that we don't enable the identity user manager or cookie auth since no db tables exist, fixes the IsUpgrading check to check for actual valid tables 2015-06-09 12:17:45 +02:00
Stephan
379c629e9c U4-6683 - TEMP workaround enabling upgrade to 7.3 2015-06-08 22:50:48 +02:00
bjarnef
3f0ea176e3 Add ng-cloak for login view 
Add ng-cloak for login view to prevent Angular from briefly displaying
raw (uncompiled) content ```{{ }}```.
 2015-06-08 01:42:51 +02:00
Shannon
49417cbce4 Fixes assembly references and assembly redirects 2015-06-06 22:35:24 +02:00
Shannon
6153c70ef6 Fixes: U4-6673 Xml data integrity dashboard 2015-06-05 17:27:18 +02:00
Stephan
dffe09af58 Merge remote-tracking branch 'origin/dev-v7' into 7.3.0 
Conflicts:
	src/Umbraco.Web/UmbracoModule.cs
 2015-06-04 18:32:54 +02:00
Stephan
07e9a3a4ea Refactor scheduled tasks & publishing cancellation 2015-06-04 14:00:02 +02:00
Shannon
e3973de880 Updates scheduled tasks to be async with cancellation token 2015-06-04 12:13:27 +02:00
Shannon
8e114f1e8f Scheduled publishing is executing request async with cancellation token 2015-06-04 11:49:58 +02:00
Shannon
b21289a32f Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2015-06-04 10:51:23 +02:00
Shannon
52cf5b5ec3 Changes header modification to PostReleaseRequestState 2015-06-04 10:51:15 +02:00
Shannon
3fbf90e56d Merge remote-tracking branch 'origin/dev-v7' into 7.3.0 
Conflicts:
	build/UmbracoVersion.txt
	src/SolutionInfo.cs
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
 2015-06-03 15:08:47 +02:00
Sebastiaan Janssen
f100d82e2c Bump version 2015-06-03 14:03:04 +02:00
Shannon
3890353ff5 fixes merge issue 2015-06-03 12:37:31 +02:00
Shannon
60ce993c09 Fixes change password dashboard to have autocomplete = off and to not show plain text passwords. 2015-06-03 12:20:20 +02:00
Shannon
c07021d2a0 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2015-06-02 22:41:06 +02:00
Shannon
744ee39904 Changes the IIS header removal to BeginRequest instead of PreSendRequestHeaders since that is not a recommended practice 2015-06-02 22:40:57 +02:00
Shannon Deminick
d669bf64c0 Merge pull request #698 from Nicholas-Westby/dev-v7 
Fixes U4-6665 (Localization Bug)
 2015-06-02 21:29:16 +02:00
Shannon
ff277cd99c Fixes: U4-6654 NullReferenceException downloading translation xml 2015-06-02 21:13:29 +02:00
Shannon Deminick
30cd303a13 Merge pull request #697 from wp-manaosoftware/dev-7-angularthrowexception 
U4-6621 - fix issue AngularJS throws exception that locationEvent was…
 2015-06-02 21:04:08 +02:00
Shannon
60ce987507 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2015-06-02 20:53:55 +02:00
Shannon
a231899052 Fixes: U4-6635 with label overlaying the folder icon when the folder icons are small. 2015-06-02 20:53:46 +02:00
Shannon Deminick
7ddcccb0c5 Merge pull request #685 from gavinfaux/U4-6618 
Back office insecure content warning loading Google Web Fonts when running over HTTPS
 2015-06-02 20:16:12 +02:00
Nicholas-Westby
db824d8daf Fixes U4-6665 (Localization Bug) 
Fix for localization not working some of the time: http://issues.umbraco.org/issue/U4-6665
 2015-05-29 21:02:07 -07:00
Warm
a1a30240f6 U4-6621 - fix issue AngularJS throws exception that locationEvent was not defined when leaved a page without saving 2015-05-29 10:40:48 +07:00
Stephan
f285af8a4e Merge remote-tracking branch 'origin/dev-v7' into 7.3.0 2015-05-26 13:19:43 +02:00
Shannon Deminick
7c4a189aa3 Merge pull request #696 from tomfulton/fix/u4-6655 
Fix U4-6655:  RTE Macro not rendering in backoffice when "macroAlias" is not first attribute
 2015-05-26 08:01:40 +10:00
Stephan
3b77c301c3 Warn if SkipIisCustomErrors is false 2015-05-23 23:16:15 +02:00
Tom Fulton
4ec66bc868 Fix U4-6655: RTE Macro not rendering in backoffice when "macroAlias" is not first attribute 
Loosens UMBRACO_MACRO regex parsing to fix, add tests
 2015-05-22 20:40:30 -06:00
Stephan
fa8fe8ec66 BackgroundTaskRunner - few fixes 2015-05-21 21:54:30 +02:00
Stephan
61718f9450 fix merge 2015-05-21 21:03:32 +02:00
Stephan
115ba8dcb8 Merge remote-tracking branch 'origin/dev-v7' into 7.3.0 
Conflicts:
	src/Umbraco.Tests/Scheduling/BackgroundTaskRunnerTests.cs
	src/Umbraco.Web/Scheduling/BackgroundTaskRunner.cs
	src/Umbraco.Web/Scheduling/BackgroundTaskRunnerAwaiter.cs
	src/Umbraco.Web/Umbraco.Web.csproj
 2015-05-21 20:49:18 +02:00
Stephan
a76ba9a0a7 BackgroundTaskRunner - more fixes 2015-05-21 19:37:22 +02:00
Stephan
b804ff6107 Explicit exception on cache reentry 2015-05-21 16:09:20 +02:00
Shannon
9b086c7fdd fixes merge issues 2015-05-21 17:14:25 +10:00
Shannon
b788a6c642 Merge remote-tracking branch 'origin/dev-v7' into 7.3.0 
Conflicts:
	src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlCacheFilePersister.cs
	src/Umbraco.Web/Scheduling/BackgroundTaskRunner.cs
	src/Umbraco.Web/Scheduling/BackgroundTaskRunnerAwaiter.cs
	src/Umbraco.Web/Scheduling/Scheduler.cs
	src/umbraco.cms/businesslogic/web/StyleSheet.cs
 2015-05-21 17:12:30 +10:00
Shannon
a94f7e6ec0 Fixes RepositoryBase.Get to not use a GetOrAdd with the IRuntimeCache and instead just use a linear lookup, set cache, return - this causes less confusion and also prevents any inner recursive key lookups within our cache which was causing YSODs. Added tests for the RepositoryBase's DeepCloneRuntimeCacheProvider (see code comment about what this does), updates other repo's to use the RuntimeCache property instead of accessing it via the RepositoryCache.RuntimeCache property. 2015-05-21 17:04:14 +10:00
Shannon
72046a6ab9 removes test - expected behavior 2015-05-21 16:36:09 +10:00
Shannon
ea2303c327 commits cache tests with recursive key lookup 2015-05-21 16:13:58 +10:00
Shannon
4c4117a052 Fixes BackgroundTaskRunner - moves the OnStopped call to where it should be. Un-ignores tests - these need to execute and cannot be ignored. They are not long running but if there are issues then they will timeout - DO NOT IGNORE. if the build server has issues with these then it's our logic that is at fault. 2015-05-21 13:05:58 +10:00