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

7539 Commits

Author SHA1 Message Date
Shannon
620fbde1db Merge branch '7.1.0-ImageCropper-JeavonWIP' of https://github.com/Jeavon/Umbraco-CMS into Jeavon-7.1.0-ImageCropper-JeavonWIP 
Conflicts:
	src/Umbraco.Web/ImageCropperBaseExtensions.cs
 2014-03-20 13:18:57 +11:00
Shannon
af9a9a9a7a Fixes: U4-4481 Image cropper pre value editor doesn't validate properly 2014-03-20 13:03:30 +11:00
Shannon
08d4ce7667 Fixes: U4-4475 Creating new member doesn't put it in examine. Fixes up some cache refreshers to ensure they are calling the base method so that events fire consistently. 2014-03-20 12:36:13 +11:00
Shannon
2340adbe94 Fixes: U4-4425 Umbraco Macros break on quote, U4-4290 RTE changes Macro parameter values containing right angle brackets, U4-4442 Line break in macro text area breaks the Macro 2014-03-20 12:21:40 +11:00
Shannon
fb6b234491 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 2014-03-20 10:38:40 +11:00
Shannon
15222e176e Fixes: U4-4474 YSOD when expanding Members tree 2014-03-20 10:37:54 +11:00
Shannon
63b92eaee5 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 
Conflicts:
	src/Umbraco.Core/Models/MemberType.cs
	src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
	src/Umbraco.Tests/Persistence/Repositories/MemberTypeRepositoryTest.cs
 2014-03-20 09:54:13 +11:00
Shannon
84dd7dc61a Fixes: U4-4466 6.2-beta - Creating Member Type without Alias results in no viewable Member Types in back office 2014-03-20 09:52:31 +11:00
Sebastiaan Janssen
5a4b09f9d1 Make sure we use the latest ImageProcessor version in VS as well, not just in the nuget package. 2014-03-19 19:56:48 +01:00
perploug
bbbd03f001 Final tweak to the U4-4477 - media items could not be retreived on refreshing the editor 2014-03-19 19:14:39 +01:00
perploug
4a721ddf34 Fixes: U4-4477 Single Media picker doesn't show thumbnail any more 2014-03-19 18:44:46 +01:00
Jeavon Leopold
d88745bf49 Adding ToLowerInvariant to compares and also removing a redundant method copied in from my cropper package but not needed 2014-03-19 16:53:13 +00:00
perploug
3543204794 Revert "Merge" 
This reverts commit 1573eb2f74.
 2014-03-19 09:51:07 -07:00
perploug
2470ec3ded Minor addition to the U4-4477 fix 2014-03-19 09:38:27 -07:00
perploug
7b4f7abbcd Fixes: U4-4477 Media picker doesn't show thumbnail any more 2014-03-19 09:38:24 -07:00
perploug
1573eb2f74 Merge 2014-03-19 09:38:22 -07:00
Jeavon Leopold
e8e8b536f1 Fix for GetCropUrl method when mediaItem.Url has JSON data 2014-03-19 16:12:30 +00:00
Sebastiaan Janssen
704c3df597 No more need for imageprocessor configs in web.config, yay! 2014-03-19 16:59:06 +01:00
Sebastiaan Janssen
36c107c0ef Quick fix for U4-4206 - not the absolute correct fix, but it'll get rid of that horrible null reference error 2014-03-19 14:30:53 +01:00
Sebastiaan Janssen
70f5641b83 Change to overflow:auto so there's no horizontal scroll bar when not necessary 2014-03-19 13:28:28 +01:00
Sebastiaan Janssen
bbb5fe728a Better styling of ChangeDocType dialog 2014-03-19 13:25:16 +01:00
Sebastiaan Janssen
307ea6bd74 Fixes last error in U4-3470 Errors in console window are failed to load resource at 
/umbraco/%7B%7Bcmd.icon%7D%7D
 2014-03-19 11:48:46 +01:00
Sebastiaan Janssen
76eb06784d Don't try to access model.value when model.value might be empty. Fixes broken prevalue editor for RTE. 2014-03-19 11:19:34 +01:00
Jeavon Leopold
c6e1235ac4 Fixing GetCropUrl overload 2014-03-19 09:52:53 +00:00
Sebastiaan Janssen
6ac2cc9f8b Not sure how the logout button ended up in the help dialog, sorry! :) 2014-03-19 10:38:43 +01:00
Shannon
9d5c8e5aed Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 2014-03-19 19:45:39 +11:00
Shannon
56001a8ccb Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 
Conflicts:
	src/Umbraco.Core/Services/PackagingService.cs
 2014-03-19 18:55:20 +11:00
