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

15661 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
b6ef4bf6b5 Merge branch '7.3.8' into dev-v7 
Conflicts:
	build/UmbracoVersion.txt
	src/SolutionInfo.cs
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
 2016-02-16 13:29:59 +01:00
Shannon
82297a6ff1 U4-7929 Label datatype strips leading zeros 2016-02-16 13:23:37 +01:00
Warren Buckley
3bf79f0a23 Merge pull request #1102 from umbraco/temp-U4-7837 
Fixes: U4-7837 Changing document type should refresh the current node
 2016-02-16 12:22:56 +00:00
Shannon
3f5aa3aa2b U4-7954 Error upgrading database to 7.4.0 - [ FK_cmsPropertyTypeGroup_cmsPropertyTypeGroup_id ] doesn't exist 2016-02-16 12:17:21 +01:00
Shannon
cc5ac1a84c bumps version 2016-02-16 11:57:10 +01:00
Shannon
6373add383 U4-7922 Preview is not working 2016-02-16 11:53:54 +01:00
Shannon
180099b718 U4-7890 XSLT Macro's not working - "Cannot use this obsoleted overload when the current provider" 2016-02-16 11:52:16 +01:00
Shannon
65f15125e1 U4-7939 - fix routes cache 2016-02-16 11:48:09 +01:00
Shannon
f026201c68 fixes wrong constant used 2016-02-16 11:35:38 +01:00
Shannon
640b2c0ee0 Moves strings to constants, adds ControllerContextExtensions to get the UmbracoContext from the hierarchy of ControllerContext's, changes RenderModelBinder to use this method to get the UmbracoContext, changes UmbracoViewPageOfTModel to use this method to get the UmbracoContext, adds RouteDataExtensions to get the UmbracoContext from routedata, adds extension methods on the HttpContext to get the UmbracoContext from it. 2016-02-16 11:17:47 +01:00
Shannon Deminick
bef7ad1196 Merge pull request #1120 from lars-erik/fix-silly-long-grid-translation 
Grid translations
 2016-02-16 10:12:02 +01:00
Shannon Deminick
33c6c8b473 Merge pull request #1121 from umbraco/temp-U4-7950 
Fixes another reported bug for U4-7950
 2016-02-16 10:05:09 +01:00
Sebastiaan Janssen
0a26e482aa Fixes another reported bug for U4-7950 2016-02-16 09:01:28 +01:00
Lars-Erik Aabech
d0de54e2d3 Grid translations: 
Fixed a silly long translation of "Add content".
Added missing keys.
Fixed a few spelling mistakes.
 2016-02-16 08:50:07 +01:00
Stephan
cbdabaa3b1 Merge pull request #1118 from umbraco/temp-U4-7950 
Use CultureInfo.CurrentCulture if UmbracoContext.PublishedContentRequ…
 2016-02-15 15:21:00 +01:00
Simon Busborg
a33d7da211 Fixes: U4-7945 Grid's Reorder bar covers content 
http://issues.umbraco.org/issue/U4-7945
 2016-02-15 12:55:44 +01:00
Sebastiaan Janssen
f31b6d9c2c Use CultureInfo.CurrentCulture if UmbracoContext.PublishedContentRequest is not available 2016-02-15 08:27:07 +01:00
Sebastiaan Janssen
367c945b42 Merge pull request #1117 from s-moon/patch-1 
Minor text changes.
 2016-02-14 11:08:19 +01:00
Stephen Moon
b962fcdbc3 Minor text changes. 2016-02-13 21:31:13 +00:00
Simon Busborg
0f8a13d60a 7 in a row instead of 8, bumped font-size on icons to 30 2016-02-12 10:17:42 +01:00
Simon Busborg
5c1502c806 Removes umb-control-group when no icons displayed 2016-02-12 10:13:30 +01:00
Simon Busborg
3cdebf4427 Fixes U4-7918 Make icon picker for document type and list views consistent 2016-02-12 09:38:37 +01:00
Shannon
e4e7c18460 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2016-02-11 18:07:42 +01:00
Shannon
5f246c533c Fixes issue when there are zero instructions in the db table and we've never synced before, in this case it will always cold boot because it will never saved the last synced, in this scenario also the indexes will not build because we've cleared the collection before they can run. 2016-02-11 18:07:31 +01:00
Sebastiaan Janssen
5323543ec0 Merge pull request #1115 from abryukhov/patch-3 
Update UI language ru.xml
 2016-02-11 17:36:28 +01:00
