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

6258 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
b3defcb007 fixes merge issues 2013-08-15 13:05:09 +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
3b749073d7 updated ignore to ignore these new strange merge files for routes.js 2013-08-15 12:47:56 +10:00
Shannon
d4f8cb4e41 remove un-needed files 2013-08-15 12:40:16 +10:00
Shannon
bb36477207 Merge remote-tracking branch 'origin/7.0.0' into 7.0.0 
Conflicts:
	src/Umbraco.Web.UI.Client/src/common/services/tree.service.js
	src/Umbraco.Web.UI.Client/src/routes.js
 2013-08-15 12:36:35 +10:00
Shannon
c61206d03f Changed routes to have section + tree 2013-08-15 12:34:22 +10:00
Shannon
59d40c4127 fixed build error 2013-08-15 10:34:32 +10:00
perploug
523434a126 Fixes broken content model test 2013-08-14 21:45:09 +02:00
Per Ploug Krogslund
8b71b6bf70 broken routes 2013-08-14 21:44:26 +02:00
Morten Christensen
766497e355 Refactoring QueryHelper to be a base class instead. 
Fix U4-2607 Creating nodes with special characters causes YSOD
 2013-08-14 17:07:21 +02: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
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
Morten Christensen
ca71c59880 Fixes U4-2218 Document Type copy looses property tab assignment 2013-08-13 17:41:35 +02:00
Morten Christensen
6c87cf729a Fixes U4-2592 Cannot delete a node when the node has just a closing bracket in the name. 2013-08-13 11:27:39 +02:00
Shannon
5c63afa31a removed my test examine settings 2013-08-13 18:26:32 +10:00
Shannon
fa88768c91 removed my test examine settings 2013-08-13 18:25:39 +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