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

1793 Commits

Author SHA1 Message Date
Sebastiaan Janssen
cbe23663e3 Merge pull request #400 from BatJan/7.1.5-installer-fix-4874 
7.1.5 installer fix 4874
 2014-06-08 18:23:21 +02:00
Shannon
ec0d6959a9 mini profiler in back office now enabled with query string 2014-06-08 17:15:52 +02:00
BatJan
ff42a1b79c Fix of http://issues.umbraco.org/issue/U4-5025 2014-06-08 16:32:03 +02:00
BatJan
4e433becd6 Fix of http://issues.umbraco.org/issue/U4-5025 2014-06-08 16:29:10 +02:00
Shannon
7b33eca014 disables dist call 2014-06-08 13:14:27 +02:00
Shannon
e8990eb6b2 Merge commit 'beb1979b4655a529b703ceec094a50f6a3dd8602' into 7.1.5 
Conflicts:
	src/Umbraco.Web.UI/config/umbracoSettings.config
 2014-06-08 12:24:29 +02:00
Shannon
df3bc873df Upgrades mini profiler and enables it in the back offfice. 2014-05-30 15:26:22 +10:00
Sebastiaan Janssen
b42d0bc17e Bump version and fix dashboard 2014-05-28 16:04:11 +02:00
Sebastiaan Janssen
020a416dc5 en_us lang also updated like en 2014-05-28 13:15:20 +02:00
Sebastiaan Janssen
d491c133a7 Merge pull request #391 from danlister/patch-1 
Updated en.xml to fix some minor spelling mistakes
 2014-05-28 13:13:01 +02:00
Sebastiaan Janssen
84f94d6471 U4-4752 No "change password" dialog available in 7.x backoffice 2014-05-28 11:17:33 +02:00
Dan Lister
1b360226d6 Updated en.xml to fix some minor spelling mistakes 2014-05-27 12:01:41 +01:00
Shannon
e04eed41e7 Merge remote-tracking branch 'origin/6.2.1' into 7.1.4 
Conflicts:
	src/Umbraco.Core/Models/DeepCloneHelper.cs
	src/Umbraco.Core/Models/PreValue.cs
	src/Umbraco.Core/Models/PreValueCollection.cs
	src/Umbraco.Tests/Persistence/Repositories/TemplateRepositoryTest.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/editContent.aspx.cs
 2014-05-22 13:01:23 +10:00
Shannon
62887607ff fixes csrf with mediauploader.ashx 2014-05-22 12:44:04 +10:00
Sebastiaan Janssen
0ebd66d926 Merge branch 'dampee-oembed_slideshare' into 7.1.3 2014-05-16 12:51:26 +02:00
Sebastiaan Janssen
a99a33477a Centralized the current Umbraco version number in UmbracoVersion.txt that will be read by 
buildbelle.bat, build.bat and the umbraco.web.ui.csproj so it works in VS, command line and
also in TeamCity.
 2014-05-16 12:27:54 +02:00
Sebastiaan Janssen
b42d3b226d Bump version 2014-05-16 11:29:35 +02:00
Shannon
5956394bf1 Fixes: U4-4877 Editing macro parameters fails because of new item validation 2014-05-14 10:52:08 +10:00
Damiaan
48dcc373dc Oembed for slideshare not working anymore 2014-05-13 22:29:59 +02:00
Stephan
9acba1d6d7 U4-4857 - issue with document type new property alias 2014-05-13 09:53:22 +02:00
per ploug
dbbe3fe5fb Removes remaining yepnop dependencies 2014-05-05 12:59:34 +02:00
Shannon
e88e809e29 Use new YouTube oembed https end-point (old http one redirects) and make sure videos are embedded over https to allow for https Umbraco sites. 2014-04-30 17:39:13 +10:00
Shandem
b404f3b56b Merge pull request #368 from uber-rob/u4-4785 
Use new YouTube oembed https end-point (old http one redirects) and make...
 2014-04-30 17:31:43 +10:00
Shannon
c5559d7721 Specifying assembly for membership/user provider 
Addresses http://issues.umbraco.org/issue/U4-4781
 2014-04-30 11:27:47 +10:00
Rob Church
9d9db577b4 Use new YouTube oembed https end-point (old http one redirects) and make sure videos are embedded over https to allow for https Umbraco sites. 2014-04-29 19:09:45 +01:00
Aaron Powell
d369af5fe0 Specifying assembly for membership/user provider 
Addresses http://issues.umbraco.org/issue/U4-4781
 2014-04-29 21:49:56 +10:00