Shannon
d44542694b Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2016-02-11 17:31:49 +01:00
Shannon
016a14e5c7 Fixes the image cropper where if you don't have any crops, save an image to a content item, then when you go create a new crop in the data type it wouldn't show up on the front-end or in the back office. 2016-02-11 17:31:37 +01:00
Alexander Bryukhov
52f4dfec80 Update UI language ru.xml 
According new keys added to the 7.4.0 nightly build 164 (models builder keys)
 2016-02-11 22:29:33 +06:00
Sebastiaan Janssen
4f6e023d77 Make sure that everybody working on the source actually gets these assembly references in web.config 2016-02-11 17:11:02 +01:00
Shannon
5e46750cc4 nuspec and version 2016-02-11 16:34:15 +01:00
Shannon
d028b133f5 nuspec updated with MB 2016-02-11 16:27:58 +01:00
Shannon
ca6821104b updated to MB 3.0.0 final 2016-02-11 16:26:21 +01:00
Shannon
1ea8c8280c Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2016-02-11 15:54:10 +01:00
Shannon
17ff952b52 Fixes the URL creating for media in the back office to use an IMedia instead of published media (since it's not published yet at the time) 2016-02-11 15:54:00 +01:00
Sebastiaan Janssen
b4f64975a2 Merge pull request #1113 from umbraco/temp-U4-7936 
U4-7936 Clicking the Recycle Bin shows "Session expired" login screen
 2016-02-11 15:48:24 +01:00
Sebastiaan Janssen
1d8a5cf795 Merge pull request #1114 from umbraco/temp-u4-7729 
U4-7729 7.4.0-Beta Cannot drag and Drop PDF on Media Section
 2016-02-11 15:34:41 +01:00
Shannon
dccee93700 fixes up some null checks and fixes up some string null checks - casting XElement to (string) explicitly avoids null reference exceptions when the XElement isn't actually present. 2016-02-11 15:11:11 +01:00
Per Ploug
efeafb4471 U4-7729 7.4.0-Beta Cannot drag and Drop PDF on Media Section 2016-02-11 14:42:47 +01:00
Shannon Deminick
496efde5b3 Merge pull request #1093 from jonrandahl/patch-1 
Update PackagingService.cs
 2016-02-11 14:18:23 +01:00
Shannon Deminick
2b56854652 Merge pull request #1112 from umbraco/temp-U4-7939 
U4-7939 - fix routes cache
 2016-02-11 14:15:13 +01:00
Shannon
04e1d8c2bd U4-7936 Clicking the Recycle Bin shows "Session expired" login screen 2016-02-11 14:04:14 +01:00
Simon Busborg
c7a7dd6ed5 Fixed disabled buttons 2016-02-11 13:12:13 +01:00
Sebastiaan Janssen
1eedbba97a Merge pull request #920 from darrenferguson/dev-v7 
change the text "Reload nodes" to just "Reload" my editors don't know…
 2016-02-11 12:04:45 +01:00
Stephan
d6b46e7e78 U4-7939 - fix routes cache 2016-02-11 11:53:03 +01:00
Shannon
1b03a8f06c Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2016-02-11 11:51:11 +01:00
Shannon
726bef1edf adds notes 2016-02-11 11:50:59 +01:00
Sebastiaan Janssen
33aa04bb2f Updates ImageProcessor.Web 2016-02-11 10:35:52 +01:00
Rune Hem Strand
a79333080a Merge pull request #1111 from umbraco/U4-7933 
Fixes issue U4-7933
 2016-02-11 09:49:09 +01:00
Sebastiaan Janssen
d1f513df69 Updates ImageProcessor 2016-02-10 17:09:40 +01:00
Shannon
54ddbc264d Fixes U4-7906 2016-02-10 16:39:05 +01:00