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

7309 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
ff3aebd4b1 Completes: U4-2893 Remove the entire umbraco.macroRenderings assembly 2013-10-04 10:01:57 +10:00
Shannon
ad6e4ae745 Adds ability to use the c# property name as the pre-value field key, adds examples of declaring pre-value fields. 2013-10-04 09:22:07 +10: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
95f120e98f Unpublishing button on the content editor 2013-10-03 22:18:44 +02: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
21d6209793 Removing unussed libraries, moving legacy tinymce plugins 2013-10-03 20:58:47 +02:00
perploug
9ee1584ede Initial PublishedContent service for niceUrl access 2013-10-03 20:58:16 +02:00
perploug
a3d77b7e72 Adds RTE and stylesheet services 2013-10-03 20:57:36 +02:00
perploug
14e1e741ed Added configuration fetching to tinymce service 2013-10-03 20:53:34 +02:00
perploug
94f72b3938 minor log.resource docs update 2013-10-03 20:53:16 +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
08660704cc Core.StringExtensions - adjust to new default IShortStringHelper (see f64b8d6) 2013-10-03 18:10:51 +02:00
Stephan
4c13dbf8b7 Core.StringExtensions - fix methods that should be extension methods 2013-10-03 18:10:50 +02:00
Stephan
9a10863760 Core.EnumerableExtensions - bugfix f9663a9 2013-10-03 18:10:48 +02:00
Tim Geyssens
74e414d858 Related links prop editor WIP 2013-10-03 16:46:32 +02:00
Tim Geyssens
6a1072e918 Related links prop editor: more WIP 2013-10-03 15:09:52 +02:00
Tim Geyssens
fb1ea4b880 Related links prop editor: more work 2013-10-03 14:58:12 +02:00
Tim Geyssens
cbe566302c Related links prop editor: first attempt at UI 2013-10-03 14:20:13 +02:00
Tim Geyssens
4ace6e10db Related links prop editor: adds RelatedLinksPropertyEditor.cs 2013-10-03 13:27:13 +02:00
Tim Geyssens
bd32c7cc4a Related links prop editor: adds controller / view stubs 2013-10-03 13:05:13 +02:00
Shannon
25a0c595e7 Fixes up the DashboardController to use the new configuration classes, creates DashboardSecurity (which needs some unit testing) and removes all that ugly code. 2013-10-03 19:00:31 +10:00
Shannon
3d3be5ecbc Renames Control to DashboardControl so it has some meaning. 2013-10-03 17:59:23 +10:00
Shannon
1730005a58 Updates web.config template and transform for new dashboard section. 2013-10-03 17:54:10 +10:00
Shannon
b9257fceeb New dashboard config classes all tested 2013-10-03 17:50:42 +10:00
Shannon
e2f9b1c7d9 Got the dashboard config section classes working with tests, now to add more tests 2013-10-03 17:17:53 +10:00
Shannon
03b1c9e5ee Fixed build issue, started adding dashboard config section as real .net section. 2013-10-03 17:06:58 +10:00
Shannon
85098b84f7 started proxying events to the old tree but think it should be done opposite. 2013-10-03 15:57:32 +10:00
Shannon
936be3934b Updated MenuItemCollection with MenuItemList for full featured List access to the items. Added the MenuRendering event to TreeController, updated the tree controller events to be TypedEventHandler's though developers will need to cast the TreeController to the type they are expecting - still better than 'object'. 2013-10-03 15:05:48 +10:00
Shannon
ed8f22c371 Completes: U4-2829 Allow for JSON objects to be saved/retrieved by property editors - OH YEAH!! 2013-10-03 13:52:33 +10:00
Shannon
969abb5057 Fixes merge issues 2013-10-03 12:53:26 +10:00
Shannon
21c0152131 Merge remote-tracking branch 'origin/6.2.0' into 7.0.0 
Conflicts:
	src/Umbraco.Tests/BusinessLogic/BaseTest.cs
	src/Umbraco.Web.UI/install/steps/theend.ascx
	src/Umbraco.Web.UI/umbraco/Default.aspx
	src/Umbraco.Web.UI/umbraco/controls/GenericProperties/GenericProperty.ascx
	src/Umbraco.Web.UI/umbraco/developer/Xslt/editXslt.aspx
	src/Umbraco.Web.UI/umbraco/dialogs/ChangeDocType.aspx
	src/Umbraco.Web.UI/umbraco/umbraco.aspx
	src/Umbraco.Web/UmbracoContext.cs
	src/Umbraco.Web/umbraco.presentation/LegacyClasses.cs
	src/Umbraco.Web/umbraco.presentation/install/steps/Definitions/LegacyClasses.cs
	src/Umbraco.Web/umbraco.presentation/install/steps/LegacyClasses.cs
	src/Umbraco.Web/umbraco.presentation/library.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Controls/LiveEditingToolbar.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/CreateModule/CreateModule.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/DeleteModule/DeleteModule.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/MacroModule/MacroModule.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/ImageUploader.aspx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/SkinCustomizer.ascx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/SkinModule.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/UnpublishModule/UnpublishModule.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadTemplates.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/controls/macroParameterControl.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScripting.ascx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScriptingTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/MediaTypeTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/ScriptTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/contentTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/mediaTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/dashboard.aspx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/developer/DataTypes/editDatatype.aspx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/login.aspx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/umbraco.aspx.cs
	src/Umbraco.Web/umbraco.presentation/umbracobase/baseHttpModule.cs
	src/Umbraco.Web/umbraco.presentation/umbracobase/restExtension.cs
	src/umbraco.businesslogic/Utils/TypeFinder.cs
	src/umbraco.cms/businesslogic/Packager/Installer.cs
	src/umbraco.cms/businesslogic/Packager/PackageActions/addRestExtension.cs
	src/umbraco.cms/businesslogic/Packager/PackageActions/addXsltExtension.cs
	src/umbraco.cms/businesslogic/skinning/Skin.cs
	src/umbraco.cms/businesslogic/skinning/tasks/AddStyleSheetToTemplate.cs
	src/umbraco.cms/businesslogic/skinning/tasks/ModifyCss.cs
	src/umbraco.cms/businesslogic/skinning/tasks/ModifyTemplate.cs
	src/umbraco.controls/CodeArea.cs
	src/umbraco.controls/ProgressBar.cs
	src/umbraco.editorControls/macrocontainer/Editor.cs
 2013-10-03 12:51:46 +10:00
