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

64 Commits

Author SHA1 Message Date
Shannon
371b1817ea Merge remote-tracking branch 'origin/7.0.0' into 7.0.0--property-editor-guid-to-alias 
Conflicts:
	src/Umbraco.Core/Configuration/LegacyUmbracoSettings.cs
	src/Umbraco.Core/Persistence/Migrations/Syntax/Alter/Expressions/AlterColumnExpression.cs
	src/Umbraco.Core/PropertyEditors/TinyMcePropertyEditorValueConverter.cs
	src/Umbraco.Core/XmlHelper.cs
	src/Umbraco.Tests/ObjectExtensionsTests.cs
	src/Umbraco.Web/PropertyEditors/RteMacroRenderingPropertyEditorValueConverter.cs
	src/Umbraco.Web/Routing/DefaultUrlProvider.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/macro.cs
 2013-09-17 00:27:17 +10:00
Shannon
09b68a75be Simplifies the IContentSection so that there's no nesting of interface classes and updates some unit tests 2013-09-16 15:52:59 +10:00
Shannon
81b43545c1 Updated the remainder of the legacy UmbracoSettings calls to use the new format, now to just fix up the unit tests 2013-09-16 12:36:12 +10:00
perploug
852a946051 Fixes the grid height issues 2013-09-12 14:38:53 +02:00
perploug
4719caf653 Changes span size on c# panel 2013-09-11 14:02:45 +02:00
perploug
3aa9873db9 legacy Editmacro editor tweaks 2013-09-10 23:33:26 +02:00
perploug
7139fda098 Adds pane cssclass attr 2013-09-10 15:06:46 +02:00
Shannon
d257835cb5 Merge remote-tracking branch 'origin/6.2.0' into 7.0.0 
Conflicts:
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/Models/ContentTests.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/umbraco/create/PartialViewTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/webservices/legacyAjaxCalls.asmx.cs
 2013-08-28 11:08:23 +10:00
perploug
baaecedac2 Finetuning html adding prevalue editors 2013-08-22 14:46:43 +02:00
Jeremy Pyne
f3e8359e36 Added plugin to all code area editors to suppressed normal browser Find function with internal code mirror functions. This is needed for search to work on long documents and also adds more advanced regex search and replace options including: 
Ctrl-F / Cmd-F
Start searching
Ctrl-G / Cmd-G
Find next
Shift-Ctrl-G / Shift-Cmd-G
Find previous
Shift-Ctrl-F / Cmd-Option-F
Replace
Shift-Ctrl-R / Shift-Cmd-Option-F
Replace all

Demo: http://codemirror.net/demo/search.html
 2013-08-07 16:08:40 -04:00
Shannon
500d25fd5a Merge remote-tracking branch 'origin/6.1.3' into 7.0.0 
Conflicts:
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/Services/Importing/ImportResources.Designer.cs
 2013-07-24 13:10:43 +10:00
Shannon
7164f23a98 Fixes up validation styling and the validation summary close button display. 2013-07-24 11:31:31 +10:00
Shannon
4df80eb976 Merge remote-tracking branch 'origin/6.1.3' into 7.0.0 
Conflicts:
	src/Umbraco.Core/Models/PropertyExtensions.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/packages.config
	src/Umbraco.Web/umbraco.presentation/umbraco/webservices/legacyAjaxCalls.asmx.cs
 2013-07-23 13:41:42 +10:00
Shannon
41c920a4ec Updated to latest CDF version which contains some fixes. 2013-07-22 11:29:32 +10:00
Shannon
deceec3fa2 Merge remote-tracking branch 'origin/6.1.3' into 7.0.0 
Conflicts:
	src/Umbraco.Core/Models/Membership/IUser.cs
	src/Umbraco.Web/Cache/CacheRefresherEventHandler.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/packages.config
	src/umbraco.businesslogic/packages.config
	src/umbraco.cms/Actions/ActionNew.cs
 2013-07-12 11:03:49 +10:00
Morten Christensen
93def731ef Fixes #U4-2466 2013-07-05 10:51:19 +02:00
Per Ploug
d9e79666ca css-template editor tweaks, more compat polish 2013-07-04 13:33:06 +02:00
Per Ploug
693c0cb2a5 working modals 2013-07-03 13:55:33 +02:00
Morten Christensen
f06a6f42da Updating nuget dependency for ClientDependency 2013-07-03 11:20:42 +02:00
Shannon
7417e1706e Fixed naming conventions and changed new classes to internal since we shouldn't expose these publicly (they are already legacy) 2013-06-27 15:27:05 +10:00
Per Ploug
d214935ecb Panel, Tabview, Propertie controls converted 
Changed the html to output bootstrap html, masterpages load our belle
css + bootstrap.min.js
 2013-06-26 11:12:06 +02:00
