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

411 Commits

Author SHA1 Message Date
Shannon
0856173c9c Merge remote-tracking branch 'origin/7.0.0' into 7.0.0 2013-10-10 13:41:11 +11:00
Shannon
98832357bf Lots of work on the member editor - creates new email address prop editor, allows text prop editor to be required based on config, fixes the section directive bug, creating change password prop ed, streamlines more of the services layer to ensure that the things that need to be public are public 2013-10-10 13:41:06 +11:00
perploug
1e6b80e45e 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/listview/listview.controller.js
 2013-10-09 15:10:51 +02:00
perploug
de14a6dad7 labels for localization support 2013-10-09 15:07:09 +02:00
perploug
ce97350d76 listview bugfixes 2013-10-09 15:06:21 +02:00
perploug
2d3cf3da23 section mapper 2013-10-09 15:04:30 +02:00
Shannon
2b2cf48fdb Implements HideLabel for property editor value editors for both c# and manifest declarations. 2013-10-09 16:06:07 +11:00
Shannon
858135175e Completes: U4-2956 Update all services with correct public methods/properties 2013-10-09 15:21:01 +11:00
Stephan
e7a238b2bc Merge remote-tracking branch 'origin/7.0.0' into 7.0.0-pubcontent 2013-10-08 09:48:11 +02:00
Shannon
febff1560e Added member type controller and resource, started getting creating members dialog working. 2013-10-08 17:49:40 +11:00
Shannon
19d96ac0e2 ensures the lsit is created for styles. 2013-10-08 13:02:46 +11:00
Shannon
3a33a39411 Adds node styles and ensures they are set for the content tree nodes, now to get them to display styles 2013-10-08 12:58:11 +11:00
Shannon
883a662240 Moves tree/menu models into the Models.Trees namespace 2013-10-08 12:38:27 +11:00
Shannon
6cec665f7d Renames the PropertyValueEditor converter methods to be inline with the new converter method names 2013-10-08 10:58:47 +11:00
perploug
ec4eeb5de6 tree syncing 2013-10-07 10:09:03 +02:00
Stephan
e31dd688bf Merge remote-tracking branch 'origin/7.0.0' into 7.0.0-pubcontent 
Conflicts:
	src/Umbraco.Core/Umbraco.Core.csproj
 2013-10-04 14:54:18 +02:00
Shannon
b462082ed9 Fixes up some naming conventions and removes need to instantiate another umbraco helper 2013-10-04 09:00:02 +10:00
perploug
a42bd4dbf0 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-10-03 20:59:04 +02:00
perploug
a3d77b7e72 Adds RTE and stylesheet services 2013-10-03 20:57:36 +02:00
Stephan
e14e5bee95 Merge remote-tracking branch 'origin/7.0.0' into 7.0.0-pubcontent 
Conflicts:
	src/Umbraco.Tests/CodeFirst/ContentTypeMapper.cs
	src/Umbraco.Web/Models/DynamicPublishedContent.cs
 2013-10-03 18:49:58 +02:00
Stephan
9e1364db42 Merge remote-tracking branch 'origin/6.2.0' into 7.0.0 2013-10-03 18:48:42 +02:00
Stephan
1902bc4807 Merge remote-tracking branch 'origin/7.0.0' into 7.0.0-pubcontent 2013-10-03 18:17:35 +02:00
Stephan
a264342bcc Merge remote-tracking branch 'origin/6.2.0' into 6.2.0-pubcontent 
Conflicts:
	src/Umbraco.Tests/CodeFirst/ContentTypeMapper.cs
	src/Umbraco.Web/Models/DynamicPublishedContent.cs
 2013-10-03 18:16:29 +02:00
Stephan
08660704cc Core.StringExtensions - adjust to new default IShortStringHelper (see f64b8d6) 2013-10-03 18:10:51 +02:00
Shannon
3d3be5ecbc Renames Control to DashboardControl so it has some meaning. 2013-10-03 17:59:23 +10:00
Stephan
efb4a6652d Merge remote-tracking branch 'origin/7.0.0' into 7.0.0-pubcontent 2013-10-02 11:11:38 +02:00
Shannon
8b6171bb13 Almost got the tags tables upgraded 2013-10-02 13:50:42 +10:00
Shannon
bad4d0c6e6 fixes merge issues 2013-10-02 09:30:53 +10:00
Shannon
2c88c7c971 Fixed up content tree to check for IsContainer with the new entity AdditionalData, fixes up the AddContainerView to be part of the ContentModelMapper. 2013-10-01 21:12:32 +10:00
Shannon
59196020bb Fixes up content controller move/copy actions 2013-10-01 10:04:07 +10:00
perploug
bd3cdd83f6 WIP: adds move and copy methos to content contoller 2013-09-30 23:34:07 +02:00
perploug
5a757f129c Implements doctype container 2013-09-30 23:33:27 +02:00
Stephan
ea638c37b7 Merge remote-tracking branch 'origin/7.0.0' into 7.0.0-pubcontent 
Conflicts:
	src/Umbraco.Web/UmbracoContext.cs
 2013-09-30 14:05:12 +02:00
