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

2402 Commits

Author SHA1 Message Date
Claus
bb78f756c7 Merge branch 'Jeavon-U4-4641' into temp-U4-4641 2015-11-17 12:47:18 +01:00
Claus
ffb0de4050 Merge branch 'U4-4641' of git://github.com/Jeavon/Umbraco-CMS into Jeavon-U4-4641 2015-11-17 12:46:24 +01:00
Claus
3045068d68 Fixes: U4-6515 Media picker does not set $dirty 
Included fix for member picker.
 2015-11-17 10:59:21 +01:00
Claus
37a6668313 Merge branch 'U4-6515' of git://github.com/deepak4u/Umbraco-CMS into deepak4u-U4-6515 2015-11-17 10:50:07 +01:00
Claus
5435c44ea9 Using a lower z-index to fix the issue at hand. 2015-11-16 16:00:43 +01:00
Claus
76fa477c35 Merge branch 'U4-7393' of git://github.com/Acentrage/Umbraco-CMS into Acentrage-U4-7393 2015-11-16 15:55:04 +01:00
Claus
73d5a3f993 Merge branch 'opelpanfan-UKFest-U4-6511' into dev-v7 2015-11-16 15:31:29 +01:00
Shannon Deminick
775639da41 Merge pull request #848 from Khinrot/UKFest-U4-5560 
Fixing "U4-5560 White space issue in content tree"
 2015-11-13 14:06:40 +01:00
Shannon Deminick
2375ede161 Merge pull request #867 from jbreuer/U4-4028 
U4-4028 Don't load the full images, but server side resized.
 2015-11-13 13:41:53 +01:00
Shannon
d3f5090150 Fixes up a couple of missing path updates and incorrect icon resolution and fixed another issue with webservice path reference 2015-11-13 13:38:30 +01:00
Shannon
6a7faf457b Merge branch 'dev-uk-U4-1117' of https://github.com/JeffreyPerplex/Umbraco-CMS into JeffreyPerplex-dev-uk-U4-1117 2015-11-13 11:35:29 +01:00
Claus
ef13e4112f Merge branch 'UKFest-U4-6511' of git://github.com/opelpanfan/Umbraco-CMS into opelpanfan-UKFest-U4-6511 2015-11-12 16:40:01 +01:00
Claus Jensen
ce5b6861bb Merge pull request #855 from ryanmcdonough/UKFest-U4-5617 
UKFest-U4-5617 RTE now respects CSS Directory AppSetting.
 2015-11-12 16:35:27 +01:00
Acentrage
6bf1ecdb11 Fixes U4-7393 
Safe to use both for mobile and desktop.
 2015-11-12 15:17:27 +01:00
Claus Jensen
fdd0ff2c23 Merge pull request #897 from umbraco/temp-U4-7070 
Fixes: U4-7070 UX - Mediapicker autofocus when creating a folder
 2015-11-12 15:14:19 +01:00
Claus
bade8e42ba Fixes to media picker when creating new folders. 
Changed to ngShow to ensure input field hides when blur event is hit.
Clearing and switching visibility of input field on successful submit.
Fixed up focus directive to use $timeout. The focus event can trigger before the element is rendered by angular so its safer to have a timeout ensure it is done at the end of the digest cycle - using $timeout instead of setTimeout ensures it is handled by angular at the right time.
 2015-11-12 15:12:59 +01:00
Claus
cfdf2768e6 Merge branch 'UKFest-U4-7070' of git://github.com/JJCLane/Umbraco-CMS into JJCLane-UKFest-U4-7070 2015-11-12 14:05:10 +01:00
Claus Jensen
c3ca006f14 Merge pull request #896 from umbraco/temp-U4-3774 
Fixes: U4-3774 Change password UX
 2015-11-12 13:36:36 +01:00
Claus
edc58fe8a5 Merge branch 'dev-uk-U4-3774' of git://github.com/JeffreyPerplex/Umbraco-CMS into JeffreyPerplex-dev-uk-U4-3774 2015-11-12 11:23:36 +01:00
Claus Jensen
d739b9fb31 Merge pull request #894 from umbraco/temp-U4-6167 
Fixes: U4-6167 MNTP: show path of selected node
 2015-11-12 10:58:24 +01:00
Claus
2ae4ede258 Showing path when hovering nodes should be configurable on the content picker. 2015-11-12 10:55:00 +01:00
Claus
4eddfb4cf5 Merge branch 'U4-6167' of git://github.com/tompipe/Umbraco-CMS into tompipe-U4-6167 2015-11-11 17:13:40 +01:00
Claus Jensen
420c029bf7 Merge pull request #859 from Khinrot/UKFest-U4-6426 
Fixing "U4-6426 CTRL click should open in a new window"
 2015-11-11 11:12:22 +01:00
