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

3394 Commits

Author SHA1 Message Date
Mads Rasmussen
62e4bebab6 Fixes: U4-4051 Bug when querying for root node with the remembered node id 2015-12-03 11:45:59 +01:00
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
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
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
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
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
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
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
Mads Rasmussen
bf037b3dd7 Fixes: U4-7440 Grid - Controls overlay is cut of by the tree 2015-11-30 19:34:23 +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
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
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
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
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
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 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
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
Mads Rasmussen
89fd42be25 add server error to html 2015-11-25 19:16:14 +01:00
Simon Busborg
dbbccb4e40 Ensure drag/drop media uploads show notifications - since the way this works has been overhauled in 7.4 
Awaits `maxFileSize` variable from U4-7394 ( http://issues.umbraco.org/issue/U4-7394 )
 2015-11-25 15:46:34 +01:00
Simon Busborg
66ee3503a5 UI love to the different states of the grid – much polish, such click, wow colors 2015-11-25 15:09:02 +01:00
Mads Rasmussen
9a8501c90c Fixes: U4-7387 It's not possible to select folders in listview in media section 2015-11-25 13:51:57 +01:00
Shannon
068c4a0b16 Fixes PR for U4-7362 Add message to login screen if Caps Lock is on 2015-11-25 11:22:12 +01:00
Shannon Deminick
f7d28d769a Merge pull request #886 from bjarnef/dev-v7-U4-7362 
Add message to login screen if Caps Lock is on
 2015-11-25 11:01:47 +01:00
Shannon Deminick
0edb71f4aa Merge pull request #917 from bjarnef/dev-v7-move-umb-version-in-dialog 
Move Umbraco version label to header in user dialog
 2015-11-25 10:51:36 +01:00
Simon Busborg
9b1983a239 Added labels to show when styles/config are added to rows/cells 2015-11-25 09:27:11 +01:00
Mads Rasmussen
5797c65a1d Fixes: U4-7446 Grid - Confirm dialog on delete row/cell 2015-11-25 09:24:19 +01:00