yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,590 Commits 4 Branches 7 Tags
74a691ac3ac89013c8fe01a7d4b136fce76afb1f
Commit Graph

8590 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
74a691ac3a Removes all the console.log calls 2013-12-12 14:09:03 +11:00
Shannon
38c1669e57 Gets content items that are children of listviews to query for their affiliated tree-node and display the action menu. 2013-12-12 13:27:33 +11:00
Shannon
58f0d1a464 fixes null check on HttpQueryStringFilterAttribute and adds ability to specify parameters in the GetUmbracoApiService urlhelper extensions. 2013-12-12 13:26:53 +11:00
Shannon
f30740bd49 grid is working nicely now with a couple tests 2013-12-12 11:38:34 +11:00
perploug
3de3ccad00 Fixes related links word-breaking 2013-12-11 13:32:17 +01:00
perploug
75502ca18c Compact form less adjustments 2013-12-11 13:09:45 +01:00
perploug
c531c36cab adds target to RTE link picker 2013-12-11 13:09:25 +01:00
perploug
387e64acac Fixes wrong app_plugin dialog path 
Changes /app_plugin/folder/umbraco to /app_plugins/folder/backoffice
which the way we documented it
 2013-12-11 09:47:56 +01:00
perploug
91a5d55183 Merge branch '7.0.1' of https://github.com/umbraco/Umbraco-CMS into 7.0.1 2013-12-11 09:44:37 +01:00
Shannon
9819318060 Fixes up the auth http post 2013-12-11 18:53:00 +11:00
Shannon
2e990a7869 All working now, Fixes: U4-3722 Images in Media folder are huge 2013-12-11 18:05:04 +11:00
Shannon
ed7175192b images that are smaller than the min display size will now just be centered in the square and are no longer scaled up. 2013-12-11 17:53:19 +11:00
Shannon
4e63bb38f3 margins are now working nicely. 2013-12-11 16:44:20 +11:00
Shannon
d61b9bfdd7 Awesome progress on the photo folder changes to have correctly calculated images sizes - now just need to get margins going and centering of images that are smaller than the min. 2013-12-11 14:34:04 +11:00
Shannon
0de53308f5 Fixes some issues with app startup/authentication and when events fire 2013-12-11 12:01:22 +11:00
Shannon
85bf47df82 Fixes FileUploadPropertyEditor and IFileSystem usage 2013-12-11 09:05:38 +11:00
Shannon
791c3f5208 added missing view file 2013-12-11 08:51:07 +11:00
perploug
bc7876681b docs: dialogservice 2013-12-10 15:31:08 +01:00
perploug
68aa3f7b1b broke touch detection, reverting 2013-12-10 12:15:40 +01:00
perploug
976531fe7e Removes missing file from web.ui.csproj 2013-12-10 12:08:13 +01:00
perploug
ded7350d74 Docs: util.service.js 2013-12-10 11:23:54 +01:00
perploug
e3594bf6fc Fixes: U4-3723 Only possible to link to content (not media) in Richtext editor 
Adds file link button to link dialog, that proxies through the standard
media dialog
 2013-12-10 11:20:00 +01:00
Shannon
6a6d9ec7b0 Updates the image helper and imagescontroller to never scale images larger than what they are. 2013-12-10 18:24:20 +11:00
Shannon
200a400fc5 put the row style on to the photo folder, without it the image widths are not calculated correctly and span over a row (depending on your current screen size). Since the currently implementation isn't really responsive anyways this at least makes it look better. We can later detect size changes and re-calc how they should be laid out. Updates the JS code to be more readable by humans. 2013-12-10 18:23:45 +11:00
Shannon
76c807a4e7 Fixes latest IFileSystem fix for image uploading 2013-12-10 16:48:57 +11:00
Shannon
985db6d2e3 div tag not closed on umb-photo-folder 2013-12-10 16:20:22 +11:00
Shannon
7894fcfc91 Fixes: U4-3714 Media tree doesn't get refreshed after upload 2013-12-10 15:10:11 +11:00
Shannon
f41b0ff4b5 removes some debug logging 2013-12-10 14:15:23 +11:00
Shannon
d0a5892f9f Fixes: U4-3796 No media macro parameter in v7 2013-12-10 14:13:56 +11:00
Shannon
c0f4950270 Fixes: U4-3826 It is possible in some cases to insert a macro inside a macro inside the rte 2013-12-10 14:11:36 +11:00
Shannon
1d9c3b1a79 Merge remote-tracking branch 'origin/6.2.0' into 7.0.1 
Conflicts:
	src/Umbraco.Core/Services/ContentService.cs
	src/Umbraco.Web/umbraco.presentation/library.cs
 2013-12-10 12:59:29 +11:00
