Commit Graph

314 Commits

Author SHA1 Message Date
perploug
fc87a91e14 Adds a delay to the navigation hide 2013-08-21 14:24:29 +02:00
perploug
50845c63a8 Makes the grunt engine faster and only acts on specific files 2013-08-21 14:24:16 +02:00
perploug
4e1c915781 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-08-21 13:10:16 +02:00
perploug
a75cfc5a2d legacy dashboard url fix 2013-08-21 13:10:05 +02:00
Per Ploug Krogslund
39ae3f6160 Fixes firefox height scale issues 2013-08-21 13:08:52 +02:00
perploug
1cff6d99ef Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-08-21 10:35:06 +02:00
perploug
e18a07e908 Unlocks the login button, failed attempt to test the keyboard service reverted 2013-08-21 10:34:53 +02:00
Shannon
5581af2d25 Fixed up the file uploading and the readonly property editors and saving/updating their data/control based on the data changed on the server side.
U4-2680 Fix file uploading
2013-08-21 17:54:30 +10:00
Shannon
0dab52e8f6 Fixes creating content: U4-2677 Fix content/media creation - now to fix media 2013-08-21 13:38:49 +10:00
perploug
121d5462e9 Missing $scope in content edit controller 2013-08-20 16:07:46 +02:00
perploug
d09b1d9949 7.0.0 merge changed .cs from shannon 2013-08-20 15:26:53 +02:00
perploug
5c59269340 Fixes broken scope reference for rebinder 2013-08-20 15:22:30 +02:00
perploug
ff5afb91e6 Set a default avatar on navivation 2013-08-20 15:22:06 +02:00
perploug
3b7f12c883 set content to default section in the routes 2013-08-20 15:21:27 +02:00
perploug
dd7e4f19ba Removed keyboard service debug logging 2013-08-20 15:21:12 +02:00
perploug
2e90e354bc Fixes dashboard redirect on login 2013-08-20 15:20:46 +02:00
Shannon
7df641cf2b Got Data Type Creation working. Need to look at fixing up the issues with creating content/media tomorrow. 2013-08-20 18:10:19 +10:00
Shannon
b901ae3269 Updated the data type controller post method and moved validation, etc... over to a filter, updated data type tree with the create menu action to launch into a blank element. 2013-08-20 17:25:17 +10:00
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
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
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
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
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
Per Ploug Krogslund
8b71b6bf70 broken routes 2013-08-14 21:44:26 +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