0184b396be
Whoops! Left a weird linebreak in there
2013-10-08 19:08:30 +02:00
8b2e2f8447
Create appSettings.config / connectionString.config if they don't exist yet
2013-10-08 19:00:57 +02:00
7c5b6851a1
Added standard js libs to usercontrol proxy
2013-10-08 15:29:53 +02:00
a2ebb1b06f
support for loading actions directly from search results
2013-10-08 15:04:47 +02:00
31535e3bd8
Merge remote-tracking branch 'origin/6.2.0-pubcontent' into 7.0.0-pubcontent
...
Conflicts:
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
src/Umbraco.Web.UI/Umbraco/create/PartialView.ascx
src/Umbraco.Web.UI/Umbraco/create/PartialView.ascx.designer.cs
src/Umbraco.Web.UI/packages.config
src/Umbraco.Web.UI/umbraco/config/create/UI.xml
src/Umbraco.Web.UI/umbraco/create/DLRScripting.ascx
src/Umbraco.Web.UI/umbraco/create/xslt.ascx
src/Umbraco.Web/Umbraco.Web.csproj
src/Umbraco.Web/UmbracoHelper.cs
src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScripting.ascx
src/Umbraco.Web/umbraco.presentation/umbraco/create/PartialViewTasks.cs
src/Umbraco.Web/umbraco.presentation/umbraco/create/xslt.ascx
2013-10-08 11:21:38 +02:00
30f147a9d3
excluding appsettings and connectionstrings config
2013-10-08 10:27:22 +02:00
dd4827493b
missing files in sln
2013-10-08 09:31:30 +02:00
883a662240
Moves tree/menu models into the Models.Trees namespace
2013-10-08 12:38:27 +11:00
4b942dcc32
Working link picker and TinyMCE plugin
2013-10-07 15:15:02 +02:00
12b7a9d874
Argh, didn't save csproj file before committing.
2013-10-07 13:20:34 +02:00
f676ce6ac2
Remove missing file to unbreak build
2013-10-07 10:08:48 +02:00
60a81ac879
Allows legacy editors to sync the tree
2013-10-07 09:48:08 +02:00
fd5de171c9
Merge branch '6.2.0' of github.com:umbraco/Umbraco-CMS into 6.2.0
2013-10-06 16:45:31 +02:00
45ad51b8df
U4-2737 Snippets that are available when creating new MacroScripts should also be available for Partial Views
2013-10-06 16:45:21 +02:00
9f3784aaed
U4-1242 Template editor sometimes stops editing.
2013-10-05 19:26:01 +02:00
2ab2a5a9f3
Fix bug where Right ALT+S would save in Firefox instead of inserting the correct character
2013-10-05 19:23:57 +02:00
2d83ba06a5
Fix small styling issues in installer
2013-10-05 19:18:11 +02:00
5060dab7a5
adds getpath to contentController
2013-10-04 14:01:07 +02:00
418a29cbbf
Odd, missing config files crashed the site
2013-10-04 11:18:57 +02:00
0b907d4ae3
more work on link picker, added dialog service and views
2013-10-04 10:53:07 +02:00
db6b8930ab
Removes appsettings,connectionstring configs from the repo and adds them to the ignore list.
2013-10-04 12:18:05 +10:00
4d8a3f4453
Updated the proj file to create the appSettings, connectionString config files if they are missing, then we also ignore these files and remove them from the repo - just like the web.config
2013-10-04 12:15:35 +10:00
961928105c
Moves connectionStrings to external file, now to figure out how to deal with both of these files with multiple devs
2013-10-04 10:53:22 +10:00
c6229f131a
Moves appSettings to external file and updates the code that modifies the app settings.
2013-10-04 10:34:00 +10:00
ff3aebd4b1
Completes: U4-2893 Remove the entire umbraco.macroRenderings assembly
2013-10-04 10:01:57 +10:00
95f120e98f
Unpublishing button on the content editor
2013-10-03 22:18:44 +02:00
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
21d6209793
Removing unussed libraries, moving legacy tinymce plugins
2013-10-03 20:58:47 +02:00
a3d77b7e72
Adds RTE and stylesheet services
2013-10-03 20:57:36 +02:00
20ab14beb4
Made two minor corrections to the texts.
...
"Content>alias" changed to "Alternativ link" from "Alias", so it makes more sense.
"defaultdialogs>treepicker" changed to "Vælg" from "Vælg punkt", so it fits in the button.
2013-10-03 20:43:42 +02:00
1730005a58
Updates web.config template and transform for new dashboard section.
2013-10-03 17:54:10 +10:00
03b1c9e5ee
Fixed build issue, started adding dashboard config section as real .net section.
2013-10-03 17:06:58 +10:00
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
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
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
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
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
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
b0dfc90557
Added docs on creating trees and view path location conventions.
2013-10-03 12:11:22 +10:00
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
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
a371ebe841
Progressbart convert to css3 from gif
2013-10-02 19:23:20 +02:00
bb1a47aa81
Permissions dialog polish
2013-10-02 19:22:54 +02:00
dc42c1ebb7
More work on streamlining package development for views and conventions.
2013-10-02 21:03:51 +10:00
92efd6d645
Got menu items working with external packages to look for views by convention inside of their package folder.
2013-10-02 20:48:15 +10:00
6560865f61
Fixed view path conventions for menu items
2013-10-02 20:20:02 +10:00
89f7a31bef
Updates the Create/AddMenu overloads to ensure a name is specified, fixes all localization of all menu items for all new trees.
2013-10-02 20:00:01 +10:00
1090248223
Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0
2013-10-02 18:58:21 +10:00
880077f6e9
Created TagRepository, added foreign key to cmsTags.ParentId
2013-10-02 18:57:44 +10:00
ffc1b62b8a
Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0
2013-10-02 10:56:54 +02:00
Sebastiaan Janssen