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

1477 Commits

Author SHA1 Message Date
Shannon
8327b8aa0e Completes: U4-3792 Move appSettings, connectionStrings back to web.config 2013-12-06 11:52:47 +11:00
perploug
b6bcdcb351 fixes: U4-3728 Non-Mandatory Numeric property gives error when left blank 
also fixes dimming on buttons fails when validation fails
 2013-12-05 08:32:53 +01:00
perploug
bdc0ae7e2f fixes: U4-3707 Change password under users is not translated 
translated, and added missing danish keys
 2013-12-04 12:55:23 +01:00
perploug
b6baa9af3d removes webdavModule from web.config 2013-12-04 09:24:04 +01:00
Shannon
176ec0edc0 Fixes: U4-3651 What is the "Pick multiple items" prevalue on MNTP for? and removes the remaining uGoLive references. 2013-12-04 17:13:26 +11:00
Shannon
ad52b86336 Fixes scrollbar issue with directory/file browser and xslt visualize 2013-12-04 15:29:51 +11:00
Shannon
5b7e9c712e Merge remote-tracking branch 'origin/6.2.0' into 7.0.1 
Conflicts:
	src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/ModuleInjector.aspx
	src/Umbraco.Web.UI/umbraco/Umbraco.aspx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/ImageUploader.aspx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/dashboard.aspx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/developer/Cache/viewCacheItem.aspx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/developer/Macros/assemblyBrowser.aspx.cs
 2013-12-04 13:50:55 +11:00
Shannon
33aa4e2062 Fixes potential xss 2013-12-04 13:33:24 +11:00
Shannon
1efa75c891 Fixes potential xss 2013-12-04 12:42:40 +11:00
Shannon
2a05687c8b Merge remote-tracking branch 'origin/6.2.0' into 7.0.1 
Conflicts:
	src/Umbraco.Core/Persistence/Relators/PropertyTypePropertyGroupRelator.cs
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
	src/Umbraco.Core/PluginManager.cs
	src/Umbraco.Tests/Services/ContentServiceTests.cs
	src/Umbraco.Web.UI/install/Default.aspx.cs
	src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/ModuleInjector.aspx
	src/Umbraco.Web.UI/umbraco/Umbraco.aspx.cs
	src/Umbraco.Web.UI/umbraco/dashboard.aspx
	src/Umbraco.Web.UI/umbraco/dialogs/sort.aspx
	src/Umbraco.Web.UI/umbraco/dialogs/umbracoField.aspx
	src/Umbraco.Web.UI/umbraco/logout.aspx
	src/Umbraco.Web.UI/umbraco/umbraco.aspx
	src/Umbraco.Web/UI/Pages/UmbracoEnsuredPage.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/install/LegacyClasses.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/dashboard.aspx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/logout.aspx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/umbraco.aspx.cs
	src/umbraco.cms/businesslogic/Packager/Installer.cs
	src/umbraco.providers/members/MembersMembershipProvider.cs
 2013-12-03 18:10:00 +11:00
Shannon
d4514844f8 Fixes a few other potential xss entry points 2013-12-03 17:58:42 +11:00
Shannon
6b7a495d19 Fixes a few other potential xss entry points and cleans up some legacy webforms files 2013-12-03 16:38:58 +11:00
Shannon
601eb0bf38 Fixes a few other potential xss entry points and cleans up some legacy webforms files 2013-12-03 16:28:51 +11:00
Shannon
a7e32e97e3 Fixes xss issue 2013-12-03 15:40:12 +11:00
perploug
7baa81c2df missing en translation for login dialog 2013-11-29 12:00:03 +01:00
perploug
8d2b52a5b0 fixes: U4-3749 Login page is not translated 2013-11-29 11:58:58 +01:00
Shannon
48b3806129 adds umbraco session id to UserData so we can use for csrf 2013-11-29 12:42:50 +11:00
Shannon
9fc8e18881 Fixes csrf issue 
Conflicts:
	src/Umbraco.Web.UI/config/ClientDependency.config
	src/Umbraco.Web.UI/umbraco/logout.aspx
	src/Umbraco.Web.UI/umbraco/umbraco.aspx
	src/Umbraco.Web/umbraco.presentation/install/LegacyClasses.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/logout.aspx.cs
 2013-11-29 12:17:58 +11:00