Shannon
ff5dadde53 Fixes unit test and another potential migration problem using an old alias for foreign key 2014-03-19 18:43:10 +11:00
Shannon
6d92393f08 Merge branch '7.1.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0 2014-03-19 17:56:45 +11:00
Shannon
6169d13eb5 fixes the config issue with unit tests 2014-03-19 17:56:30 +11:00
perploug
361c382a2e Makes cropper components size-able 
So all UI components can be given a max-size so they can scale image and
ui up accordingly
 2014-03-18 23:49:09 -07:00
perploug
375b3948e0 Fixes: U4-4177 U7 - Add Startnode Picker to Multiple Media Picker 2014-03-18 23:49:05 -07:00
perploug
6453a82717 Allow cropper thumbnails to downscale 2014-03-18 23:49:02 -07:00
perploug
a4c9fae05c Fixes: U4-4461: Case sensitive crop alias's 2014-03-18 23:49:01 -07:00
perploug
29edbb90a6 Fixes: Image grid using fullsize images instead of thumbs 2014-03-18 23:49:00 -07:00
Shannon
71201970e9 Gets the new color spectrum pre-value editor working. 2014-03-19 17:45:21 +11:00
Shannon
992727821b Merge branch 'robertjf-7.0.2' into 7.1.0 2014-03-19 15:43:46 +11:00
Shannon
67fd3cc234 Merge branch 'moppa-7.0.2' into 7.1.0 2014-03-19 15:41:06 +11:00
Shannon
f70717985c Cleans up a little bit of code and adds some null checks. 2014-03-19 15:32:31 +11:00
Shannon
ded82611a7 Finalizes: U4-4472 Image cropper should use IFileSystem - currently uses standard IO 2014-03-19 15:09:50 +11:00
Shandem
6a8cb5e123 Merge pull request #270 from stefana99/6.2.0-imagecropper 
Changes to imageCropper, supports new mediafilesystem
 2014-03-19 14:48:38 +11:00
Shandem
09428d703c Merge pull request #298 from KevinJump/6.2.0--PackageServiceFixes 
6.2.0  package service fixes
 2014-03-19 14:43:19 +11:00
Shannon
2b6b8e9e8c Fixes: U4-4470 New Installer doesn't deal with 500 errors, also fixes a tree init problem causing this particular ysod 2014-03-19 13:28:23 +11:00
Shannon
a46c088d0c Ensures correct exceptions are thrown when configurations cannot be loaded, before was just null ref exception which was not good. 2014-03-19 11:00:32 +11:00
Shannon
a0541b000e Fixes: U4-4463 Upgrade 6.2.0 > 7.1.0 fails - due to incorrect formatting of foreign keys for sql servers 
Conflicts:
	src/Umbraco.Tests/Migrations/AlterMigrationTests.cs
	src/Umbraco.Tests/Migrations/Stubs/AlterUserTableMigrationStub.cs
 2014-03-19 10:33:37 +11:00
Shannon
1f6b139cde Fixes: U4-4463 Upgrade 6.2.0 > 7.1.0 fails - due to incorrect formatting of foreign keys for sql servers 2014-03-19 10:31:19 +11:00
Shannon
a25e6e0d2c Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 
Conflicts:
	build/Build.bat
	build/NuSpecs/UmbracoCms.Core.nuspec
	build/NuSpecs/build/net40/UmbracoCms.targets
	build/NuSpecs/build/net45/UmbracoCms.targets
	build/NuSpecs/build/net451/UmbracoCms.targets
	src/Umbraco.Core/Persistence/Querying/BaseExpressionHelper.cs
	src/Umbraco.Core/Persistence/Repositories/Interfaces/IMemberRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
 2014-03-19 09:34:37 +11:00
Shannon
668935548d Fixes: U4-4394 7.0.4: Inconsistency in member tree listings 
Conflicts:
	src/Umbraco.Core/Persistence/Querying/BaseExpressionHelper.cs
	src/Umbraco.Core/Persistence/Repositories/Interfaces/IMemberRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
	src/Umbraco.Web/Trees/MemberTreeController.cs
 2014-03-19 09:28:13 +11:00
Shannon
14141fcaa5 Fixes the dictionary query syntax properly for all db's 2014-03-19 09:24:57 +11:00
Sebastiaan Janssen
4f008f5848 Bump version to RC 2014-03-18 18:37:42 +01:00