Jeavon Leopold
c8cb5b26b0 Basic implementation for U4-4641 Feature Request: template and code editors should have insert Section, Define section buttons 2015-10-29 17:14:45 +00:00
Jeroen Breuer
3c9953979a U4-4028 Don't load the full images, but server side resized. 2015-10-29 17:00:23 +01:00
deepak4u
5ff329778d fix for issue u4-6515 2015-10-29 15:53:11 +00:00
Jeffrey Schoemaker
25f049e167 U4-1117 - Fixed any errors when renaming /umbraco to something else 2015-10-29 16:22:39 +01:00
Jeffrey Schoemaker
f7979fa19d U4-1117 - Fixed any errors when renaming /umbraco to something else 2015-10-29 16:22:05 +01:00
Jeffrey Schoemaker
6fd1784337 U4-1117 - Fixed any errors when renaming /umbraco to something else 2015-10-29 16:21:25 +01:00
Jeffrey Schoemaker
a7bb8e0d00 U4-1117 - Fixed any errors when renaming /umbraco to something else 2015-10-29 16:20:17 +01:00
Alejandro Ocampo
6c29ad854c Fixing "U4-6426 CTRL click should open in a new window" 2015-10-29 12:48:40 +00:00
ryanmcdonough
1040f234dc Update grid.rte.directive.js 2015-10-29 12:09:29 +00:00
ryanmcdonough
3f835fe19c RTE now respects CSS Directory AppSetting. 
Fixes #U4-5617
 2015-10-29 12:00:43 +00:00
Jeffrey Schoemaker
7b5ad9a5c6 U4-3774 / U4-4752 - Added a change password form to the user dialog 2015-10-29 12:44:30 +01:00
Tom Pipe
74dac71e8a Fixes U4-6167 - Show path of selected node 2015-10-29 11:31:53 +00:00
Jeffrey Schoemaker
64518774c6 U4-3774 / U4-4752 - Added a change password form to the user dialog 2015-10-29 12:29:24 +01:00
Jeffrey Schoemaker
f65b0df3e2 U4-3774 / U4-4752 - Added a change password form to the user dialog 2015-10-29 12:28:23 +01:00
Jeffrey Schoemaker
5cfe9e85f8 U4-3774 / U4-4752 - Added a change password form to the user dialog 2015-10-29 12:27:32 +01:00
Jeffrey Schoemaker
61044b6018 U4-3774 / U4-4752 - Added a change password form to the user dialog 2015-10-29 12:23:47 +01:00
Jeffrey Schoemaker
00fc5a5bb2 U4-3774 / U4-4752 - Added a change password form to the user dialog 2015-10-29 12:22:20 +01:00
Alejandro Ocampo
3f23865e0a Fixing "U4-5560 White space issue in content tree" 2015-10-29 11:06:31 +00:00
Shannon
79f04bf939 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2015-10-29 11:57:07 +01:00
Shannon
9ab90595e2 Adds a filter to the interceptor to ignore errors for certain requests. 2015-10-29 11:56:23 +01:00
Benas Brazdziunas
f8e101ec13 U4-6511 make MNTP icon clickable 2015-10-29 10:43:04 +00:00
Jordan Lane
6356531207 Focus new folder input automatically 
http://issues.umbraco.org/issue/U4-7070
 2015-10-29 10:22:34 +00:00
Sebastiaan Janssen
51b618826c Merge pull request #844 from ryanmcdonough/UKFest-U4-7151 
Update database placeholder to backslash for instance name.
 2015-10-29 11:16:56 +01:00
ryanmcdonough
04c28e5006 Update database placeholder to backslash for instance name. 2015-10-29 09:56:22 +00:00
Sebastiaan Janssen
c3a60ea0e0 Merge pull request #838 from ryanmcdonough/U4-7302 
Login overlay now higher than bootstrap datepicker
 2015-10-29 09:19:42 +01:00
Sebastiaan Janssen
4259b02b8d Merge branch 'dev-v7' into temp-U4-5963 
Conflicts:
	src/Umbraco.Web.UI.Client/src/controllers/main.controller.js
 2015-10-28 16:56:40 +01:00
Shannon
e6773dafc1 Updates PR to only display the prop alias in the title attribute when in debug mode. U4-4794 Display the property alias for content properties & provide a link to the content type from the generic properties tab 2015-10-28 12:45:15 +01:00