Shannon
250276bbd4 Merge branch '6.1.6-U4-3619' into 6.2.0 2013-11-29 11:26:01 +11:00
Shannon
af29f61478 Fixes csrf issue 2013-11-29 11:10:25 +11:00
perploug
a0dead872b DA lang file updates 2013-11-28 15:35:06 +01:00
perploug
ff52755636 Media and content tree root node translation 2013-11-28 13:26:05 +01:00
perploug
de1e3d150f Missing script translation 2013-11-28 13:05:36 +01:00
Shannon
50e10155e7 Completes: U4-3712 Allow c# property editors to have custom js injected into the js initialization block so they can load in angular controllers 2013-11-28 14:27:58 +11:00
Shannon
478b7cde42 Removes uGoLive from the core (for now until it is rebuilt against v7 ) 2013-11-28 10:51:54 +11:00
Shannon
00518f8451 improves security and ensures the server vars cannot be loaded without authentication, they will get lazy loaded once authenticated and changed the controllers to listen for the 'ready' event instead. 2013-11-27 17:38:59 +11:00
Shannon
6c57222a2e removes committed file that shouldn't have been there. 2013-11-26 13:12:59 +11:00
perploug
aa75a6bf9f Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-11-21 11:14:25 +01:00
perploug
14a0efde01 Minor width adjustment 2013-11-21 11:13:53 +01:00
perploug
309dd5d4a2 content dashboard 2013-11-21 11:09:20 +01:00
Sebastiaan Janssen
a04aef9b98 U4-3623 Text corrections in install wizard 2013-11-21 10:17:52 +01:00
Niels Hartvig
9f046f9945 Updates default dashboards 2013-11-21 09:58:27 +01:00
Shannon
ffeed58f5d Fixes: U4-3576 When editing file based items and changing the file name - we need to change the route location 2013-11-21 17:23:48 +11:00
perploug
c6caa6aae7 Missing dictionary items 2013-11-20 15:59:25 +01:00
perploug
1b1642ce46 fixes broken script dialog and tree sync 2013-11-20 15:33:24 +01:00
perploug
31d0450d6c fixes broke xslt visualizer 2013-11-20 15:08:04 +01:00
perploug
a71d18f352 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-11-20 14:55:09 +01:00
perploug
12c982f170 ups, forgot an alert() 2013-11-20 14:54:27 +01:00
Sebastiaan Janssen
35af370f70 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-11-20 14:51:50 +01:00
Sebastiaan Janssen
2beb3c5b4c Merge branch 'master' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 
Conflicts:
	.gitignore
 2013-11-20 14:50:57 +01:00
perploug
f7d407e9fd various dialogs fixes 2013-11-20 14:37:46 +01:00
perploug
d67db8a90a Fixes ctrl+s hotkeys in legacy editors 2013-11-20 14:37:28 +01:00
Sebastiaan Janssen
7e70253e1c U4-3340 Installer: Make SQL CE Default option 2013-11-19 16:06:14 +01:00
Sebastiaan Janssen
313b831559 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-11-19 15:13:18 +01:00
Sebastiaan Janssen
355137f982 U4-3469 Umbraco 7 + MVC 4 + nuget, web.config error 2013-11-19 15:12:47 +01:00
perploug
d1c7a3764f enables the media picker to select current folder 2013-11-19 14:21:17 +01:00
Shannon
5fc82fef18 Fixes: U4-3440 Tempates (MVC Views) tree sync doesn't work correctly 2013-11-19 17:17:39 +11:00
Shannon
5bb68f32bf Fixes up editorState - ensures that it is set in all of the correct places (removes appState editingEntity and references), ensures that setting 'current' is not possible, ensures that editorState is reset on all route changes, adds unit tests for getting/setting editorState. 2013-11-19 10:39:18 +11:00
Sebastiaan Janssen
e922ca88f2 U4-3553 Settings - Document Type - Tabs do not work 2013-11-18 18:54:55 +01:00
Sebastiaan Janssen
64d5533274 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-11-18 18:11:46 +01:00