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

6537 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
61aa102268 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-08-27 18:37:31 +10:00
Shannon
8863a9bb86 Got the color picker pre-values updated to dynamically display the color they are typing in. 2013-08-27 18:31:40 +10:00
perploug
f25d1ec917 Fixes readonly validator issue 2013-08-27 10:07:48 +02:00
perploug
d81ccecd10 Media service 2013-08-27 10:05:36 +02:00
perploug
6a1a478cdd start on improved cropper and media picker 2013-08-27 10:05:35 +02:00
perploug
0ec4e70a1b Added entity service overloads, 2013-08-27 10:05:34 +02:00
Anders Stentebjerg
c03839d985 ImageCropper 
- Media Picker grid
- Image Cropper dialog
- Updated Font Awsome to 3.2.1
 2013-08-27 09:52:13 +02:00
Sebastiaan Janssen
6bbc2de43e Update failing unit test due to added action for changing the document type on a node 2013-08-27 09:37:00 +02:00
Shannon
76666a4c67 Lots more done on the multi-value property editors like drop down list, check box list, color picker in regards to the pre-value editor and ensuring correct validation is done on the server side including some unit tests. Also allows for updating values not just removing and adding. Now need to make a directive of it so we can customize more for the color picker. 2013-08-27 17:33:11 +10:00
Shannon
e448436614 Color picker is working, added custom validation to the pre-values but need to get them working a bit better and showing the colors in the pre-val editor as well. Then also need to update the other list pre-value editors to be able to update values so we don't have to remove and re-add them. 2013-08-27 15:02:24 +10:00
Shannon
3e95b0468f Checkbox list property editor is now working. 2013-08-27 13:18:47 +10:00
Shannon
562a8f38bb Attempted to fix up validation for header but still jumps around and wont work with the label message because the H1 tag is block 2013-08-27 12:26:13 +10:00
Sebastiaan Janssen
91590c824f Merge branch '6.2.0' of github.com:umbraco/Umbraco-CMS into 6.2.0 2013-08-26 17:28:31 +02:00
Sebastiaan Janssen
d17b2cf884 Added ability to have predefined templates for Partial View Macros 2013-08-26 17:28:15 +02:00
Morten Christensen
aed017641d Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 2013-08-26 17:01:05 +02:00
Morten Christensen
2b82e74b90 Adding test fixture for the MemberRepository 2013-08-26 17:00:12 +02:00
Morten Christensen
37d190c97d Implementing read-only DTOs for improved reading of Members from db. 
Started implementation of Member, MemberType and MemberGroup repositories.
 2013-08-26 16:59:41 +02:00
Morten Christensen
f1818aae1b Updating the Profile and Member classes 2013-08-26 16:58:08 +02:00
Per Ploug Krogslund
f40de60fc4 set default w/h on rte images 2013-08-26 15:17:27 +02:00
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
Sebastiaan Janssen
ee4312b7f2 U4-2464 Single user protection, password not changeable! 2013-08-26 13:56:22 +02:00
Sebastiaan Janssen
2345a5e133 U4-2477 Member editing - Indicate which box is active and which is inactive 2013-08-26 13:45:09 +02:00
Sebastiaan Janssen
cbe8f15007 U4-2636 Allow at root property are outside of view in backoffice 2013-08-26 12:11:07 +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
Sebastiaan Janssen
dd59038369 Fixes U4-2686 Error when trying to delete member group with ampersand in name. 2013-08-26 10:29:30 +02: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
c9942d7ca5 Merge pull request #106 from pynej/code-mirror-search 
Added plugin to all code area editors to suppressed normal browser Find ...
 2013-08-25 08:37:08 -07:00
Sebastiaan Janssen
ab8e6b8f33 Merge branch 'wip-dragdrop2' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-wip-dragdrop2 2013-08-25 17:26:08 +02:00
Sebastiaan Janssen
d21f10ec1e Db migration to allow admins to change the document type 2013-08-25 17:14:01 +02:00
Sebastiaan Janssen
76d0ffb797 Merge branch 'wip-changedoctypeui' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-wip-changedoctypeui 
Conflicts:
	.gitignore
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/config/ClientDependency.config
	src/Umbraco.Web/Umbraco.Web.csproj
 2013-08-25 15:50:07 +02:00
Sebastiaan Janssen
6437179a83 Merge pull request #112 from dampee/6.1.3 
U4-2638 Developer/Packages/Install Starterkit give 500 server error
 2013-08-25 05:36:49 -07: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
Sebastiaan Janssen
cc45bbeca6 Fix unit tests that failed because UmbracoSettings.config was being cleaned up 2013-08-23 16:22:26 +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