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

56 Commits

Author SHA1 Message Date
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
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
cf462bd28e Fixes starter kit installer with no skins 2013-09-25 18:49:19 +10:00
Shannon
a939c14de9 Completes: U4-2917 Remove canvas/live editing support, U4-2916 Remove skinning support 2013-09-25 17:57:44 +10:00
Shannon
3d3ea12aba Gets the parameter editor resolver to resolve parameter editors from: c# parameter editors, c# property editors that have been flagged as a param editor, manifest parameter editors and manifest property editors flagged as param editor. Fixes more of the macro editor. 2013-09-20 09:47:01 +10:00
Shannon
f62546a308 Adds some other macro parameters fixes up more of the macro editor, all seems to be working there now and have added validation (which never existed before :( 2013-09-19 18:36:36 +10:00
Shannon
c0a303b328 Gets macro editor working with new db changes and using new MacroService data layer 2013-09-19 17:34:57 +10:00
Shannon
bbd5747177 Differentiates between a property and parameter editor, though they are similar they are still different. Renames ValueEditor to PropertyValueEditor, creates new parameter editor base classes. 2013-09-19 14:55:00 +10:00
perploug
2cea746644 Updates legacy editor visuals 2013-09-18 13:11:03 +02:00
perploug
7642619407 Updating legacy edtors in developer section 2013-09-11 14:04:26 +02:00
perploug
3aa9873db9 legacy Editmacro editor tweaks 2013-09-10 23:33:26 +02:00
perploug
17833022a3 Update dev section editors 2013-09-10 18:03:50 +02:00
perploug
d5846a5a4c delete unneedded files 2013-09-10 18:01:52 +02:00
Sebastiaan Janssen
e9b9fb15c1 Can't install starterkits message was always showing, even if install folder was present 2013-09-01 16:47:28 +02:00
dampee
fb03de37ce U4-2638 Developer/Packages/Install Starterkit give 500 server error 2013-08-19 12:51:13 +02:00
Sebastiaan Janssen
6766aa9732 Merge pull request #41 from michielvoo/u4-667 
U4-667
 2013-07-19 13:19:30 +02:00
Sebastiaan Janssen
5bd55bdd09 Merge branch '6.0.7' into 6.1.2 2013-06-21 17:33:42 +02:00
Sebastiaan Janssen
96cec0b407 U4-2410 EditRelationType.aspx missing virtual path - 6.0.6 2013-06-21 16:30:44 +02:00
Shannon
5719820fad Merge branch '6.0.7' into 6.1.2 
Conflicts:
	.gitignore
	src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackages.cs
 2013-06-18 14:18:17 +10:00
leekelleher
e0c68a8e1c Resolves #U4-184 Upgrade package when installing a newer version. 
Multiple package versions can be installed, only the latest version is listed under "Installed Packages".
When the installed package is viewed, a list of previously installed versions (of that package) are listed.
 2013-06-10 13:55:58 -01:00
Shannon Deminick
6f26f7b57c Patching from 6.1 2013-05-08 18:08:55 -10:00
Shannon Deminick
bda2614290 Patching from 6.1 2013-05-08 17:49:48 -10:00
Shannon Deminick
dd1983dc55 Fixes macro script editor and syncing, changes over editPython to use correct webforms file format. 2013-05-08 17:01:48 -10:00
Shannon Deminick
78cd51d333 Fixed xslt editing and syncing. 2013-05-08 16:33:09 -10:00
Shannon Deminick
d6d630cb2c Merge with 6.0.4 2013-04-19 04:40:49 +06:00
Shannon Deminick
35a698cdc9 Merge with 4.11.7 2013-04-19 04:40:13 +06:00
Shannon Deminick
e9c4a031c9 Fixes up directory browser and removes legacy request params which are prone to xss 2013-04-19 04:10:35 +06:00
Shannon Deminick
25b9262cf1 Merge with 4.11.7 2013-04-10 03:51:53 +06:00
Shannon Deminick
436322f58c updates #U4-2070 for directoryBrowser.aspx 2013-04-10 02:34:44 +06:00
Shannon Deminick
7edbc34e6c Merge with 4.11.7 2013-04-05 06:46:13 +06:00
Shannon Deminick
60b6608289 patch for fix #U4-2027 2013-04-05 06:42:52 +06:00
Shannon Deminick
f2293e01fa Merge with 6.0.4 2013-04-10 04:15:26 +06:00
Shannon Deminick
9e239f135d Fixes: #U4-2027, changes DirectoryBrowser over to use correct webforms file structure, cleans up (a teeny bit) 
how this page is structured, at least its not all inline c# code with inline styles.
 2013-04-05 06:06:10 +06:00
Shannon Deminick
1be3af1e31 Working on #U4-1358 - moving Base page classes to their correct location/assembly. Migrated all installation webforms files and associated helper files to 
their correct locations/namespaces/assemblies and obsoleted all of the old ones and ensure the old webforms files don't exist where the obsoleted ones were.
Fixes a security issue with the installer ajax service (used to be p.aspx, now is InstallerRestService.aspx)
 2013-02-03 05:06:11 +06:00
Sebastiaan Janssen
c96891ad62 Merge with default 2013-01-12 17:33:41 -01:00
Sebastiaan Janssen
930e6a0989 Forgot some parenthesis .. 2013-01-12 17:29:48 -01:00
Sebastiaan Janssen
64c05cb50e Merge with 4.11.3 2013-01-12 14:52:14 -01:00
Sebastiaan Janssen
6a1fb52b25 Fixes U4-1442 This must be a bug. 4.11.2.2 can't create Macro. 2013-01-12 14:41:21 -01:00
Shannon Deminick
89332bf3f5 updated all editors using the new html 5 doc type to declare the content area below the ASP.Net page declarations 
(I didn't even know asp.net allowed having controls listed above)
 2013-01-10 05:08:52 +03:00
Sebastiaan Janssen
35c16097af Changed all editor to use the HTML5 doctype to make CodeMirror work better 2013-01-03 07:20:04 -01:00
Shannon Deminick
2a90e93a6f Updated partial view macro engine to support storing the files in the App_Plugins/[packagename]/Views/MacroPartials 
so they can be stored with a package and not pollute the main file system.
 2012-12-07 07:04:11 +05:00
Shannon Deminick
084e2ee37f Updated EditMacro to use CSS instead of hard coded styles throughout. 2012-12-09 01:22:53 +05:00
Shannon Deminick
5870452cc9 Updated assembly binding for MVC(4, and really any other MVC version that requires assembly binding if 
old libraries are built against old MVC versions).
Fixes a check for the ScriptingFile in for Partial View macros.
 2012-12-09 00:50:58 +05:00
Shannon Deminick
e0a71830fa Updated macro editor to support Partial view macros. Improves the JS in the editor (no more c# based js) which auto clears 
other fields and drop downs when other files are selected.
 2012-12-04 05:42:15 +05:00
Shannon Deminick
fb61c55fa7 Started on PartialViewMacros 2012-12-04 03:26:04 +05:00
Shannon Deminick
b337f4e5e4 Fixes issue with installing starter kits in the back office after upgrading the installer to install 
the starter kits properly. Not sure if this was actually working before 4.10 but in any case does work again
now and installs them the correct way whilst waiting for the app pool to restart (we need to put this in place
for the normal packages too!). Upgraded the StarterKits.aspx to have the correct code behind structure. Fixes issue
with missing or invalid referenced images.
 2012-11-03 07:18:12 +06:00
Niels Hartvig
ed3f715988 Container Document Types 2012-10-08 11:53:35 -02:00
Shannon Deminick
747675816d Changed editMacro over to use the correct codebehind structure. 2012-10-08 23:57:27 +05:00
Michiel van Oosterhout
c1cfcaf9ea Deprecated MacroProperty.Public because its value is ignored. Removed the checkbox 
for setting MacroProperty.Public from the macro editor.
 2012-10-06 20:51:00 -02:00
Sebastiaan Janssen
e3abd49276 Fix regression bug 2012-09-30 06:46:08 -02:00