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

13548 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastiaan Janssen
aca181b32e U4-7410 Version issue with MySql.Data after upgrade to 7.3.1. 
#U4-7410 Fixed
 2015-11-18 19:39:10 +01:00
Shannon Deminick
886347e763 Merge pull request #912 from lars-erik/fix-u4-7268 
Support generic CultureInfo as language culture
 2015-11-18 18:26:09 +01:00
Shannon Deminick
9fa606e065 Merge pull request #907 from umbraco/temp-U4-7414 
U4-7414 Deleted tab's properties should become generic properties
 2015-11-18 17:01:02 +01:00
Shannon
e40ac44afd updates test to reflect the instructions to replicate the original issue U4-7414 2015-11-18 17:00:27 +01:00
Shannon
48603fb840 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2015-11-18 16:07:10 +01:00
Shannon
f824439180 Merge branch 'UKFest-U4-4792' of https://github.com/opelpanfan/Umbraco-CMS into opelpanfan-UKFest-U4-4792 
Conflicts:
	src/Umbraco.Core/Services/ContentService.cs
 2015-11-18 16:07:01 +01:00
Shannon Deminick
b3616c9f8c Merge pull request #911 from umbraco/temp-U4-4792 
Fixes: U4-4792 Ancestors() on IContent throws "Object reference not set to an instance of an object."
 2015-11-18 16:04:22 +01:00
Shannon
48383f2e7a updaes null check and ensures the path isn't pre-set in the withidentity overload 2015-11-18 16:04:01 +01:00
Shannon
cb98385242 updates content/media service methods - null checks for parent IContent, dosn't use Parent() syntactic sugar methods, removes path creation in the WithIdentity methods. 2015-11-18 15:52:32 +01:00
Claus
29ec8cb2d3 Merge pull request #857 from gerwinbouwhuis/UKFest-U4-5581 
Uk fest u4 5581
 2015-11-18 14:32:52 +01:00
Lars-Erik Aabech
04900337c7 Support generic CultureInfo as language culture 2015-11-18 14:13:32 +01:00
Claus
1433685160 MediaService assigns Path when creating media objects. 2015-11-18 09:26:45 +01:00
Stephan
c5994ed54a Fix previous commit 2015-11-17 17:25:01 +01:00
Stephan
f5f9cb676c Fix CultureInfo leak in UmbracoApplicationBase too. 2015-11-17 16:54:24 +01:00
Claus
04e2d2370a Fixes: U4-4792 Ancestors() on IContent throws "Object reference not set to an instance of an object." 2015-11-17 16:49:01 +01:00
Stephan
8d00d931b0 U4-7414 Deleted tab's properties should become generic properties 2015-11-17 16:36:57 +01:00
Shannon Deminick
2998ad8cea Merge pull request #873 from AffinityID/u4-7352 
U4-7352 Fixed exception logging in UmbracoDatabase.
 2015-11-17 16:21:18 +01:00
Shannon Deminick
46c15ef28f Merge pull request #877 from cheeseytoastie/UKFest-7341 
Ukfest 7341
 2015-11-17 16:19:35 +01:00
Claus
2b369a57d8 Merge pull request #864 from andycyberian/UKFest-U4-6980 
Uk fest u4 6980
 2015-11-17 14:25:38 +01:00
Claus
c37a6bb928 Merge pull request #870 from JJCLane/UKFest-U4-6094 
Adds a check to include users in the send to translation list that ha…
 2015-11-17 13:48:01 +01:00
Claus
0fecad9867 Merge pull request #906 from umbraco/temp-U4-6515 
Fixes: U4-6515 Media picker does not set $dirty
 2015-11-17 11:51:58 +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
Sebastiaan Janssen
36814d746f Merge pull request #905 from GertyEngrie/dev-v7 
U4-7297 - fixes <hr/>-button in tinymce
 2015-11-17 10:34:37 +01:00
Claus
a72f6edb6b Merge pull request #846 from OptimisticCoder/UKFest-U4-6732 
U4-6732 - Added message on back office, when JS is disabled.
 2015-11-17 10:23:06 +01:00
Sebastiaan Janssen
e01cbcd405 Fix failing upgrade due to old dll being in bin folder 2015-11-17 09:24:22 +01:00
Claus
012ed6cf16 Merge pull request #862 from dampee/u4-7314 
U4-7314 Change name of "Textbox Multiple" to "TextArea"
 2015-11-17 08:57:49 +01:00
Gerty Engrie
eb3ff12916 U4-7297 - fixes <hr/>-button 2015-11-17 00:35:10 +01:00
Claus
1ebff69358 Merge pull request #904 from umbraco/temp-U4-7393 
Fixes: U4-7393 Actions menu placed behind publish button on mobile phone
 2015-11-16 16:02:00 +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
1f6f36d8c8 Updated unit test after adding in TaskTypeMapper. 2015-11-16 15:53:58 +01:00
Claus Jensen
c46ac11125 Merge pull request #849 from mzajkowski/UKFest-U4-6282 
U4-6282  Add note to Register Partial Macro
 2015-11-16 15:37:47 +01:00
Claus
73d5a3f993 Merge branch 'opelpanfan-UKFest-U4-6511' into dev-v7 2015-11-16 15:31:29 +01:00
Claus Jensen
5a99a6903d Merge pull request #888 from umbraco/temp-U4-7353 
Fixes: U4-7353 OAuth providers for the back office require more flexi…
 2015-11-13 14:47:11 +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 Deminick
fcd00599da Merge pull request #858 from tompipe/U4-1959 
Fixes U4-1959
 2015-11-13 13:40:26 +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
Shannon
ec247d2b27 ensures the migration table's seed is higher than 1 (have put it to 100). 2015-11-13 11:31:59 +01:00
Shannon
f32479bb10 bumps version 2015-11-13 11:26:31 +01:00
Shannon Deminick
371269436f Merge pull request #891 from umbraco/temp-U4-7128 
Fixes: U4-7128 Send to Translation gives YSOD
 2015-11-13 10:23:41 +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