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

1647 Commits

Author SHA1 Message Date
perploug
100ab5643a Localizing cotnent and media editors main grid 2013-10-16 20:37:12 +02:00
Jan Skovgaard
3abd4df8bd Enabled lists plugin in tinymce by default 
Fixes http://issues.umbraco.org/issue/U4-3023
 2013-10-16 16:01:17 +02:00
Jan Skovgaard
ea239e6122 Missing languages in RTE insert link dialogue 
Fixes this issue: http://issues.umbraco.org/issue/U4-2551
 2013-10-16 15:53:56 +02:00
Sebastiaan Janssen
76c86daf24 Update da.xml 2013-10-16 11:50:12 +02:00
Shannon
6400e7988f adds a logout.aspx for legacy reasons in case an inline page redirects to there 2013-10-16 13:33:08 +11:00
Lars-Erik Aabech
607a52883a Change doctype - default suggestion none when no matching alias. 2013-10-15 13:21:30 +02:00
Shannon
35545019a5 Fixes: U4-3111 Codeeditorsave.asmx always appear to fail - might need to be backported to 6.2 2013-10-15 15:51:30 +11:00
Shannon
0312b947e1 Fixes template editor to re-enable ajax saving - might need back porting to 6.2 2013-10-15 15:38:08 +11:00
parnar
2ed7fc06ea translated some keys in he.xml language file 2013-10-11 19:35:34 +02:00
perploug
b92f5c4719 ui.xml file changes 2013-10-11 12:19:39 +02:00
perploug
11441fb1b1 ui.xml release files 2013-10-11 12:16:24 +02:00
Sebastiaan Janssen
14ba484fc1 Don't include release configs in final package 2013-10-11 12:11:47 +02:00
Stephan
0f894da7a6 Merge remote-tracking branch 'origin/7.0.0-pubcontent' into 7.0.0 2013-10-11 12:07:26 +02:00
perploug
133e2fdba7 tree config updates 2013-10-11 11:48:26 +02:00
Stephan
7718adfca1 Merge remote-tracking branch 'origin/7.0.0' into 7.0.0-pubcontent 
Conflicts:
	src/Umbraco.Core/Models/DataTypeDefinition.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Web/Security/Providers/MembersMembershipProvider.cs
	src/umbraco.providers/members/MembersMembershipProvider.cs
 2013-10-11 11:11:18 +02:00
perploug
9a0679d41c docs update 2013-10-11 10:54:39 +02:00
Shannon
42dd48a3d1 removed editmember.aspx 2013-10-11 17:32:04 +11:00
Shannon
937b308444 Streamlines form and form validation with new val-form-manager (replaces a couple of other directives). Fixes styling on the umb-content-name, removes the test MyPackage stuff from app-plugins. 2013-10-11 15:44:49 +11:00
perploug
3d8138f3ef Added configuration to the multinode picker 2013-10-10 21:15:04 +02:00
perploug
e67f85695c fixes U4-3054 icon picker viewstate 2013-10-10 19:47:12 +02:00
perploug
088253ebfd minor content editor tweaks 2013-10-10 19:46:46 +02:00
perploug
e0da6f2dec remove old membersearch 2013-10-10 19:41:41 +02:00
Stephan
8a8b09141f Merge remote-tracking branch 'origin/7.0.0' into 7.0.0-pubcontent 
Conflicts:
	src/Umbraco.Tests/TestHelpers/BaseWebTest.cs
	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/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-10 16:15:23 +02:00
perploug
e34e63db51 hides empty divs on initial load 2013-10-10 13:34:02 +02:00
Shannon
b512376c5c more member editor updates 2013-10-10 18:46:28 +11:00
perploug
912a111f14 broken da.xml file 2013-10-09 15:54:18 +02:00
Shannon
5d71e08922 Fixes manifest file again - just tested that the app loads even if a manifest is invalid 2013-10-09 18:22:27 +11:00
Shannon
e51b43084b Fixes: U4-2762 Handle errors in package.manifest & fixes manifest stylesheet parsing with unit test 2013-10-09 18:13:24 +11:00
Shannon
3c38b335a6 Converts DlrScripting & xslt to the correct webforms structure. 2013-10-09 12:07:50 +11:00
Shannon
3a8bbcc8fc Fixes up the PartialView, PartialViewMacro and Xslt create dialogs after merge and ensures PartialView dialog is up to v7 legacy standard 2013-10-09 11:57:14 +11:00
Shannon
d281f97659 Merge remote-tracking branch 'origin/6.2.0' into 7.0.0 
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-09 11:12:33 +11:00
Sebastiaan Janssen
0184b396be Whoops! Left a weird linebreak in there 2013-10-08 19:08:30 +02:00
Sebastiaan Janssen
8b2e2f8447 Create appSettings.config / connectionString.config if they don't exist yet 2013-10-08 19:00:57 +02:00
perploug
7c5b6851a1 Added standard js libs to usercontrol proxy 2013-10-08 15:29:53 +02:00
perploug
a2ebb1b06f support for loading actions directly from search results 2013-10-08 15:04:47 +02:00
Stephan
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
perploug
30f147a9d3 excluding appsettings and connectionstrings config 2013-10-08 10:27:22 +02:00
perploug
dd4827493b missing files in sln 2013-10-08 09:31:30 +02:00
Shannon
883a662240 Moves tree/menu models into the Models.Trees namespace 2013-10-08 12:38:27 +11:00
perploug
4b942dcc32 Working link picker and TinyMCE plugin 2013-10-07 15:15:02 +02:00
Sebastiaan Janssen
12b7a9d874 Argh, didn't save csproj file before committing. 2013-10-07 13:20:34 +02:00
perploug
f676ce6ac2 Remove missing file to unbreak build 2013-10-07 10:08:48 +02:00
perploug
60a81ac879 Allows legacy editors to sync the tree 2013-10-07 09:48:08 +02:00
Sebastiaan Janssen
fd5de171c9 Merge branch '6.2.0' of github.com:umbraco/Umbraco-CMS into 6.2.0 2013-10-06 16:45:31 +02:00
Sebastiaan Janssen
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
Sebastiaan Janssen
9f3784aaed U4-1242 Template editor sometimes stops editing. 2013-10-05 19:26:01 +02:00
Sebastiaan Janssen
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
Sebastiaan Janssen
2d83ba06a5 Fix small styling issues in installer 2013-10-05 19:18:11 +02:00
perploug
5060dab7a5 adds getpath to contentController 2013-10-04 14:01:07 +02:00
perploug
418a29cbbf Odd, missing config files crashed the site 2013-10-04 11:18:57 +02:00