swcs/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,284 Commits 73 Branches 219 Tags
ddef2cc7ff079022fff7c526acd7f22168537821
Commit Graph

4255 Commits

Author SHA1 Message Date
Shannon ddef2cc7ff Got validation working properly with pre-values, updated the content editing helper to be more generic and work with different editors like the data type editor that supports umb-property. 2013-08-20 16:02:10 +10:00
Shannon 949748a7f7 Added some overloads to the data type service to be able to save data types + pre-values in one transaction, and also to be able to update pre-values (before we could only insert). Got the data type editor now validating and saving values back to the db. Updated the content views (content/media) to have a correct form structure with ng-submit working. 2013-08-20 14:44:59 +10:00
Shannon ea8d7c842e Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-08-20 11:33:56 +10:00
Shannon a29706b5ce Updated the model mappers to include the pre-value value which is now wired up to the display, now just need to get the data type's persisting. 2013-08-20 11:33:41 +10:00
perploug ab2be923ff Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-08-19 10:06:46 +02:00
perploug b357989f18 Keyboard service test WIP 2013-08-19 10:06:32 +02:00
Shannon e783b35a3a Updated the data type controller to return the correct data for the editor, including more models and model mappings. 2013-08-19 17:39:50 +10:00
Shannon 78e836025b Fixes EntityController to have a correct model mapper and removes invalidly named 'map' method. Removes the key from entity since we don't need it. Added some notes to the controller since we have to implement security for the results. 2013-08-19 16:49:07 +10:00
Shannon 024511a605 got data type editor dynamically loading pre-vals when the drop down changes, got the mock services to save the data. 2013-08-19 12:37:04 +10:00
perploug bcf49c440a Fix create dialog paths 2013-08-16 15:42:10 +02:00
perploug 5ff32b5c11 Fx url list 2013-08-16 15:41:59 +02:00
perploug c85ca2b65b Fix content picker url listing 2013-08-16 15:41:50 +02:00
perploug 05dea9707b Fix login css glitch 2013-08-16 15:41:38 +02:00
perploug 2b0e32cdcf Linking tree header to dashboard 2013-08-16 15:41:27 +02:00
perploug 55e74eba39 Fixing the folder uploader for media section 2013-08-16 15:41:13 +02:00
perploug ce7c4833f4 merge 2013-08-16 13:30:51 +02:00
perploug a82c367db8 merge content/edit.html 2013-08-16 13:29:23 +02:00
perploug 6df9a912f0 Adds keyboard.service for hotkeys, final contentpicker 2013-08-16 13:13:46 +02:00
Shannon ddccc378d5 Started getting the creation process working for data types, created custom mock data type trees and menu's to get it all up and running but is still in progress. Will finish that on Monday along with dynamically changing the pre-value editors based on the drop down changing. 2013-08-16 17:25:52 +10:00
Shannon 7c1687710b re-deleted the 'property editors' folder in the UI project since there should be no space. Fixed up more of the pre-value definitions and tests. Got an initial demo working of pre-value editors in the mock data 2013-08-16 16:15:08 +10:00
Shannon 315652e384 Got the data type editor drop down working properly, implemented structure for pre-value editor including the manifest 2013-08-16 13:33:43 +10:00
Shannon 3fc44d9a34 Streamlined more of the validation directives, fixed up the regex val directive with the pre-value changes got validation working properly with the data type editor, finally on track with validation! 2013-08-16 11:29:59 +10:00
Shannon 6c46aa4727 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-08-15 19:20:26 +10:00
Shannon f2f1106034 Started on data type editor 2013-08-15 19:20:06 +10:00
perploug 15fc3a3665 content picker 2013-08-15 09:47:12 +02:00
Shannon 2153dc2f56 Getting data type (pre-value) editor going (WIP) 2013-08-15 17:27:31 +10:00
Shannon 8fbbd3d8a0 Fixes issue with invalid cookie 2013-08-15 17:14:05 +10:00
Shannon bedd938553 fixes issue with legacy data types and new-prevalues 2013-08-15 13:29:35 +10:00
Shannon b3defcb007 fixes merge issues 2013-08-15 13:05:09 +10:00
Shannon 89ce60ef0f Merge remote-tracking branch 'origin/6.1.4' into 7.0.0 
Conflicts:
	src/Umbraco.Core/Events/RecycleBinEventArgs.cs
	src/Umbraco.Core/Persistence/Querying/BaseExpressionHelper.cs
	src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
	src/Umbraco.Core/Persistence/Repositories/Interfaces/IContentRepository.cs
	src/Umbraco.Core/Persistence/Repositories/SimilarNodeNameComparer.cs
	src/Umbraco.Web.UI/config/ExamineIndex.config
	src/Umbraco.Web/Strategies/DeleteFilesAfterEmptiedRecycleBin.cs
	src/Umbraco.Web/Umbraco.Web.csproj
 2013-08-15 12:59:05 +10:00
