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

1902 Commits

Author SHA1 Message Date
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
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
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
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
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
Sebastiaan Janssen
23c6a91e9c Fixes merge issue 2013-08-19 11:47:53 +02:00
Sebastiaan Janssen
a03c6dcf13 Merge pull request #80 from ThomasSkyldahl/6.1.4 
UmbracoViewPage.WriteLiteral(object value)  optimized memory usage and combined markup injection
 2013-08-19 02:34:13 -07:00
Sebastiaan Janssen
f41d967864 Fixes: U4-2637 Error adding a User using AD Membership Provider when no Email Address Defined 2013-08-19 10:41:49 +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
78e836025b Fixes EntityController to have a correct model mapper and removes invalidly named 'map' method. Removes the key from entity since we don't need it. Added some notes to the controller since we have to implement security for the results. 2013-08-19 16:49:07 +10:00
perploug
55e74eba39 Fixing the folder uploader for media section 2013-08-16 15:41:13 +02:00
perploug
a82c367db8 merge content/edit.html 2013-08-16 13:29:23 +02:00
Thomas Skyldahl Sørensen
4a481b05d4 Optimized WriteLiteral 2013-08-16 10:09:09 +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
66c6b5b524 Fixes: U4-2632 Remove the recursive permissions check on the move/copy dialog 2013-08-16 12:46:40 +10:00
Mads Krohn
a343a76a26 Moved WriteLiteral method to UmbracoViewPage 
When we use a custom model through a custom controller, in our view, we
inherit from UmbracoViewPage, so the WriteLiteral method, which provides
preview badge and miniprofiler code, should be placed there.
 2013-08-16 00:01:31 +02:00
Shannon
8fbbd3d8a0 Fixes issue with invalid cookie 2013-08-15 17:14:05 +10:00
Shannon
bedd938553 fixes issue with legacy data types and new-prevalues 2013-08-15 13:29:35 +10:00
Shannon
89ce60ef0f Merge remote-tracking branch 'origin/6.1.4' into 7.0.0 
Conflicts:
	src/Umbraco.Core/Events/RecycleBinEventArgs.cs
	src/Umbraco.Core/Persistence/Querying/BaseExpressionHelper.cs
	src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
	src/Umbraco.Core/Persistence/Repositories/Interfaces/IContentRepository.cs
	src/Umbraco.Core/Persistence/Repositories/SimilarNodeNameComparer.cs
	src/Umbraco.Web.UI/config/ExamineIndex.config
	src/Umbraco.Web/Strategies/DeleteFilesAfterEmptiedRecycleBin.cs
	src/Umbraco.Web/Umbraco.Web.csproj
 2013-08-15 12:59:05 +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
c61206d03f Changed routes to have section + tree 2013-08-15 12:34:22 +10:00
Morten Christensen
67a2a9cfe4 Refactoring the optimized Recycle Bin, so that the Recycle Bin's repository is more independent and easier to use with the new events added to the Content- and MediaService. 2013-08-14 16:12:13 +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
Shannon
3e675ff2cc Converted over pre-value config to be a dictionary, not an array. To do that I needed to create a new PreValueCollection object which encapsulates support for legacy (array based) pre-vals which get converted to a dictionary and newer dictionary pre-vals... which we will now require because we'll support pre-value overrides eventually. Fixed up the mapper unit tests and added other unit tests. 2013-08-14 19:24:20 +10:00
Shannon
c3619d9ac5 Fixes plugin mgr to not resolve types that shouldn't be resolved. Fixes mntp legacy editor to not throw exceptions when initializing because the legacy tree no longer exists. Fixes authentication when an invalid cookie is detected. 2013-08-14 13:38:28 +10:00
Morten Christensen
ca71c59880 Fixes U4-2218 Document Type copy looses property tab assignment 2013-08-13 17:41:35 +02:00
Shannon
d7fd1efd60 Merge remote-tracking branch 'origin/6.1.4' into 7.0.0 
Conflicts:
	src/Umbraco.Core/StringExtensions.cs
	src/Umbraco.Tests/Models/ContentExtensionsTests.cs
	src/Umbraco.Tests/TestHelpers/Entities/MockedContentTypes.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Tests/packages.config
 2013-08-13 18:22:45 +10:00
Shannon
4e13b0afe6 Converted the DataType tree to the new tree structure, now need to start creating the pre-value editor. Obsoleted IDataType and a bunch of other things associated with IDataType. Obsoleted old tree classes that we've replaced so far. 2013-08-13 18:19:56 +10:00
Shannon
2e2229e388 Created a sortable directive to share the markup between content and media and got media sorting done too. 2013-08-13 17:48:56 +10:00
Shannon
bfabfd9fa5 Updated to latest Examine version (contains bug fix for U4-2180 Problem with Examine MultiIndexSearcher after upgrading from 4.11.3 to 4.11.8) and removes the partially trusted callers attribute from the PDF lib because itextsharp by default doesn't support med trust. 2013-08-13 15:41:40 +10:00
perploug
5a435523ed merge 2013-08-12 15:26:31 +02:00
perploug
e825c08901 Added events.Service and xmlhelper.service 2013-08-12 15:17:34 +02:00
Shannon
50aa9d7144 Adds more functionality to prop editors to be able to flag the value editor as readonly so no bound values will be persisted (ie. for the label property editor) 2013-08-12 18:09:16 +10:00
Shannon
c3e773b598 Wires up release and expire dates to be persisted, template is wired up but need to get the picker rendering. 2013-08-12 16:45:00 +10:00
Shannon
8525468312 Get the generic property tab rendering properly with a url list as well. 2013-08-12 15:57:54 +10:00
Shannon
1e2af42ce6 Ensures internal generic properties are all wired up in c# and fixes up the boolean editor, adds templatepicker html file so that something is rendered and there are no js errors. 2013-08-12 14:16:45 +10:00
Shannon
afe1023e19 Fixes EntityController to accept multiple query string values, adds null checks to the parameter and to null (not found entities). 2013-08-12 11:53:50 +10:00
Shannon
ecb7a1cda2 Merge remote-tracking branch 'origin/6.1.4' into 7.0.0 2013-08-12 11:36:40 +10:00
Shandem
958fb66f2c Merge pull request #73 from florisrobbemont/6.1.3 
U4-2596: UmbracoControllerFactory method ReleaseController should be virtual
 2013-08-11 18:13:06 -07:00
Per Ploug
b3f1c7fa1e Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-08-09 13:40:18 +02:00
Per Ploug
6abb98d9c3 Added entityController 2013-08-09 13:40:09 +02:00
Shannon
4241916d14 Started adding more permissions checks for media 2013-08-09 18:18:32 +10:00
Shannon
f518076ab8 Added permissions check to sort on content controller 2013-08-09 18:13:05 +10:00
Shannon
437f2dc588 Added more security checks to the content controller 2013-08-09 18:04:44 +10:00