Shannon
86430f1b01 Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 2013-10-03 12:46:01 +10:00
Shannon
55247fe31d Finally got around to changing all calls to umbraco.IO to Umbraco.Core.IO - that'll clear up several hundreds of warnings :) 2013-10-03 12:45:40 +10:00
Shannon
6ac724951b Explicitly adds automapper to the UI proj so we don't get that strange YSOD that says it's not there sometimes. 2013-10-03 12:18:21 +10:00
Shannon
b0dfc90557 Added docs on creating trees and view path location conventions. 2013-10-03 12:11:22 +10:00
Shannon
b09a743beb Gets view paths to load in dynamically based on whether a core or plugin tree is rendering, this allows us to store view files based on conventions for packages. Completes: U4-2849 Ensure editor views, etc... can exist outside of the /umbraco folder for package devs 2013-10-03 11:25:26 +10:00
Shannon
2ed4206f93 Merge remote-tracking branch 'origin/6.2.0' into 7.0.0 
Conflicts:
	src/Umbraco.Web/WebBootManager.cs
 2013-10-03 09:01:24 +10:00
Shandem
a806f40093 Merge pull request #146 from mortenbock/6.2.0 
Custom ProfilingViewEngine
 2013-10-02 15:53:58 -07:00
perploug
4283734a94 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-10-02 19:23:57 +02:00
perploug
6c20815210 Initial commit of rte prevalue editor 2013-10-02 19:23:36 +02:00
perploug
a371ebe841 Progressbart convert to css3 from gif 2013-10-02 19:23:20 +02:00
perploug
92a32a8f8d rollback dialog polish 2013-10-02 19:23:04 +02:00
perploug
bb1a47aa81 Permissions dialog polish 2013-10-02 19:22:54 +02:00
perploug
6126a52156 child action icon alignment tweak 2013-10-02 19:22:34 +02:00
mortenbock
24020cfea3 Make sure the profilingengine doesn't wrap itself 2013-10-02 18:30:59 +02:00
mortenbock
9ec30860b0 Wrap all ViewEngines in a profiler 
Wrap all ViewEngines in a custom profiler view engine, using the
ProfilerResolver to track performance
 2013-10-02 17:48:44 +02:00
Stephan
3ee4399fca Merge remote-tracking branch 'origin/6.2.0' into 7.0.0 
Conflicts:
	src/Umbraco.Core/ObjectResolution/Resolution.cs
 2013-10-02 17:40:03 +02:00
Stephan
f64b8d680d Core.StringExtensions - switch over to the new DefaultShortStringHelper 2013-10-02 16:54:56 +02:00
Stephan
f9663a9e80 Core.EnumerableExtensions - refactor InGroupsOf to enumerate source only once 2013-10-02 16:54:47 +02:00
Shannon
dc42c1ebb7 More work on streamlining package development for views and conventions. 2013-10-02 21:03:51 +10:00