yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,070 Commits 4 Branches 7 Tags
5580523c0842d0740ccdddc889dcedc79fbcd66b
Commit Graph

12070 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
5580523c08 Merge remote-tracking branch 'origin/dev-v6' into dev-v7 
Conflicts:
	build/NuSpecs/UmbracoCms.Core.nuspec
	src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/packages.config
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/packages.config
	src/umbraco.cms/packages.config
	src/umbraco.cms/umbraco.cms.csproj
	src/umbraco.controls/packages.config
	src/umbraco.controls/umbraco.controls.csproj
	src/umbraco.editorControls/packages.config
	src/umbraco.editorControls/umbraco.editorControls.csproj
	src/umbraco.macroRenderings/packages.config
	src/umbraco.macroRenderings/umbraco.macroRenderings.csproj
 2015-02-18 17:34:35 +01:00
Shannon
6670f7036b publicizes RouteDefinition 2015-02-18 17:30:44 +01:00
Shannon
a59dd32dd1 Updates cdf refs 2015-02-18 09:15:07 +01:00
Shannon
2acfd64706 Updates exif reader to an MIT licensed reader from https://code.google.com/p/exiflibrary 2015-02-17 16:47:29 +01:00
Shannon
df3d8d3757 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2015-02-17 14:37:52 +01:00
Shannon
a6f6a321f9 Fixes extension method finder and TypeHelper with Stephen's awesome code 2015-02-17 14:37:44 +01:00
Sebastiaan Janssen
03b0133b58 Merge branch 'Shazwazza-dev-v7-upgradablemvc5webapi2' into dev-v7 2015-02-17 10:46:58 +01:00
Sebastiaan Janssen
25cfceadc0 Merge branch 'dev-v7-upgradablemvc5webapi2' of https://github.com/Shazwazza/Umbraco-CMS into Shazwazza-dev-v7-upgradablemvc5webapi2 
Conflicts:
	build/UmbracoVersion.txt
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
 2015-02-17 10:46:36 +01:00
Sebastiaan Janssen
7788452fb7 U4-6219 Visual Studio 2013 Crashes When Opening umbraco.sln 
#U4-6219 Fixed
 2015-02-13 10:04:35 +01:00
Shannon
c7778467e3 Updates to latest examine version which internally supports tokenized paths in config so we don't need to do this in the umbraco core. 2015-02-13 15:34:54 +11:00
Shannon
0600d5c463 backports some updates made in the dist load balancing branch that allows for examine path storage by machinename and appdomainappid 2015-02-13 14:50:16 +11:00
Shannon
15c36a63d3 Fixes: U4-6168 Custom Section is not showing correctly in 7.2 if custom tree is empty 2015-02-13 12:35:57 +11:00
Shannon
bcba12abc8 Fixes: U4-6268 TreeController cannot exist in App_Code 2015-02-13 11:50:42 +11:00
Shannon Deminick
c0dd32d1f9 Merge pull request #625 from bjarnef/dev-v7-U4-4418 
U4-4418 - fix issue with tab sorting
 2015-02-13 11:13:46 +11:00
Shannon
2411271ae0 removes cancel button from related links as it is not needed and doesn't actually cancel due to two way binding. 2015-02-13 11:11:43 +11:00
Shannon Deminick
c87d0a6430 Merge pull request #634 from andycyberian/U4-4198 
U4 4198
 2015-02-13 11:06:48 +11:00
Shannon
c0051ba8cd fixes jshint warnings 2015-02-13 10:38:53 +11:00
Shannon
2cf590d9c9 Merge branch '7.2.1' of https://github.com/markusdrake/Umbraco-CMS into dev-v7 2015-02-13 10:36:41 +11:00
Shannon Deminick
2729da2c08 Merge pull request #630 from SorenA/SorenA-patch-1-rteformatting 
RTE composite block and class formatting
 2015-02-13 10:05:06 +11:00
Shannon
9046319dc9 fixes grid are you sure button style 2015-02-13 09:45:25 +11:00
Shannon Deminick
fa27a37207 Merge pull request #636 from robbaman/u4-6208 
Auto hide the 'Are you sure you want to delete' message on columns of a grid
 2015-02-13 09:34:02 +11:00