perploug
ca56539c65 Fixes U4-2980 - tabs not in the right order 2013-09-30 13:18:34 +02:00
Shannon
42f9427e24 ignores the built in member properties for now, adds more logging to Resolution to try to figure out the underlying problem. 2013-09-30 15:42:29 +10:00
Stephan
a8a2c706ba Merge branch '7.0.0' into 7.0.0-pubcontent 
Conflicts:
	src/Umbraco.Core/PublishedContentHelper.cs
 2013-09-27 15:59:42 +02:00
Shannon
a3d674f574 Updated the saving model and validator inheritance chain to better support members, have the members editor display data and posting/validating data - now need to get the correct fields being displayed and the correct tab/layout but coming along very nicely! 2013-09-27 16:59:38 +10:00
Shannon
82c784d560 Most of the member tree working, have the member editor rendering data 2013-09-27 15:19:39 +10:00
Shannon
6cf689220e Fixed up the log controller & models (based on feedback http://bit.ly/1h6KiJf ) 2013-09-27 09:25:08 +10:00
Stephan
02ffebde49 Merge branch '7.0.0' into 7.0.0-pubcontent 2013-09-26 09:06:01 +02:00
Shannon
1901351f3a Changes the property convert to log errors when it cannot find a property editor - this means that packages can still install 2013-09-25 21:35:24 +10:00
Stephan
725b938de1 PublishedContent - revert to using property.Value vs .ObjectValue 2013-09-25 13:17:21 +02:00
Stephan
042973ce19 PublishedContent - revert to using property.Value vs .ObjectValue 2013-09-25 12:54:24 +02:00
Shannon
1e9a17babe Fixes merge issues, fixes up some unit tests, removes the For<T> config section stuff and simplifies the singleton, refactors it with methods as per discussion with stephen. 2013-09-25 19:23:41 +10:00
Stephan
3ca8b356ee Merge branch '6.2.0-pubcontent' into 7.0.0-pubcontent 
Conflicts:
	src/Umbraco.Core/Cache/CacheProviderBase.cs
	src/Umbraco.Core/Cache/HttpRuntimeCacheProvider.cs
	src/Umbraco.Core/Cache/NullCacheProvider.cs
	src/Umbraco.Core/Cache/StaticCacheProvider.cs
	src/Umbraco.Core/Configuration/UmbracoSettings.cs
	src/Umbraco.Core/CoreBootManager.cs
	src/Umbraco.Core/Dynamics/PropertyResult.cs
	src/Umbraco.Core/Models/IPublishedContentProperty.cs
	src/Umbraco.Core/Models/PublishedItemType.cs
	src/Umbraco.Core/PropertyEditors/IPropertyEditorValueConverter.cs
	src/Umbraco.Core/PropertyEditors/PropertyEditorValueConvertersResolver.cs
	src/Umbraco.Core/PropertyEditors/PropertyValueConvertersResolver.cs
	src/Umbraco.Core/PublishedContentExtensions.cs
	src/Umbraco.Core/PublishedContentHelper.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/CodeFirst/StronglyTypedMapperTest.cs
	src/Umbraco.Tests/LibraryTests.cs
	src/Umbraco.Tests/PropertyEditors/PropertyEditorValueConverterTests.cs
	src/Umbraco.Tests/PublishedCache/PublishedContentCacheTests.cs
	src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs
	src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs
	src/Umbraco.Web/ExamineExtensions.cs
	src/Umbraco.Web/Models/DynamicPublishedContent.cs
	src/Umbraco.Web/Models/XmlPublishedContent.cs
	src/Umbraco.Web/Models/XmlPublishedContentProperty.cs
	src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs
	src/Umbraco.Web/PublishedContentExtensions.cs
	src/Umbraco.Web/Templates/TemplateUtilities.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/WebBootManager.cs
	src/Umbraco.Web/umbraco.presentation/macro.cs
	src/umbraco.MacroEngines/RazorDynamicNode/PropertyResult.cs
	src/umbraco.MacroEngines/RazorDynamicNode/PublishedContentExtensions.cs
 2013-09-23 21:57:22 +02:00
Shannon
7037f0626a completes U4-2706 Change form watching in the validators over to use functions , test using other manifest property editors as parameter editors, fixes up validation in the dialog. 2013-09-20 17:00:34 +10:00
Shannon
7396b01466 Got macro parameter editors inserting macros into the template editor for both webforms and mvc, created unit tests for macro syntax in macroservice. Removed the hard coded span8 for input elements for property editors - need to figure out a different way to set their width. 2013-09-20 14:24:39 +10:00
Stephan
c3caf7ff04 PublishedContent - align with v7, refactor IPublishedProperty & names 2013-09-19 13:12:18 +02:00
Shannon
44cc095163 Gets macro resource and controller working to return macro param data, now to start looking at how to get this all working. 2013-09-18 18:20:14 +10:00
Stephan
1e786ac311 PublishedContent - proper PublishedContentType cache management 2013-09-18 10:09:11 +02:00