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

4430 Commits

Author SHA1 Message Date
perploug
8a9f38f97c Adding GetByIds to mediaService.cs 2013-08-28 20:57:42 +02:00
Shannon
2d0b7f0b3b Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-08-28 18:52:26 +10:00
Shannon
4b4fc037dd Fixes up pre-value formatted data so it doesn't include ID in the value since this confuses things. 2013-08-28 18:52:00 +10:00
perploug
d9bb7ba7cb Removes the temp mediaupload ctrl 2013-08-28 10:05:27 +02:00
Shannon
68b337729b fixed sort order on prop editor drop down 2013-08-28 18:01:30 +10:00
Shannon
0ebe9ec0fa Updated some of the property editor API to ensure that when formatting data for persistence we have access to the pre-values as well since these might need to be used to format the persisted data. Completed the new property editor: Multiple text box and it is saving the data in a backwards compatible format. Changed the internal AsDictionary method of the pre value collection to be a public method called FormatAsDictionary. 2013-08-28 17:53:31 +10:00
Shannon
bec36fd91b Fixes notifications if they dont' contain a body, so it doesn't contain a colon 2013-08-28 14:49:45 +10:00
Shannon
79ab84a793 Fixes some issues with pre-values with the previous changes made to include the IDs of the pre-values, needed to ensure they are formatted incoming/outgoing properly so the id isn't included. 2013-08-28 14:45:33 +10:00
Shannon
cb368b4335 Implemented the numeric property editor 2013-08-28 13:30:05 +10:00
Shannon
008b5f0d2a Fixed build errors 2013-08-28 11:14:49 +10:00
Shannon
d257835cb5 Merge remote-tracking branch 'origin/6.2.0' into 7.0.0 
Conflicts:
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/Models/ContentTests.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/umbraco/create/PartialViewTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/webservices/legacyAjaxCalls.asmx.cs
 2013-08-28 11:08:23 +10:00
Shannon
2ed97fe957 small css change 2013-08-28 11:03:16 +10:00
Shannon
861d4fe14a fixes up some css styles with approved colors 2013-08-28 11:01:42 +10:00
Shannon
dedaa2125d Fixes up a few issues found with media uploading 2013-08-28 10:45:50 +10:00
Shannon
f03180e6f8 Fixes up security issues with MediaUploadController, removes Delete since we shouldn't be arbitrarily deleting any media files without referencing media items, fixes up disposables and naming conventions. 2013-08-28 10:15:43 +10:00
Shannon
0cb084b9d1 Removes images that shouldn't be checked in 2013-08-28 09:51:19 +10:00
Shannon
bb6adcab92 Fixed up new actions in MediaController 2013-08-28 09:50:15 +10:00
Shannon
8fc127e195 Fixes up coding standards, null checks and strongly typed enums in EntityController 2013-08-28 09:34:48 +10:00
Sebastiaan Janssen
12b3d50717 Merge branch '6.2.0' of github.com:umbraco/Umbraco-CMS into 6.2.0 2013-08-27 19:29:43 +02:00
Sebastiaan Janssen
86276206d5 Add register member partial view macro template 2013-08-27 19:29:15 +02:00
Stephan
da719377df U4-2691 - fix issue with alt template and internal redirects 2013-08-27 18:06:53 +02:00
perploug
8b1fcf3e07 Media dialog upload and folder creation 2013-08-27 16:01:39 +02:00
perploug
208453f364 Entity and backoffce controller updates for JS sergvices 2013-08-27 12:02:23 +02:00
Sebastiaan Janssen
53b6fb7b56 Add login template to partial view macros 2013-08-27 11:37:20 +02:00
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