yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,905 Commits 4 Branches 7 Tags
1321702d19bfc514b46aa681c44cf3285e06e8ce
Commit Graph

9905 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
perploug
1321702d19 Fixes: U4-3649 Bottom button bar gradient overlaps last field 
Temp fix, as we will likely refactor or editor directives before
building more core editors
 2014-03-31 13:24:30 +02:00
perploug
005ff2f830 Merge branch '7.1.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0 2014-03-31 13:17:27 +02:00
perploug
dff3fde840 Fixes: U4-4553 7.1 Template drop down has values but is blank 
patches the it on the clientside for now, longerterm solution is to have
templates being returned as prevalues, but will leave that to shannon as
there could be other things accidentally being poked doing that.
 2014-03-31 13:17:15 +02:00
Sebastiaan Janssen
44504ff6af Fixes summary for the TagMapper 2014-03-31 12:59:28 +02:00
Sebastiaan Janssen
25d3389759 Merge pull request #341 from robertjf/7.1.0 
Fixes #U4-4544 Issue: TagService.GetAllTags(group) throws Exception in MappingResolver
 2014-03-31 12:57:51 +02:00
Robert Foster
3f97c74712 removed commented out code 2014-03-31 22:00:54 +11:00
perploug
1152b61fb0 7.1 login greetings update 2014-03-31 12:43:05 +02:00
perploug
b1842de045 Merge branch '7.1.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0 2014-03-31 12:37:26 +02:00
perploug
750a2862ee Fixes: U4-4562 Images and markdown editor 2014-03-31 12:37:08 +02:00
perploug
7632075df4 Fixes: U4-4536 Tree points to wrong views after install 2014-03-31 12:29:44 +02:00
perploug
aa75cd4ea8 Fixes: U4-4549 Related Links "New Window" checkbox has css "display: none" 2014-03-31 12:28:56 +02:00
Sebastiaan Janssen
06827bd7a5 Merge pull request #338 from vnbaaij/7.1.0 
Solution for  U4-4548
 2014-03-31 11:57:13 +02:00
Robert Foster
b1037d1936 Added a TagMapper class to resolve ITag back to TagDto. 2014-03-30 19:07:35 +11:00
Vincent Baaij
a47387fec0 Solution for U4-4548 2014-03-28 16:03:51 +01:00
perploug
c29d08c915 Fixes: U4-4489 7.1 RC, warn about changes partially overlays breadcrumb 2014-03-28 11:00:29 +01:00
perploug
b8f796eb2c Fixes: U4-4532 Unable to insert Image in TinyMCE when Image property 'umbracoFile' is changed from type 'Upload' to the new 'Image Cropper' 2014-03-28 10:39:24 +01:00
Shannon
7a8f8ac0fe Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 2014-03-28 08:31:52 +11:00
Shannon
49cf0f98ce U4-1752 - Add GetPreValueAsString(id) method to the @Umbraco helper 2014-03-28 08:31:21 +11:00
Shandem
22ffa86e18 Merge pull request #301 from Jeavon/U4-1752 
U4-1752 - Add GetPreValueAsString(id) method to the @Umbraco helper
 2014-03-28 08:21:32 +11:00
perploug
c4e2d98138 U4-4532 Unable to insert Image in TinyMCE when Image property 'umbracoFile' is changed from type 'Upload' to the new 'Image Cropper' 
Replaces the old media api with the resolveFile helper methods
 2014-03-27 02:46:32 -07:00
Shannon
c01211c62d Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 
Conflicts:
	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/moveOrCopy.aspx.cs
 2014-03-27 17:28:46 +11:00
