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

12089 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
ded1def8e2 Fixes: U4-6333 - but should fix this better (i.e. centralize the code to clean for xss in JS like we have in c#) 2015-02-27 16:50:33 +11:00
Shannon
5a2a3c3b1e removes duplicate attribute 2015-02-27 01:04:53 +01:00
Sebastiaan Janssen
6f2fa2ed4d Makes sure that the version comment gets cleared when there is no comment. 2015-02-26 12:38:03 +01:00
Shannon
7dad078af4 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2015-02-20 09:43:28 +01:00
Shannon
9a89b6048a Merge branch '7.2.0_U4-5236' of https://github.com/bjarnef/Umbraco-CMS into bjarnef-7.2.0_U4-5236 
Conflicts:
	src/Umbraco.Web.UI.Client/src/less/tree.less
 2015-02-20 09:43:21 +01:00
Shannon Deminick
8c13b89c79 Merge pull request #637 from xumix/6.2.5 
Fix dictionary key access
 2015-02-20 09:36:20 +01:00
Shannon
d54e09c40b fixes jjj - no idea what happened there 2015-02-20 09:12:30 +01:00
Shannon
c0d6c511e4 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2015-02-19 14:55:08 +01:00
Shannon
2da3ec27db fixes punycode reference 2015-02-19 14:55:00 +01:00
Sebastiaan Janssen
5f10ed99aa Revert "U4-4565 Add margin to bottom bar" 
This reverts commit c1cc8a3824.
 2015-02-19 14:14:30 +01:00
Shannon Deminick
48fa60039b Merge pull request #641 from AussieInSeattle/U4-6288 
U4-6288 Changes
 2015-02-19 11:56:23 +01:00
Shannon
20ceceffe0 Fixes: U4-5932 Grid editor has JS errors 2015-02-19 11:43:08 +01:00
Shannon
b73c7fbb16 Fixes: U4-6284 UmbracoCms.7.2.2-build.26 - missing feedback when file is too large 2015-02-19 11:34:43 +01:00
Shannon
c96b866f1d Fixes bower config for jquery 2015-02-19 10:35:06 +01:00
Sebastiaan Janssen
b724a185b7 Pushes the ascii art down one line as it looked a bit weird because the cursor is on the first line by default after installing 2015-02-19 09:37:56 +01:00
Sebastiaan Janssen
f94d280e27 Removes unnecessary dummy files. Some directories are old and not needed, plus they all get created on app startup anyway. 2015-02-19 09:23:07 +01:00
Shannon
b2399e97cc updates cdf refs 2015-02-18 17:39:33 +01:00
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
AussieInSeattle
ee78e3815b U4-6288 Changes 2015-02-17 19:32:25 -08: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
Vilen Tambovtsev
03969fd687 Fix dictionary key access 
Looks like someone does not know how to use a dictionary
 2015-02-13 12:21:16 +03: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