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

12640 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Per Ploug
0f01925c4a Fixed less file casing and paths 2015-05-21 07:50:02 +02:00
Per Ploug
1bfe7840a9 Added composite types to the ct mapper 2015-05-20 20:56:51 +02:00
Mads Rasmussen
58c93c899a Added sorting functionality 2015-05-20 14:58:17 +02:00
Mads Rasmussen
6e4f6a7bae Html and styles for toolbar 2015-05-20 10:23:37 +02:00
Mads Rasmussen
2b2ed00298 New tab and placeholder styling 2015-05-20 09:31:40 +02:00
Mads Rasmussen
f7e079f0d8 get configured data types, custom editors and systems data types in dialog. Make it possible to select one. 2015-05-19 13:47:48 +02:00
Mads Rasmussen
57127460f9 Added getAllUsersConfigured and getAllUserPropertyEditors as resource 2015-05-19 13:46:38 +02:00
Mads Rasmussen
f1dfa28228 Add the last changes from the old branche 2015-05-19 12:31:59 +02:00
Per Ploug
b43f0a0986 Fixed up a couple of mapping errors 2015-05-19 11:57:49 +02:00
Shannon
b9120698ba Adds more mapping logic for content type mappers, creates unit tests for them, adds some missing required properties that will be needed for editing, adds lots of notes. 2015-05-19 11:17:23 +10:00
Shannon
71c24b7bf3 reverts proj change 2015-05-19 09:01:54 +10:00
Per Ploug
6c218c3ab5 datatype controller methods for ct editor 2015-05-18 20:08:00 +02:00
Per Ploug
0e6b663eed Models for content type display 2015-05-18 20:07:20 +02:00
Per Ploug
65f2b43185 Latest files from mads 2015-05-14 07:39:18 +02:00
Per Ploug
ef069e0aa1 Content Type Editor work merged in 2015-05-13 17:12:28 +02:00
Per Ploug
ded1ac41e3 Change of web.mvc version hintpath 2015-05-13 16:51:00 +02: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
Shannon
9f82ae1db7 unspec to mvc 4.0.0.1 2015-05-11 10:52:38 +10:00
Shannon Deminick
2c92cd9ca9 Merge pull request #683 from umbraco/U4-6603 
U4-6603 Log failed login attempts
 2015-05-11 09:07:24 +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
Shannon Deminick
2a9d3df822 Merge pull request #682 from hfloyd/dev-v7 
English Language file updates (Umbraco/config/lang)
 2015-05-08 08:48:38 +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
Shannon
a69c7dd1fc Manually merges PR: 564 2015-05-07 13:09:29 +10:00
Shannon
4e6a3458d0 Fixes: U4-6600 Label on files not just folders in file browser (media) and fixes up the last image rendered in the photo browser, as well as the overlays, whitespace and overflow and vertical alignment. 2015-05-07 12:57:23 +10:00
Shannon
a5bb8ba8ee Merge branch 'iamphill-media-label' into dev-v7 2015-05-07 12:01:44 +10:00
Shannon
d4f3dbcfc0 Merge branch 'media-label' of https://github.com/iamphill/Umbraco-CMS into iamphill-media-label 2015-05-07 12:01:31 +10:00
Shannon
6a0656fbb0 fixes spacing for radio/check boxes (U4-6036) tested in ie, ff and chrome 2015-05-07 11:59:10 +10:00
Shannon Deminick
9dc0999ebd Merge pull request #595 from redmorello/U4-6036 
U4 6036 - Checkbox and Radio button styling incorrect in backend
 2015-05-07 11:49:30 +10:00