Shannon
39d7676bee Got the legacy editors working and iframe implementation almost done! 2013-06-25 08:54:36 +10:00
Shannon Deminick
76bbdcd32c Merge with 6.1.2 2013-06-03 13:36:40 -10:00
Shannon Deminick
932115585e Fixes: #U4-2315 - CDF grouping issue, updated to new version 2013-06-03 13:35:41 -10:00
Shannon Deminick
522d909d37 Merge with 6.1.0 2013-05-28 14:20:43 -10:00
Shannon Deminick
5041e6fcc4 Updated to latest CDF version that has a few bug fixes and added a CDF logger. 2013-05-28 13:24:48 -10:00
Shannon Deminick
8b841e19eb Upgrades required projects to .Net 4.5 2013-05-26 13:33:43 -10:00
Shannon Deminick
fc44138d9e Fixes Stylesheet tree-syncing. Converts editStylesheets over to correct web forms structure and 
implements the correct Javascript.
 2013-05-07 20:49:58 -10:00
Shannon Deminick
979fe46e9b Updated CDF to 1.6.0.0 2013-04-18 00:55:40 +06:00
Shannon Deminick
a38f0af49b Merge with 6.0.4 2013-04-17 23:47:33 +06:00
Shannon Deminick
de0e47d7ef Merge with 4.11.7 2013-04-17 22:50:31 +06:00
Shannon Deminick
096c5ad69f Fixes: #U4-485, changes name field from saving to the db if it is empty. cleans up some code. 2013-04-17 22:05:10 +06:00
leekelleher
b6ec364156 Updated references to the new constants for Application and MediaType aliases. 2013-03-22 13:13:05 +00:00
Shannon Deminick
7deae8ea37 Update to latest examine (bug fixed), started Examine Management dashboard FF project. 2013-02-23 23:00:31 +06:00
Sebastiaan Janssen
87fee572ff Enable nuget package restore for teamcity, upgrade examine dll 2013-02-22 09:47:23 -01:00
Shannon Deminick
5602701645 Fixes uGoLive id and changes dashboard ascx to use CDF to load scripts/styles and using the knockout version shipped in the core. 
Removes duplicate tree from the config.
 2013-02-01 06:05:39 +06:00
Sebastiaan Janssen
1304a9d791 Fixed U4-1495 Include Umbraco assemblies' XML files to make use of comments 2013-01-18 08:44:39 -01:00
Shannon Deminick
b292cb3ab3 Crated InsertMacroSplitButton webforms control instead of the hacky js code used to insert the split button in the template editor. 
Have implemented it now in the EditView (will transition over its use in editTemplate soon but is low priority).
Have got the js callbacks working now for inserting a macro for the mvc editor but need to implement the correct syntax. Also need
to migrate and update the editMacro dialog screen to check if we are rendering for MVC or not and if it is MVC then use the correct
syntax.
 2012-12-31 18:39:36 +03:00
Morten Christensen
0cdb7af3eb Adding internal constructor overloads to Document, Content and CMSNode for better setup of legacy objects using new objects. 2012-12-12 18:44:55 -01:00
timothy.beutels@bluecherry.be
7d26ae520e U4-580 Fixes an issue introduced by the bugfix for U4-580 in fdec8c2f6a62 
The preview button got pushed out of view when the rte toolbar was loaded.
 2012-12-11 15:10:16 -01:00
Morten Christensen
78b05eb44c Correcting SolutionInfo and AssemblyInfo, so assembly version is correct for all shipped assemblies 2012-11-26 07:46:29 -01:00
Morten Christensen
c7693386a2 Correcting a few unit tests after conditions have changed. 2012-11-23 08:35:58 -01:00
jeavonleopold
cf9e786e45 U4-1241 Fix - BaseTreePicker GetItemBreadcrumbs causes YSOD for Property Editors that do not store numeric ID's 2012-11-22 15:17:12 +00:00
Shannon Deminick
159718bf4f Updated sln to use Nuget for ClientDependency references, ensures that all config changes 
are backward compatible. Have updated the new ClientDependency.config file with the new
features, though these are not required for existing installs but we should advise to merge
the new changes in.
Added ClientDependency.Core.Mvc to the UI project so that it will now ship with this library.
 2012-11-21 08:01:23 +05:00
Shannon Deminick
b9ff3ca729 updated proj references, was getting warnings in build that they could not be referenced. Might be a VS 2012 thing. 2012-11-20 07:41:12 +05:00
Tom Fulton
78d57e89d5 U4-408: Prevent dragging of toolbar icons by adding onmousedown="return false" 2012-10-25 16:36:21 +04:00
Sebastiaan Janssen
4397319ac3 Add z-index too treePickerToolTip to get it on top when media picker preview is on 2012-10-23 08:24:33 -02:00
funka@WETWIRED
38fc6c980d Resolves redundant BaseTreePicker script initialization (U4-192) 2012-10-17 05:36:22 +07:00
Shannon Deminick
689fe2a44f Fixes issue with wrapping the UmbEditor init in doc ready causing template editing not to work. 2012-10-12 09:15:33 +05:00
Casey Neehouse
a3b87a1d8b Wraps Code Editor initialization in a document ready call to correct an IE7 
sizing bug.
 2012-10-11 13:02:36 +04:00