Shannon
d8a3e00440 Fixes: U4-2843 Copying Document Type when Selecting Master Doesn't Work (Master ignored), U4-3552 Copy nested document type is failing 2014-03-27 17:26:55 +11:00
Shannon
264c537b50 Fixes: U4-4530 Edit Profile Snippet: Check for null before loop 2014-03-27 16:52:43 +11:00
Shannon
f26c61d736 renames file 2014-03-27 16:43:34 +11:00
Shannon
43f647fd94 Fixes U4-4531 dialogService.macroPicker callback wrong property name 2014-03-27 16:43:20 +11:00
Shannon
cc0bcc2d59 Fixes unit tests 2014-03-27 16:27:57 +11:00
Shannon
1b23540b87 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 
Conflicts:
	src/Umbraco.Web/Cache/DistributedCache.cs
 2014-03-27 16:12:37 +11:00
Shannon
c309e18f13 Fixes: U4-459 Public Access permissions not set on distributed servers 2014-03-27 16:11:34 +11:00
Shannon
dec60885b4 Fixes more thread safety issues with Access.cs 2014-03-27 15:50:56 +11:00
Shannon
eee09ec45b Completes: U4-459 Public Access permissions not set on distributed servers 2014-03-27 14:43:07 +11:00
Shannon
b4daab2856 started fixing: U4-459 Public Access permissions not set on distributed servers but have commented that code out for now because it will cause problem in some LB scenarios. 2014-03-27 14:28:45 +11:00
Shannon
fdfbad254d Fixes some very badly handled threading issues with the Access (public access) class 2014-03-27 14:28:12 +11:00
Shannon
7444363cef adds another null check to the other TranslateItem method 2014-03-27 08:13:05 +11:00
Shandem
a82097b92b Merge pull request #334 from Jeavon/U4-4527 
Fix for U4-4527 U7 - Creating initial Folder in media section causes exc...
 2014-03-27 08:05:56 +11:00
Jeavon Leopold
07934161a4 Fix for U4-4527 U7 - Creating initial Folder in media section causes exception 2014-03-26 10:07:20 +00:00
Shandem
9194030a9a Merge pull request #333 from Nicholas-Westby/7.1.0 
Replaced "retreive" with "retrieve".
 2014-03-26 17:45:03 +11:00
Shannon
1cbaace777 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 
Conflicts:
	build/Build.proj
	build/NuSpecs/UmbracoCms.Core.nuspec
	build/NuSpecs/build/UmbracoCms.targets
	build/NuSpecs/tools/install.ps1
	src/Umbraco.Web.UI/umbraco_client/Editors/EditScript.js
 2014-03-26 15:06:03 +11:00
Nicholas-Westby
ef5052324b Replaced "retreive" with "retrieve". 2014-03-25 20:49:52 -07:00
Nicholas-Westby
204a8d813c Replaced "retreive" with "retrieve". 2014-03-25 20:48:05 -07:00
Nicholas-Westby
8009cb3892 Replaced "retreive" with "retrieve". 2014-03-25 20:46:23 -07:00
Nicholas-Westby
284d168cd7 Replaced "retreive" with "retrieve". 2014-03-25 20:45:28 -07:00
Nicholas-Westby
fdd025aefd Replaced "retreive" with "retrieve". 2014-03-25 20:44:47 -07:00
Nicholas-Westby
e36d4768e1 Replaced "retreive" with "retrieve". 2014-03-25 20:44:08 -07:00
Nicholas-Westby
df2047e8f8 Replaced "retreive" with "retrieve". 2014-03-25 20:43:32 -07:00
Nicholas-Westby
d9280d5238 Replaced "retreive" with "retrieve". 2014-03-25 20:42:29 -07:00
Nicholas-Westby
388249f500 Replaced "retreive" with "retrieve". 2014-03-25 20:41:32 -07:00
Nicholas-Westby
a08b75592e Replaced "retreive" with "retrieve". 2014-03-25 20:40:44 -07:00
Nicholas-Westby
38ea6dfbfe Replaced "retreive" with "retrieve". 2014-03-25 20:39:45 -07:00
Nicholas-Westby
39ccde221a Replaced "retreive" with "retrieve". 2014-03-25 20:38:58 -07:00
Nicholas-Westby
17b6366ea3 Replaced "retreive" with "retrieve". 2014-03-25 20:37:20 -07:00