yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,760 Commits 4 Branches 7 Tags
087ad2e1faa042f68e4e187959b2e2bc62944a40
Commit Graph

14760 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastiaan Janssen
e293051498 Merge branch '7.4.0' into temp-U4-7366 2015-12-03 10:43:10 +01:00
Sebastiaan Janssen
34a95353c2 Merge branch '7.4.0' of https://github.com/umbraco/Umbraco-CMS into 7.4.0 2015-12-03 10:31:37 +01:00
Mads Rasmussen
dbc519a9cf Fixes: U4-7478 Set cookie to remember last chosen list view layout 2015-12-03 10:14:51 +01:00
Mads Rasmussen
6729f39b4e Fixes: U4-7474 rename member tree path + set header name not to be locked 2015-12-03 09:44:52 +01:00
Sebastiaan Janssen
a3dd51ba98 Remove dead code 2015-12-03 09:44:29 +01:00
Sebastiaan Janssen
109aff737b Fixes spelling error 2015-12-03 09:43:50 +01:00
Sebastiaan Janssen
cd369bf078 Move some repeated GUIDs to a constants class 2015-12-03 09:43:33 +01:00
Sebastiaan Janssen
c7aa3d63fb Merge branch 'temp-U4-7372' into 7.4.0 
Conflicts:
	src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSixZeroOne/UpdatePropertyTypesAndGroups.cs
 2015-12-03 09:22:19 +01:00
Rune Strand
a6b1239138 Merge branch 'temp-U4-7366' of https://github.com/umbraco/Umbraco-CMS into temp-U4-7366 2015-12-02 21:24:23 +01:00
Rune Strand
e4365af312 Fixes full width drop overlays 2015-12-02 21:24:08 +01:00
Mads Rasmussen
ab884b00bf make entire cell placeholder clickable 2015-12-02 21:21:54 +01:00
Tor-Erik Klausen
0370f9a1c8 Update Norwegian translations 
Adds missing translations and removes some old ones. Based on current
en.xml
 2015-12-02 20:09:06 +01:00
Rune Strand
41bf7fc53d Add drop overlay for empty cells 2015-12-02 17:23:59 +01:00
Rune Strand
914343e00c Add check if drop area is actually a valid cell 2015-12-02 15:43:47 +01:00
Rune Strand
b5d12aca5e Sort into empty cells 2015-12-02 15:19:09 +01:00
Sebastiaan Janssen
d863ff364e U4-7321 Update Doc type edit link on content item for 7.4 since it will be different 
#U4-7321 Fixed
 2015-12-02 14:41:37 +01:00
Mads Rasmussen
b3988e81f5 Merge pull request #930 from umbraco/temp-U4-6924 
Fixes: U4-6924 Ensure drag/drop media uploads show notifications - since the way this works has been overhauled in 7.4
 2015-12-02 13:46:08 +01:00
Sebastiaan Janssen
4d4a7b5078 U4-7343 Change the order of trees under Settings: Make "Document Type" the first item in the settings section 
#U4-7343 Fixed
 2015-12-02 13:33:40 +01:00
Mads Rasmussen
160fc5effd Merge pull request #929 from umbraco/temp-U4-7387 
Fixes: U4-7387 It's not possible to select folders in listview in media section
 2015-12-02 13:29:46 +01:00
Claus
e4a0dc5d55 Fixed indentation. 2015-12-02 09:52:35 +01:00
Mads Rasmussen
e242474496 fix media picker merge mistake 2015-12-01 19:40:05 +01:00
Rune Strand
879ea73195 Updates jQuery UI to vLatest #woohoo 2015-12-01 15:51:15 +01:00
Sebastiaan Janssen
e1c1a99131 Fix merge mistake 2015-12-01 15:21:52 +01:00
Sebastiaan Janssen
9949e2676d Merge branch 'dev-v7' into 7.4.0 
Conflicts:
	build/UmbracoVersion.txt
	src/SolutionInfo.cs
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Web.UI.Client/bower.json
	src/Umbraco.Web.UI.Client/src/less/main.less
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/user.html
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/config/Dashboard.Release.config
	src/Umbraco.Web/Umbraco.Web.csproj
 2015-12-01 15:16:57 +01:00
