Commit Graph

6386 Commits

Author SHA1 Message Date
Per Ploug Krogslund
f6fcc9d314 uncommented debugging code 2013-08-26 15:05:07 +02:00
perploug
1e3d505df1 Serverside js loader 2013-08-26 15:04:02 +02:00
Per Ploug Krogslund
840d425502 Missing spans 2013-08-26 15:03:31 +02:00
Per Ploug Krogslund
b86f2474d5 missing files 2013-08-26 14:48:58 +02:00
Per Ploug Krogslund
266840cfdb Adding jquery file upload and modal tweaks 2013-08-26 14:48:58 +02:00
Shannon
86a82a666f Got all drop down editors working: normal, multiple, normal publishing keys, multiple publishing keys and should be backwards compatible. 2013-08-26 19:00:04 +10:00
Shannon
a6f70619eb Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-08-26 18:04:06 +10:00
Per Ploug Krogslund
cec3518347 Markdowneditor package files merge 2013-08-26 10:03:55 +02:00
Shannon
3708b0de65 Got value editors being able to handle 'object' not just string so we can post and return json structures directly to the angular editors, got the multiple drop down list working and saving data. U4-2704 Change property editor value editor to return/receive object instead of string 2013-08-26 18:03:35 +10:00
Per Ploug Krogslund
1553b66943 Merge 2013-08-26 10:02:35 +02:00
Per Ploug Krogslund
a2a6e899ec merge branch ahead 2013-08-26 09:58:49 +02:00
Per Ploug Krogslund
d2cfb83817 Remove old headline 2013-08-26 09:57:17 +02:00
Shannon
5b289a4971 Implemented much more for the new drop down property editors to ensure backwards compatibility, had to implement a new required method for property editors to format their data for cache storage. Changed how the drop down angular list is generated, now it uses a dictionary which is much more elegant with less code. Got drop down (normal) and drop down publishing keys working and saving the correct data types, nearly have drop down list multiple working but going to change the property editors to be able to post object (json) instead of just a string for values. 2013-08-26 17:24:08 +10:00
Shannon
5844c54a1f Fixed build error 2013-08-26 11:28:15 +10:00
Shannon
2157942b38 Adds GetAllUsers to the UserService and converts the call in the UserController (and removes the need for User model mapper as we just use auto-mapper now). U4-2720 Add a get all users method to the UserService 2013-08-26 11:26:58 +10:00
Sebastiaan Janssen
f26280fff6 Merge branch '7.0.0' of github.com:umbraco/Umbraco-CMS into 7.0.0 2013-08-23 16:54:34 +02:00
Sebastiaan Janssen
120f707c67 Fixes a unit test 2013-08-23 16:53:15 +02:00
perploug
1b0bffbe04 Changing karma log back to info level 2013-08-23 15:51:10 +02:00
perploug
bbc04c23b4 Missing imageHelper rename 2013-08-23 15:49:43 +02:00
perploug
a7754c7e8c image helper rename 2013-08-23 15:43:23 +02:00
perploug
0b116b8082 Missed a delete on the sample 2013-08-23 15:40:46 +02:00
perploug
fe7d61ef37 The completed markdown sample 2013-08-23 15:40:20 +02:00
Per Ploug Krogslund
1d60cdb2bc Property editor tutorials 2013-08-23 15:26:00 +02:00
Per Ploug Krogslund
7763550a89 Renames umbImageHelper to imageHelper 2013-08-23 15:26:00 +02:00
perploug
13afb127f4 Whoops, broke build, now fixed 2013-08-23 14:19:16 +02:00
Per Ploug Krogslund
c77f17962e Add more documentation on property editors 2013-08-23 14:08:23 +02:00
perploug
b916de4cf7 git broekN 2013-08-23 13:01:14 +02:00
perploug
b850cd68a1 csproj file updates 2013-08-23 12:22:37 +02:00
perploug
f52bf5f4a4 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-08-23 12:10:56 +02:00
perploug
c076d21151 New users.resource 2013-08-23 12:10:44 +02:00
perploug
eb60593815 Fxies the headline directive to actually work 2013-08-23 12:10:16 +02:00
Shannon
b1f3e8d8ef Drop down list seems to be working with pre-values :) 2013-08-23 18:38:33 +10:00
Shannon
fbaaf7a6cb Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-08-23 18:10:49 +10:00
Shannon
59a8e03c79 Got further with pre-value editors and strongly typed stuff, got the pre-value editor for drop down list working and saving array objects. Now need to wire that up to the editor but think i need to change how the drop down list displays it's values. 2013-08-23 18:10:32 +10:00
perploug
3835b50a44 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-08-23 08:31:57 +02:00
perploug
66684bc6f5 Tried writing assets and keyboard tests, both failed :( 2013-08-23 08:31:47 +02:00
Shannon
fff8eac43f Implemented: U4-2692 Add attribute access to property editor prevalues 2013-08-23 15:33:52 +10:00
perploug
258b5ee2dd Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-08-22 14:46:51 +02:00
perploug
baaecedac2 Finetuning html adding prevalue editors 2013-08-22 14:46:43 +02:00
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