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

10254 Commits

Author SHA1 Message Date
Stephan
031f70f529 Merge branch 'dev-v7' into 7.3.0 
Conflicts:
	src/Umbraco.Core/ApplicationContext.cs
	src/Umbraco.Core/Logging/LogHelper.cs
	src/Umbraco.Web.UI.Client/src/less/login.less
	src/Umbraco.Web/Scheduling/BackgroundTaskRunner.cs
 2015-05-18 16:23:12 +02:00
Shannon
3b791c75f6 Fixes: U4-5020 Login view on mobile screen is too big 2015-05-18 20:09:03 +10:00
Sebastian Claesson Hoffback
adde7c2f50 Fixed login-view on mobile devices 
On smaller screens the login-view was too far to the right.

Related issue: http://issues.umbraco.org/issue/U4-5020
 2015-05-18 11:34:13 +02:00
Shannon
25f9fecc16 Completes: U4-1979 Some legacy business logic APIs do not wrap the new Service APIs - gets permissions wrapped too 2015-05-18 19:34:01 +10:00
Shannon
76a10fc776 Works on: U4-1979 Some legacy business logic APIs do not wrap the new Service APIs. Deprecates the ctor passing in a parent id for the data type (since it's always -1). Wraps legacy DataTypeDefinition to use the new services layer. 2015-05-18 16:06:22 +10:00
Shannon
1d0b5f3251 ensures courier has access to internals 2015-05-18 16:04:23 +10:00
Shannon
b01f8799ae oops! long time ago with the original 7.3 refactor of runtime caches, before we fixed deep cloning, the changes made just used normal http runtime cache, but with the deep cloning fixes these were not carried over. This fixes that by forcing the base RepositoryBase to use a DeepCloneRuntimeCacheProvider which is a wrapper for the normal runtime cache but ensures deep cloning in/out and resets dirty properties. 2015-05-18 16:03:25 +10:00
Shannon Deminick
62943d391f Merge pull request #692 from bjarnef/dev-v7-U4-6629 
Fix changes in user section labels
 2015-05-18 13:47:13 +10:00
Shannon
76fb595a55 Fixes: U4-6363 Expose Dictionary item access on UmbracoHelper 2015-05-18 13:38:14 +10:00
Shannon Deminick
0942eb839d Merge pull request #691 from Vrijdagonline/dev-v7 
Updating Dutch Translations
 2015-05-18 11:38:29 +10:00
bjarnef
21a4dfe33e Fix changes in user section labels 
Fixed translation in da.xml according to change in en.xml  from 7.2.4 to
7.2.5
 2015-05-17 22:16:39 +02:00
Stephan
8121fc42e5 U4-6626 - fix log level 2015-05-17 21:47:31 +02:00
Stephan
c356ed1df8 Logger - add AppDomain.Id to log 2015-05-17 18:48:26 +02:00
Stephan
92f56ccedd U4-6626 - XmlCache, bugfix locks 2015-05-17 18:48:25 +02:00
Stephan
7cbe2410e4 Do not flood the log when installing a new version 2015-05-17 18:48:21 +02:00
Arjan Woldring
1dda3ce45d Updating Dutch Translations 
Missing keys added, deleted keys deleted, reorderded some keys based on
the english one and corrected couple of wrong translations.
 2015-05-16 19:06:04 +02:00
Shannon Deminick
1e29a4a8ca Merge pull request #688 from sebastian-claesson/dev-v7 
Swedish was using the wrong format for variables
 2015-05-15 15:46:17 +10:00
Sebastian Claesson Hoffback
01de0bd6a1 Swedish was using the wrong format for variables 
The swedish translation was using {0} instead of %0%. Leading to alot of
texts being weirdly formated.
 2015-05-15 07:22:11 +02:00
Shannon
fbb46c9ffe Allows Courier core to see internals 2015-05-14 14:42:53 +10:00
Shannon
73c34fda9c Merge branch 'dev-v7' of https://github.com/michaeljfarr/Umbraco-CMS into michaeljfarr-dev-v7 
Conflicts:
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Core/packages.config
	src/Umbraco.Web/Umbraco.Web.csproj
 2015-05-14 08:38:51 +10:00
Shannon
b442fecca7 Merge remote-tracking branch 'origin/dev-v7' into 7.3.0 2015-05-14 08:33:25 +10:00
Shannon Deminick
4d0d29c004 Merge pull request #686 from Aaen/dev-v7 
Change translation for add row for fix issue U4-6564
 2015-05-14 07:57:12 +10:00
Sebastian Claesson Hoffback
2c809857af Swedish translation for the grid-editor 
Swedish translation was completly missing for the grid-editor
 2015-05-13 14:59:27 +02:00
Dennis Aaen
236d6ee302 Change translation for add row for fix issue U4-6564 2015-05-13 13:27:37 +02:00
Shannon
9e1d3220c2 Ensures all correct security columns exist on user table and ensures they are updated. 2015-05-13 18:19:23 +10:00
Shannon
de7294335f Adds nicer extensions for the Localize methods to not pass in a Culture and take the Culture from the current thread. Adds GUID Id display to the content/media/members editor 2015-05-13 17:33:59 +10:00
Shannon
416dcdf90f Updates NotFoundHandlerHelper to use IDomainService and fixes IDomainRepository with the Exists and GetByName methods (with tests) 2015-05-13 16:45:08 +10:00
Shannon
2cd5b252d5 fixes merge issues 2015-05-13 12:24:16 +10:00
Shannon
64cbeb4c9d Merge branch 'dev-v7' into 7.3.0 
Conflicts:
	src/Umbraco.Core/Services/EntityService.cs
	src/Umbraco.Core/Services/ServiceContext.cs
	src/Umbraco.Web/Cache/DataTypeCacheRefresher.cs
	src/Umbraco.Web/Cache/TemplateCacheRefresher.cs
	src/umbraco.cms/businesslogic/template/Template.cs
 2015-05-13 12:20:43 +10:00
Shannon
f829b0b16c Fixes text not overlayed on top of icon for folders in folder browser 2015-05-13 10:56:25 +10:00
Sebastiaan Janssen
a42526b890 This file just keeps being marked as "changed" by git, committing it so I don't have to discard changes all the time 2015-05-12 11:15:02 +02:00
Shannon
3a36513307 Fixes: U4-6609 SQL Exception when trying to delete a template that isn't assigned to any doc type 2015-05-12 17:59:06 +10:00
Shannon
0548a32405 adds some simple docs to umb settings 2015-05-12 17:32:26 +10:00
Shannon
433950dd59 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2015-05-12 12:39:57 +10:00
Shannon
ad8926668e Fixes: U4-6588 UmbracoSettings Error404 support Guids and Xpath - To achieve this, had to create an Id -> Key and Key -> Id method on EntityService including a cache for it which means updating all relavent cache refreshers to clear this cache when things are removed. Moved the logic for parsing an Umbraco XPath query (with tokens) to a stand-alone testable class (though haven't written tests), move the logic for looking up a not found page to the NotFoundHandlerHelper (instead of legacy 'library'). Fixes the $root query, since I don't think that ever worked. I've tested $root now for both MNTP and for the not found handler and it works. 2015-05-12 12:39:46 +10:00
Sebastiaan Janssen
4ebc0fe4cf U4-6383 Download all translation tasks as XML Error 
#U4-6383 Fixed Due in version 7.2.5
 2015-05-11 21:33:52 +02:00
Shannon
1b1455067e Fixes: U4-6606 maxInvalidPasswordAttempts work for the UsersMembershipProvider doesn't work any more 2015-05-11 19:44:59 +10:00
Shannon
795de94a5f Fixes: U4-6102 After renaming Grid row configurations all data is lost for renames. So now we have warnings for both deletes and renames. 2015-05-11 18:46:26 +10:00
Shannon
d6699ab3b3 Fixes: U4-6102 After renaming Grid row configurations all data is lost, also ensures that all events are unsubscribed on destroy 2015-05-11 16:18:35 +10:00
Shannon
d2deaf0375 Fixes MVC references and updates to 4.0.0.1 2015-05-11 12:43:45 +10:00
Shannon
95ff94c532 Merge branch 'dev-v7' into 7.3.0 
Conflicts:
	src/Umbraco.Core/packages.config
	src/Umbraco.Web.UI/packages.config
	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
	src/Umbraco.Web/Editors/AuthenticationController.cs
	src/Umbraco.Web/packages.config
 2015-05-11 12:26:53 +10:00
Shannon
d94b334375 Moves login logging to the provider level 2015-05-11 12:22:56 +10:00
Shannon
a4a49b1466 Revert "Fixes MVC 4.0.0.1 problem once and for all." - All MVC ref's are 4.0.0.0, no web config transforms (also there was never a 4.0.0.1 version of System.Net.Http). Everything works on my machine now, even with 4.0.0.1 installed in the GAC. 2015-05-11 11:45:13 +10:00
Sebastiaan Janssen
c34605937c U4-6603 Log failed login attempts 
#U4-6603 Fixed
 2015-05-10 17:47:32 +02:00
Shannon
11b5123bbb fixes datatokens dictionary check and ensures that webapi is initialized at the very end of the boot cycle. 2015-05-08 19:13:58 +10:00
Heather Floyd
3b849987bf Small fixes to 'en' language file. Update of 'en-us' language file to match 'en' language file. 2015-05-07 16:41:12 -04:00
Shannon
d0dc5406cc fixes package merging 2015-05-07 16:39:00 +10:00
Shannon
3be1cd8b0d Merge branch 'dev-v7' into 7.3.0 
Conflicts:
	build/UmbracoVersion.txt
	src/SolutionInfo.cs
	src/Umbraco.Core/packages.config
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/user.controller.js
	src/Umbraco.Web.UI/packages.config
	src/Umbraco.Web/packages.config
 2015-05-07 16:24:29 +10:00
Shannon
8443513b2b fixes sorting with multipletextbox 2015-05-07 13:39:28 +10:00
Shannon
fec9d066f0 Merge branch 'property-editor-fixes' of https://github.com/pynej/Umbraco-CMS into pynej-property-editor-fixes 
Conflicts:
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/markdowneditor/markdowneditor.controller.js
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html
	src/Umbraco.Web/PropertyEditors/ContentPickerPropertyEditor.cs
 2015-05-07 13:24:59 +10:00