Commit Graph

6347 Commits

Author SHA1 Message Date
Shannon
ad4ebe3755 Updated a lot more of the pre-values stuff and the data type editor, updated lots more of the dropdown property editor and now have serialized/deserialized values working for pre-values. Now just need to finish off the pre-value field for the drop down list. 2013-08-22 18:38:57 +10:00
Shannon
6127cfccbd Fixed up the umbPropEditorHelper to ensure that the correct path is returned for views (because we can have relative views specified too). Moved angularhelper to it's own file, started on the DropDown property editor in c#. 2013-08-22 16:37:21 +10:00
Shannon
e463faa943 Got the template drop down working with the dropdown property editor which allows some config. 2013-08-22 15:48:32 +10:00
Shannon
49dc33c713 Fixes up the content editor js, updates some docs to reflect correct naming conventions. 2013-08-22 13:03:12 +10:00
perploug
d24b349073 last tweaks to the app.js 2013-08-21 22:20:08 +02:00
perploug
789b0d1c41 Moved 1.1.5 to folder, added 1.2Rc1 2013-08-21 21:13:23 +02:00
perploug
6264e6f15d added 1.2 upgrade note 2013-08-21 21:12:24 +02:00
perploug
6cee33a1fc $location.search will stop working with null 2013-08-21 21:11:54 +02:00
perploug
d181a39343 Added 1.2 references to app.js and dev.app.js 2013-08-21 21:11:15 +02:00
perploug
16c67bd435 Added seperate test watcher in gruntfile 2013-08-21 21:10:33 +02:00
perploug
d1d84e8be6 Delete old angular files 2013-08-21 21:09:55 +02:00
perploug
f9e6efbf8f Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-08-21 14:57:24 +02:00
perploug
e2ddaff401 start on migration to 1.2 2013-08-21 14:57:14 +02:00
Per Ploug Krogslund
5bd1b4bef3 Angular 1.2 files 2013-08-21 14:54:11 +02:00
perploug
b0e78e5b92 Adds wrapper html to navigation for better css 2013-08-21 14:25:24 +02:00
perploug
5cd7fc128a CloseDialogs() ignores clicks inside the #navigation 2013-08-21 14:25:09 +02:00
perploug
35538d0fa2 Makes the grid work in chrome, ff, and ie10 2013-08-21 14:24:42 +02:00
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
3c55ccb590 loader.js 2013-08-21 13:08:52 +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
ed68f2d28f Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-08-21 17:55:31 +10: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
perploug
6c9f4c6353 Removes missing files from web.ui csproj 2013-08-21 09:32:50 +02:00
Shannon
466b2a1cb2 Fixes: U4-2677 Fix content/media creation for media 2013-08-21 14:13:22 +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
Shannon
b2eac9ab8f Merge remote-tracking branch 'origin/6.1.4' into 7.0.0
Conflicts:
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/BusinessLogic/BaseTest.cs
2013-08-21 11:36:37 +10:00
Shannon
e233cffb9d Changes the cache keys in PluginManager to reference a const to make it a bit more clear. 2013-08-21 11:19:27 +10:00
Shannon
9e58ebed24 Merge branch '6.1.4' of https://github.com/umbraco/Umbraco-CMS into 6.1.4 2013-08-21 11:14:59 +10:00
Shannon
f51c4e332e Fixes: U4-2653 BeginUmbracoForm should use absolute path with query string URLs without the protocol 2013-08-21 11:14:37 +10:00
Sebastiaan Janssen
8cfb39ba2b Fix a strange VS2012 build targets problem 2013-08-20 18:08:34 +02:00
Sebastiaan Janssen
03a0a0a0e9 Fix a strange VS2012 build targets problem 2013-08-20 18:06:09 +02:00
Sebastiaan Janssen
0939a31c84 Merge branch '7.0.0' of github.com:umbraco/Umbraco-CMS into 7.0.0 2013-08-20 16:43:59 +02:00
Sebastiaan Janssen
9b70c0fbbf Fix wrong path and don't include index.html in build 2013-08-20 16:43:36 +02: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
Sebastiaan Janssen
e71fa681e6 Update build to v7 and include belle files 2013-08-20 14:18:02 +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