Shannon
80f81ce379 fixes: U4-6255 Add configurable option in base membership providers to toggle AllowManuallyChangingPassword 2015-02-12 15:58:11 +11:00
Shannon
3022293565 re-wires up the input file fields 2015-02-12 15:43:41 +11:00
Shannon
34889c147a Updates the media picker dialog to use the new directives, fixes: U4-6257 for it's drop zone, adds a drag over ui indicator, shows progress bar for uploading. 2015-02-12 15:25:49 +11:00
Shannon
7d17aef953 Streamlines image upload directives for more re-use, creates umbImageUpload directive which is a wrapper for the blueimp file-upload directive which allows us to have a directive that exposes an API (which the blue imp does not do), creates new upload progress directive so that can easily be re-used inside of any umbimageupload directive. 2015-02-12 14:40:15 +11:00
Shannon
8af8a6d411 Makes a new umbImageFolder directive which can be easily shared and is now used by the dashboard and the folder browser. 2015-02-12 11:59:19 +11:00
Robert Mulder
dd736dce3a Hide the 'Are you sure you want to delete' message on columns of a grid when mouse-leaving them just like it does on the similar message on the row level. This way they messages work the same for both rows and columns. 2015-02-11 10:18:51 +01:00
Shannon
cd4c738c04 Moves jquery and blueimp files to be included with bower, removes all unnecessary jquery files that are committed to the repo. Jquery and jquery ui versions remain the same, however the canvas designer was using a jquery ui version one patch version ahead so need to test that it works with the bower version, otherwise we'll have to re-include it. 2015-02-11 18:39:53 +11:00
Shannon
ed383bdaeb Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2015-02-11 18:24:01 +11:00
Shannon
4874a71e72 fixes publish button so it saves properly without causing js errors 2015-02-11 18:23:49 +11:00
Sebastiaan Janssen
58b8aacff1 Fixes U4-6052 Umbraco 7.2.1 web app installed with Nuget fails at start with error :"Cannot create an MVC Area path without the umbracoPath specified" 
#U4-6052 Fixed Due in version 7.2.2
 2015-02-10 17:38:19 +01:00
Sebastiaan Janssen
d4d5a355e3 Update CDF dependency 2015-02-10 15:08:27 +01:00
Shannon
24ef0dd961 fixes small issue with the image layout when viewing media folder, in some cases when there are consecutive small images that when placed beside each other cannot fit the width, they'll end up individually on a row due to their small size, this fix allows for a leniency when fitting to the width so in these cases they'll get rendered together on the row even though they won't actually fit. 2015-02-10 17:31:31 +11:00
Shannon
0efb9b72e7 Adds small exif library to read meta data from jpg's so we can attempt to read width/height from exif instead of loading the file into mem with GDI, makes for much faster and far less memory processing.U4-6246 Uploading specific images causes GDI+ Errors 2015-02-10 16:33:59 +11:00
Shannon Deminick
dd680b6fd1 Merge pull request #635 from NathalieLarsson/dev-v7 
Changes to lang config, notifications area - Sv
 2015-02-10 10:54:03 +11:00
Nathalie Larsson
788ed68b5b Changes to lang config, notifications area - Sv 2015-02-09 15:47:16 +01:00
Shannon
89606d3a05 Goes brute force to try to resolve: U4-4049 Some images fail when uploading multiple media files 2015-02-06 11:19:52 +11:00
Andy Rose
77319301c6 U4-4198, adding a specific save event to ensure that the related links title property is updated with its caption property 2015-02-05 09:19:47 +00:00
Andy Rose
227bd1cd7e Revert "U4-4198, adding a hidden field in the related links property editor to maintain the title property when editing. This will be mapped directly to the caption property value." 
This reverts commit 68ac167ec3.
 2015-02-05 09:18:48 +00:00
Sebastiaan Janssen
4790dc59a9 Update CDF dependency 2015-02-05 09:01:42 +01:00
Stephan
de53dbffd1 U4-6129 - fix order of EntityService.GetByIds items 2015-02-04 19:07:51 +01:00
Andy Rose
68ac167ec3 U4-4198, adding a hidden field in the related links property editor to maintain the title property when editing. This will be mapped directly to the caption property value. 2015-02-04 16:30:14 +00:00
Stephan
c8087d1f68 Cleanup TypeHelper, add tests - IsAssignableFromGeneric may have issues? 2015-02-04 17:05:18 +01:00
Shannon
c4c21b8b6e fixes: U4-6151 Datatype PreValues not updated in Datatype Saved Event 2015-02-04 13:35:22 +11:00
Shannon
a7c134a375 fixes last failing test 2015-02-04 12:11:10 +11:00
Shannon
9cdea752e8 Updates ExtensionMethodFinder to use new TypeFinder methods, all tests are passing now. Moved Stephen's MatchType methods to TypeHelper and moved those tests to TypeHelperTests. Now, need to compare notes with Stephen and add more tests to validate/invalidate the aproaches taken to see what might not be supported between either approaches and should probably look into benchmarks too. 2015-02-04 10:24:09 +11:00
Shannon
de3c836ac1 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 
Conflicts:
	src/Umbraco.Core/Dynamics/ExtensionMethodFinder.cs
	src/Umbraco.Tests/DynamicsAndReflection/ExtensionMethodFinderTests.cs
 2015-02-04 09:58:48 +11:00
Stephan
2cdc89297f U4-6210 - fix failing tests, improve extension methods support on dynamics 2015-02-03 19:38:14 +01:00
Shannon
839a5b13b0 updates extension method finder with tests to better support finding generic equivialents, adds tests for TypeHelper as well. 2015-02-03 20:23:05 +11:00
Shannon
40cc4b90fc updates a test 2015-02-03 14:41:43 +11:00