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

14689 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Shannon
f62581bd38 reverts more of the caps lock 2015-11-26 11:39:49 +01:00
Shannon
9782e3711e Revert "Update bower.json with ngCapsLock" 
This reverts commit f0e1460550.

Conflicts:
	src/Umbraco.Web.UI.Client/bower.json
 2015-11-26 10:54:43 +01:00
Shannon
1f4ba9cfdc ignores file that shouldn't be there 2015-11-26 10:36:15 +01:00
Shannon
ba4f0cc6a4 remove file that shouldn't be checked in 2015-11-26 10:35:28 +01:00
Shannon
fc84821e8b fixes U4-6340 Partial view macro with parameters not working in RTE - to use a Model to post with the same Action name 2015-11-26 10:32:43 +01:00
Shannon Deminick
0fcf0b505a Merge pull request #922 from engern/U4-6340 
Fixes U4-6340 : Partial view macro with parameters not working in RTE and Grid (backend)
 2015-11-26 09:54:24 +01:00
Mads Rasmussen
f2f9283a25 Merge branch 'temp-U4-7366' of https://github.com/umbraco/Umbraco-CMS into temp-U4-7366 2015-11-26 09:45:45 +01:00
Simon Busborg
347d5070a2 added hover state to -placeholder in neutral state 2015-11-26 09:44:43 +01:00
Mads Rasmussen
07cb0408dd clean up scope watchers 2015-11-26 09:39:52 +01:00
Simon Busborg
27dbc1eefb Added more visible border to placeholder when row has active-child 2015-11-26 09:18:41 +01:00
Rune Strand
5d3f3fca79 Merge branch 'temp-U4-7366' of https://github.com/umbraco/Umbraco-CMS into temp-U4-7366 2015-11-25 23:07:50 +01:00
Rune Strand
b0b8eb857c Updates U4-7438 Grid - Sorting of controls/editors 
Drag n drop between cells
 2015-11-25 23:07:19 +01:00
Mads Rasmussen
7057c325cb fix performance issue with outside click event - only bind click when element is active 2015-11-25 22:25:41 +01:00
Rune Strand
3a5d7f0442 Fixes U4-7438 Grid - Sorting of controls/editors 2015-11-25 21:15:09 +01:00
Shannon
d300146cf6 trips content/media names, makes sure that the content type editor when rendering template names html encodes the names. 2015-11-25 20:44:53 +01:00
Shannon
c8482b9f59 Revert "Merge pull request #875 from Phosworks/U4-7312" 
This reverts commit 14265fc964, reversing
changes made to 18c3345e47.

Conflicts:
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js
	src/Umbraco.Web/Editors/ImagesController.cs
 2015-11-25 20:27:58 +01:00
Shannon
b7795e19ef Changes bigthumbnail pr to not cache per second, just minute 2015-11-25 20:21:24 +01:00
Shannon
c97617f5b5 Fixes: U4-7461 xss vulnerability in content type editor 2015-11-25 20:15:28 +01:00
Shannon Deminick
14265fc964 Merge pull request #875 from Phosworks/U4-7312 
Changed web api GetBigThumbnail to image processor
 2015-11-25 19:52:14 +01:00
Shannon
18c3345e47 Fixes U4-7459 XSRF protection bypass - ensures tokens are checked for the non-editor api controllers 2015-11-25 19:39:24 +01:00
Mads Rasmussen
8bfb77d3fe add client side validation for max file size in list view grid-layout, list view list-layout and media picker 2015-11-25 19:18:14 +01:00