per ploug
90bf600378 Replaces yepnope.js with lazyload.js 
Solves the caching and multi-load of the same file problems - adds a bit
of promise-based loading logic ontop of ll.js to ensure order and count
 2014-04-29 11:38:13 +02:00
Shannon
e964d52548 Merge branch 'U4-898' of https://github.com/leekelleher/Umbraco-CMS into leekelleher-U4-898 2014-04-28 12:49:28 +10:00
Shannon
50b71faff9 Adds .woff mime type 2014-04-28 12:45:12 +10:00
Jwheuvel
44fbc29541 Update web.config with .woff mime support 
Bootstrap icons aren't visible on Windows Phone because it uses the .woff variant but the mimetype isn't available. Updated the web.config and added .woff to the staticContent section of system.webServer.
 2014-04-24 20:34:57 +02:00
Shannon
d9ac529e7e Merge remote-tracking branch 'origin/6.2.0' into 7.1.2 
Conflicts:
	src/Umbraco.Core/Models/PropertyType.cs
	src/Umbraco.Web.UI/umbraco_client/GenericProperty/genericProperty.js
	src/Umbraco.Web/WebServices/CoreStringsController.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControlNew.ascx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/nodetypeTasks.cs
	src/umbraco.providers/members/UmbracoMembershipProvider.cs
 2014-04-24 16:33:04 +10:00
Shannon
12170fd787 fixes ysod overlay for ajax errors 2014-04-24 14:23:17 +10:00
Stephan
6d50b46bd8 U4-4747,3027... - bugfix content type editor / aliases 2014-04-23 19:28:04 +02:00
Stephan
0810e90478 U4-4747,3027... - bugfix content type editor / aliases 2014-04-23 19:26:48 +02:00
Shandem
95cd32ad8c Merge pull request #359 from Jeavon/7.1.2-ImageCropper 
Adding support for Image Crop Ratio Dimension Support & UpScale to GetCropUrl & More Tests
 2014-04-23 20:20:09 +10:00
Stephan
c00c59af1d U4-4676 - fix property alias corruption issue 2014-04-23 11:22:47 +02:00
Sebastiaan Janssen
421162d809 Bump version + Attempt at U4-4742 Publish debugging symbols for NuGet package 2014-04-23 10:11:36 +02:00
Shannon
508a40cd50 Merge remote-tracking branch 'origin/6.2.0' into 7.1.2 
Conflicts:
	src/Umbraco.Web/Controllers/UmbRegisterController.cs
	src/Umbraco.Web/Models/RegisterModel.cs
 2014-04-23 12:00:32 +10:00
Shannon
30901446e1 Fixes: U4-1853 Tinymce with the format dropdown added as soon as you interact with it the content tree stops working [Uncaught TypeError: Cannot set property 'href' of undefined (anonymous function) DependencyHandler.axd:57] Chrome Only.. 2014-04-22 18:17:28 +10:00
Sebastiaan Janssen
2881118a02 Fixes U4-4026 Inline styling on container affect header text - properly 2014-04-21 16:37:20 +02:00
Sebastiaan Janssen
7a04881428 Fixes U4-4728 Public Access Error Page Choose link not selectable 2014-04-21 11:42:53 +02:00
Jeavon Leopold
e8d41a1b5e Adding Ratio Mode parameter to GetCropUrl helper 2014-04-18 22:04:23 +01:00
Jeavon Leopold
9a14a29a53 Updating ImageProcessor to v1.8.8 and ImageProcessor.Web to v3.2.2 2014-04-18 20:39:38 +01:00
Sebastiaan Janssen
b60aa3031c Post.cshtml shouldn't be there 2014-04-08 12:03:55 +02:00
Sebastiaan Janssen
2a0e3d803f Merge branch '7.1.1' of https://github.com/umbraco/Umbraco-CMS into 7.1.1 2014-04-08 11:37:50 +02:00
Sebastiaan Janssen
670a67225a Upgrade to Json.Net 6.0.2 2014-04-08 11:37:40 +02:00
perploug
13891bb033 Merge branch '7.1.1' of https://github.com/umbraco/Umbraco-CMS into 7.1.1 2014-04-07 16:08:45 +02:00
perploug
a2efd7ab53 Fixes: U4-4619 Make sure installer pings stats 2014-04-07 16:08:34 +02:00
Sebastiaan Janssen
ab7371e146 Bump version number 2014-04-07 14:29:59 +02:00
Sebastiaan Janssen
66d61c9d20 One more ImageProcessor update 2014-04-03 11:29:13 +02:00