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

6240 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Per Ploug Krogslund
f13d5c48fe Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 
Conflicts:
	src/Umbraco.Web.UI.Client/src/routes.js
 2013-08-14 14:30:23 +02:00
Per Ploug Krogslund
99d41ca63a added ace editor directive 2013-08-14 14:28:17 +02:00
Per Ploug Krogslund
8a32753cbc Replaced codemirror lib with ace 2013-08-14 14:26:40 +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
6d3008b053 Fixed up some more validation issues with the reshuffling of how properties are rendered. 2013-08-14 17:52:16 +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
Shannon
4a7fbfa3fa Fixes the datepicker control, updates it so that it supports time and a format that is configurable (pre-values) fixes toIsoDateTimeString() method. 2013-08-14 11:08:40 +10:00
Shannon
599caeb933 removed test examine settings 2013-08-14 10:08:59 +10: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
Shannon
aa1c411c8c Fixes U4-2618 PDF indexer does not ensure spaces are added to textual content and fixes med trust compat relating to U4-2180 Problem with Examine MultiIndexSearcher after upgrading from 4.11.3 to 4.11.8 2013-08-13 13:47:57 +10:00
Shannon
4a778ac1d3 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 
Conflicts:
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js
 2013-08-13 11:36:36 +10:00
Shannon
642c4d10fe Fixes date picker value that is posted 2013-08-13 11:34:27 +10:00
Shannon
c52c452b36 Fixes issue relating to the fix for U4-2589 where we need to clear the published db flag for previous versions when creating a new published version. 2013-08-13 11:01:49 +10:00
perploug
9c38670dde Nicer modal animations, fixes rte bug 2013-08-12 22:23:06 +02:00
Morten Christensen
86811fe507 Fixes U4-2397 IContent Properties added with incorrect Value when read from Cache, and adds unit test for verifying types saved and returned for 24 standard DataTypes. 2013-08-12 16:20:32 +02: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
perploug
3e3f12bf63 Added events.Service and xmlhelper.service 2013-08-12 15:06:12 +02:00
Morten Christensen
363de53b82 Updates query to limit results in subquery for MySql according to U4-2329 Browsing Media Slow in 6.1.1 2013-08-12 12:42:21 +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
31d6575746 removes space in 'property editors' 2013-08-12 11:41:33 +10:00
Shannon
ecb7a1cda2 Merge remote-tracking branch 'origin/6.1.4' into 7.0.0 2013-08-12 11:36:40 +10:00
Shannon
c7f8a65a43 removes the space from 'property editors' folder, removes file commits to App_Plugins in the UI proj. 2013-08-12 11:36:11 +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
Morten Christensen
30e12c1367 Final piece to the puzzle for U4-2571 Need to optimize empty recycle bin. Needed to hack around the ordering of items in the recycle bin because of the self-referencing constraint - parentID to id in the umbracoNode table by updating all parentID entries, which bypasses any reference issues with the foreignkey. 2013-08-11 21:12:02 +02:00
Per Ploug Krogslund
930bca4a2b start on new property editors 2013-08-10 20:04:17 +02:00
Morten Christensen
89ff7d85e2 Correcting DELETE FROM query so it works with sql ce as well. 2013-08-09 17:44:57 +02:00
Per Ploug Krogslund
369b0b74c0 updated docs 2013-08-09 16:25:05 +02:00
Per Ploug Krogslund
f777fdc843 Added mntp changes 2013-08-09 15:36:36 +02:00
Per Ploug Krogslund
ebaf353e4a Content picker full api and test coverage 2013-08-09 15:24:43 +02: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
Per Ploug Krogslund
23459719f6 Added entityResource + entity mocks 2013-08-09 13:39:07 +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
Shannon
b8df64742c Fixes up the permissions attribute and tests... was accidentally storing persisted data in the attribute. 2013-08-09 17:27:02 +10:00
Shannon
0a3cdfbd40 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-08-09 16:53:33 +10:00
Shannon
f04d5f43e0 Fixed media editor (to be the same as content). Implemented media permissions check when retreiving node. 2013-08-09 16:53:20 +10:00
Per Ploug Krogslund
8f37925aef adds a pre tag to render the raw model to the editor, this can be toggled in main.ctrl 2013-08-09 08:46:31 +02:00
Shannon
49f3c9e4b2 Adds more code and tests for permissions checks 2013-08-09 16:39:09 +10:00
Shannon
4bb71273e2 doh, re-publicized EntityPermissions... caused test errors. 2013-08-09 16:00:09 +10:00