Shannon
c5047148b3 Fixes legacy media business logic to return null when calling ToXml if the media item is trashed - this makes it consistent with how content works and also prevents being able to show the media on the front-end when it is trashed. Fixes up how the MediaService rebuilds the XML to make sure it's transactional based. Fixes: U4-3820 cached media xml is not cleared from the cmsContentXml table when recycled 
Conflicts:
	src/Umbraco.Web/umbraco.presentation/library.cs
 2013-12-10 12:56:31 +11:00
Shannon
a6b3233c10 Fixes legacy media business logic to return null when calling ToXml if the media item is trashed - this makes it consistent with how content works and also prevents being able to show the media on the front-end when it is trashed. Fixes up how the MediaService rebuilds the XML to make sure it's transactional based. Fixes: U4-3820 cached media xml is not cleared from the cmsContentXml table when recycled 2013-12-10 12:53:33 +11:00
Shannon
9ec1f9b3f9 Merge remote-tracking branch 'origin/6.2.0' into 7.0.1 
Conflicts:
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Web.UI/install/Default.aspx.cs
 2013-12-10 11:55:32 +11:00
Shannon
ed2126eef9 ensures media xml cache is rebuilt on upgrade 2013-12-10 11:54:18 +11:00
Shannon
ce4b56895e fixes installer login check 2013-12-10 11:51:41 +11:00
Shannon
eaac76cdc1 Fixes: U4-3821 Infinite redirect loop when upgrading from 7.0.0 to 7.0.1 and ensures media cache is rebuilt on upgrade 2013-12-10 11:51:03 +11:00
Shannon
bffe52e060 Merge remote-tracking branch 'origin/6.2.0' into 7.0.1 
Conflicts:
	src/Umbraco.Tests/PluginManagerTests.cs
 2013-12-10 10:00:37 +11:00
Shannon
94db371234 Ensures macro and urls are not parsed in the ItemRenderer when a content item is assigned since that parsing will occur with the value converters 2013-12-10 09:59:13 +11:00
Shandem
b12cd81c01 Merge pull request #264 from mvanhelmont/patch-1 
fix /{localLink:ID}
 2013-12-09 14:53:48 -08:00
Sebastiaan Janssen
103e226b51 Merge pull request #215 from dipeshhirani/U4-752 
U4-752 Add culture invariant languages to create language dialog
 2013-12-09 13:40:21 -08:00
Sebastiaan Janssen
208cf8a01d Bump version and try to make the buildserver happy 2013-12-09 17:55:37 +01:00
perploug
1f81107485 Fixes: U4-3653 Bottom "Action" links inaccessible 2013-12-09 15:24:38 +01:00
perploug
bf5042e3d0 fixes: U4-3718 Sorting a list view by "Updated by" throws an exception 
It tries to sort the result on UserBasic, made userbasic implement
ICompareble
 2013-12-09 14:32:16 +01:00
perploug
15b55f2b36 Fixes: U4-3631 Disable preview button when there is no template assigned, since there is nothing to preview then... 2013-12-09 14:17:51 +01:00
Shannon
57f2250f13 Fixes: U4-3820 cached media xml is not cleared from the cmsContentXml table when recycled 2013-12-09 16:56:02 +11:00
Shannon
f15682ef60 Fixes: U4-3820 cached media xml is not cleared from the cmsContentXml table when recycled 2013-12-09 16:35:12 +11:00
Shannon
1b1ec04e7c Ensures macro and urls are not parsed in the ItemRenderer when a content item is assigned since that parsing will occur with the value converters 2013-12-09 15:42:38 +11:00
Shannon
049c65a2c7 Fixes: U4-3799 @Umbraco.Field("bodyText") returns {LocalLink:xxx} 2013-12-09 15:20:11 +11:00
Shannon
d50aa38c31 Ooops fixes the rte macro parser to not return empty when no macros are found 2013-12-09 14:01:34 +11:00