Shannon 66cdd90994 fixes up legacy trees with the correct alias and forces legacy root nodes to load the dashboard route. 2013-08-15 12:57:56 +10:00
Shannon d4f8cb4e41 remove un-needed files 2013-08-15 12:40:16 +10:00
Shannon bb36477207 Merge remote-tracking branch 'origin/7.0.0' into 7.0.0 
Conflicts:
	src/Umbraco.Web.UI.Client/src/common/services/tree.service.js
	src/Umbraco.Web.UI.Client/src/routes.js
 2013-08-15 12:36:35 +10:00
Shannon c61206d03f Changed routes to have section + tree 2013-08-15 12:34:22 +10:00
Shannon 59d40c4127 fixed build error 2013-08-15 10:34:32 +10:00
perploug 523434a126 Fixes broken content model test 2013-08-14 21:45:09 +02:00
Per Ploug Krogslund 8b71b6bf70 broken routes 2013-08-14 21:44:26 +02:00
Morten Christensen 766497e355 Refactoring QueryHelper to be a base class instead. 
Fix U4-2607 Creating nodes with special characters causes YSOD
 2013-08-14 17:07:21 +02:00
Morten Christensen 67a2a9cfe4 Refactoring the optimized Recycle Bin, so that the Recycle Bin's repository is more independent and easier to use with the new events added to the Content- and MediaService. 2013-08-14 16:12:13 +02:00
Per Ploug Krogslund f13d5c48fe Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 
Conflicts:
	src/Umbraco.Web.UI.Client/src/routes.js
 2013-08-14 14:30:23 +02:00
Per Ploug Krogslund 99d41ca63a added ace editor directive 2013-08-14 14:28:17 +02:00
Per Ploug Krogslund 8a32753cbc Replaced codemirror lib with ace 2013-08-14 14:26:40 +02:00
Shannon 4a8026c902 Got the Date and Date/Time new property editors created, fixed up a few date casting issues with data. These editors 'should' be compatible with the previous legacy date/datetime editors, just need to test it. 2013-08-14 20:08:45 +10:00
Shannon 3e675ff2cc Converted over pre-value config to be a dictionary, not an array. To do that I needed to create a new PreValueCollection object which encapsulates support for legacy (array based) pre-vals which get converted to a dictionary and newer dictionary pre-vals... which we will now require because we'll support pre-value overrides eventually. Fixed up the mapper unit tests and added other unit tests. 2013-08-14 19:24:20 +10:00
Shannon 6d3008b053 Fixed up some more validation issues with the reshuffling of how properties are rendered. 2013-08-14 17:52:16 +10:00
Shannon c3619d9ac5 Fixes plugin mgr to not resolve types that shouldn't be resolved. Fixes mntp legacy editor to not throw exceptions when initializing because the legacy tree no longer exists. Fixes authentication when an invalid cookie is detected. 2013-08-14 13:38:28 +10:00
Shannon 4a7fbfa3fa Fixes the datepicker control, updates it so that it supports time and a format that is configurable (pre-values) fixes toIsoDateTimeString() method. 2013-08-14 11:08:40 +10:00
Shannon 599caeb933 removed test examine settings 2013-08-14 10:08:59 +10:00
Morten Christensen ca71c59880 Fixes U4-2218 Document Type copy looses property tab assignment 2013-08-13 17:41:35 +02:00
Morten Christensen 6c87cf729a Fixes U4-2592 Cannot delete a node when the node has just a closing bracket in the name. 2013-08-13 11:27:39 +02:00