Mads Rasmussen
4a60acb8f3 Drag and drop: show message when control is not allowed in cell 2015-12-01 14:54:20 +01:00
Mads Rasmussen
fe9954b674 Fixes: U4-7447 Grid - Touch support 2015-12-01 11:23:10 +01:00
Sebastiaan Janssen
64dac39bae Merge branch 'temp-U4-7220' into dev-v7 2015-12-01 10:35:38 +01:00
Sebastiaan Janssen
6040d149ec Merge branch 'dev-v7' into temp-U4-7220 2015-12-01 09:57:44 +01:00
Mads Rasmussen
bf037b3dd7 Fixes: U4-7440 Grid - Controls overlay is cut of by the tree 2015-11-30 19:34:23 +01:00
Claus
bfbc6595fb Fixed a few more split separators. 2015-11-30 19:29:23 +01:00
Claus
25d8fc7a13 Fixing split separator for thumbnailSizes in FileUploadPropertyValueEditor. 2015-11-30 19:18:57 +01:00
Claus
e11b5c3fdb Fixes: U4-7220 Upgrading 4.9.0 to 7.3.0 fails due to missing UniqueID field on cmsPropertyType table 
Migration happening in 6.0.2 failing due to use of a PropertyTypeDto type where we have added UniqueId in 7.3.0.
 2015-11-30 18:13:51 +01:00
Mads Rasmussen
09f0f951a1 Fixes: U4-7444 Grid - Place Richtext editor toolbar in control (static positioning) + remove sticky when scrolling 2015-11-30 11:30:31 +01:00
Mads Rasmussen
c9141d8815 set control title bar animation to linear 2015-11-30 09:42:14 +01:00
Mads Rasmussen
4673832f12 minimize number of function calls when checking for item config and item active children 2015-11-30 09:35:21 +01:00
Shannon
87100feb3d Fixes: U4-7467 Umbraco 7.3.2 Clean install, OWIN error after database creation and bumps version 2015-11-27 21:23:24 +01:00
Shannon Deminick
eae74b0e20 Merge pull request #931 from lars-erik/fix-u4-7329 
Actually save the domain
 2015-11-27 16:56:07 +01:00
Shannon
610efe552d Bumps version 2015-11-27 16:54:02 +01:00
Shannon
c4860a490f Ensures that GetUserSecondsMiddleWare uses the SystemClock for UTC Now, ensures that it only extends the ticket when necessary and not everytime this middleware is called - the same logic that OWIN normally renews tickets with, this means the cookie is not written everytime this request is made. 2015-11-27 16:43:02 +01:00
Shannon
8e6bbc3df9 Ensures that written cookies are done so consistently based on the UmbracoBackOfficeCookieAuthOptions. Ensures that when a webforms page requests token renewal that the token is not always renewed for the request, it checks if the tokens expiry correctly and only renews when necessary so the cookie is not written each time. Fixes the ForceRenewalCookieAuthenticationHandler to only write a cookie if the request is for a request that is not normally auth'd (i.e. is a webforms form that exists outside the normal /umbraco path ... legacy). 2015-11-27 16:25:39 +01:00
Lars-Erik Aabech
c16d0b77c2 Actually save the domain 2015-11-27 12:59:15 +01:00
Mads Rasmussen
894a5cc758 add options to hide filter in item picker overlay + hide filter in control picker in grid 2015-11-27 10:18:02 +01:00
Shannon
3ebdfcc238 fixes upgrade script 2015-11-26 17:14:56 +01:00
Stephan
6f8243265b Fix persistence layer issues with unique identifiers 2015-11-26 13:24:40 +01:00
Sebastiaan Janssen
2c4403f892 Fixes image that was missing from the build 2015-11-26 13:08:59 +01:00
Shannon
fd66f08520 Fixes setting auth cookie during install, removes some try/catch/swallow with some error messaging, converts some String -> string and == false updates. 2015-11-26 13:07:22 +01:00
Shannon
8e50f4968f Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2015-11-26 12:02:17 +01:00
Shannon
9acbe09449 fixes the tmh dynamic local version, the bower version the build server runs has an issue! 2015-11-26 12:02:08 +01:00
Sebastiaan Janssen
4baaafd006 Also remove change password dashboard from nuget package 2015-11-26 11:57:37 +01:00
Shannon
3f7293304d removes password change dashboard from release 2015-11-26 11:55:42 +01:00