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

3212 Commits

Author SHA1 Message Date
Mads Rasmussen
9a8273b784 Fixes: U4-7541 umbAutoResize does not work in Microsoft Edge 2015-12-15 14:51:51 +01:00
Shannon Deminick
8ce8455773 Merge pull request #950 from umbraco/temp-U4-7373 
Fixes U4-7373 Error notifications shown are hidden underneath the dialogs
 2015-12-15 10:53:55 +01:00
Shannon
26b70a4a4e Merge remote-tracking branch 'origin/dev-v7' into 7.4.0 
Conflicts:
	build/UmbracoVersion.txt
	src/SolutionInfo.cs
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/umbraco/config/lang/de.xml
 2015-12-15 10:40:52 +01:00
Simon Busborg
31147fa8d1 missing comma 2015-12-15 10:26:22 +01:00
Simon Busborg
d75f8bf1bd added wrapper to directive 2015-12-15 10:24:38 +01:00
Simon Busborg
ecb6c8e52c Fix for U4-7373 Error notifications shown are hidden underneath the dialogs 
http://issues.umbraco.org/issue/U4-7373
 2015-12-15 10:08:19 +01:00
Claus
3cdd650b66 Merge pull request #940 from umbraco/temp-U4-7445 
Temp u4 7445
 2015-12-14 11:31:02 +01:00
Simon Busborg
8bd3b25a66 Fix for: http://issues.umbraco.org/issue/U4-7518 
New list view (umb-table) misses published/unpublished state
 2015-12-11 14:26:17 +01:00
Sebastiaan Janssen
d5f9dfecc4 U4-7496 Backoffice dropdowns quit working in Chrome after update to v47.0.2526.73 
#U4-7496 Fixed
 2015-12-08 13:54:56 +01:00
Rune Strand
7431ed4db1 Better wording 2015-12-08 13:42:05 +01:00
Rune Strand
cb07ec3157 Add dialog localization and new keys to all lang 2015-12-07 18:07:08 +01:00
Sebastiaan Janssen
7a4b7c25dd Can't use higher versions of angular-dynamic-locale 
See: https://github.com/lgalfaso/angular-dynamic-locale/issues/82
 2015-12-07 13:00:57 +01:00
Sebastiaan Janssen
a162974bf9 Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into 7.4.0 2015-12-07 11:51:34 +01:00
hartvig
68a4749917 Fixing a little typo 2015-12-07 11:11:02 +01:00
Sebastiaan Janssen
ff61112c18 Updates installer background 2015-12-07 10:32:24 +01:00
Sebastiaan Janssen
a427ca6d4e Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into 7.4.0 2015-12-07 10:26:26 +01:00
hartvig
0e0bc9fbef Adding number of countries to the installer faq 2015-12-07 10:11:35 +01:00
Claus
964d9a9328 Closing break tag. 2015-12-06 17:55:20 +01:00
Rune Hem Strand
93f199b5e3 Add localization to Grid (en) 2015-12-04 13:23:24 +01:00
Mads Rasmussen
58a68bba97 Fixes: U4-7387 bug preventing drag and drop upload in media library card layout 2015-12-03 13:24:09 +01:00
Sebastiaan Janssen
0fc41d0552 Merge branch '7.4.0' into konami-easteregg 2015-12-03 12:15:23 +01:00
Sebastiaan Janssen
b09aaee52d Merge branch '7.4.0' of https://github.com/umbraco/Umbraco-CMS into 7.4.0 2015-12-03 11:49:23 +01:00
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