yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,295 Commits 4 Branches 7 Tags
58a0de086f4417a2352cc9ea9ef319dd41f85383
Commit Graph

11295 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
58a0de086f fixes unit test 2014-10-03 17:07:27 +10:00
Shannon
cc9ca02843 Merge branch 'BatJan-7.1.5-localizatiob-5025' into 7.2.0 
Conflicts:
	src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
 2014-10-03 13:29:04 +10:00
Shannon
12e49f186e Merge branch '7.1.5-localizatiob-5025' of https://github.com/BatJan/Umbraco-CMS into BatJan-7.1.5-localizatiob-5025 
Conflicts:
	src/Umbraco.Web.UI.Client/src/common/mocks/services/localization.mocks.js
	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
	src/Umbraco.Web.UI/umbraco/config/lang/es.xml
	src/Umbraco.Web.UI/umbraco/config/lang/fr.xml
	src/Umbraco.Web.UI/umbraco/config/lang/sv.xml
 2014-10-03 13:28:02 +10:00
Shannon
967df0949b Merge branch 'abryukhov-7.1.0' into 7.2.0 2014-10-03 13:15:30 +10:00
Shannon
a0602e6b2a merges PR #243 2014-10-03 13:03:52 +10:00
Shannon
c078a1c12f Merge branch 'U4-5512' of https://github.com/arknu/Umbraco-CMS into arknu-U4-5512 
Conflicts:
	src/Umbraco.Web.UI.Client/src/controllers/main.controller.js
 2014-10-03 13:01:00 +10:00
Shannon
8cfb5915ac Manually merge branch 'allyen-6.1.4-shibboleth' into 7.2.0 2014-10-03 12:58:30 +10:00
Shannon
19595ba887 Merge branch '7.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.2.0 2014-10-03 12:51:38 +10:00
Shannon
2b2891b6f4 Merge branch '7.1.5' of https://github.com/henrikrossen/Umbraco-CMS into henrikrossen-7.1.5 2014-10-03 12:51:27 +10:00
Shannon Deminick
0b41f1e85e Merge pull request #488 from jhauge/7.2.0 
This commit fixes U4-1115
 2014-10-03 12:03:49 +10:00
Shannon
1d42a9225f Removes desktop media uploader - not used anymore AFAIK 2014-10-03 11:53:06 +10:00
Shannon
8012c909c0 removes angular web app from sln 2014-10-03 11:50:10 +10:00
Shannon
7368cc6b28 Style fixes 2014-10-03 10:37:30 +10:00
Shannon
68480ebd56 Fixes: U4-5492 Distributed calls won't work if IIS sites between servers have the same HttpRuntime.AppDomainAppId 2014-10-03 09:44:17 +10:00
Shannon
0d74642e56 fixes U4-5492 Distributed calls won't work if IIS sites between servers have the same HttpRuntime.AppDomainAppId 2014-10-03 09:44:03 +10:00
Shannon Deminick
cce63d6eaa Merge pull request #498 from AndyButland/u4-5461 
U4-5461 - Further amends to date picker behaviour
 2014-10-03 09:21:23 +10:00
AndyButland
3090339962 Removed incorrect option value 2014-10-02 22:08:19 +02:00
AndyButland
d9074da3fd Removed close of date/time picker on date selection when set up with time picker; close picker on click on document 2014-10-02 22:02:41 +02:00
Shannon
8e89a43311 Merge branch '7.1.7' into 7.2.0 2014-10-03 00:33:10 +10:00
Shannon
c0c7d21001 Merge remote-tracking branch 'origin/6.2.3' into 7.1.7 2014-10-03 00:29:33 +10:00
Shannon
7d189a6fb8 Backports the @ symbol escaping fixes 2014-10-03 00:28:49 +10:00
Shannon
e60dcfa144 Merge branch '7.1.7' of https://github.com/umbraco/Umbraco-CMS into 7.1.7 2014-10-03 00:26:25 +10:00
Shannon
3f8b779ae4 adds note 2014-10-03 00:23:38 +10:00
Shannon
72dc5fc477 Removes unused method 2014-10-03 00:23:28 +10:00
Shannon
737f2fb707 Fixes: U4-5566 Quite a few hard coded queries with incorrect escape syntax for mysql 2014-10-03 00:07:40 +10:00
Shannon
a13ead0d10 unescapes @ symbols now that sql params are in place 2014-10-03 00:06:09 +10:00
Shannon
93e864494b Merge branch 'bjarnef-7.2.0_progressbar' into 7.2.0 2014-10-02 21:47:03 +10:00
Shannon
1c16764605 Merge branch '7.2.0_progressbar' of https://github.com/bjarnef/Umbraco-CMS into bjarnef-7.2.0_progressbar 
Conflicts:
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html
	src/Umbraco.Web.UI/umbraco/developer/Packages/installedPackage.aspx
	src/Umbraco.Web.UI/umbraco/developer/Packages/installer.aspx
	src/Umbraco.Web.UI/umbraco/dialogs/sort.aspx
 2014-10-02 21:46:39 +10:00
Shannon
414dbe45a6 Fixes: U4-5460 User with start content set won't see the selected node. 2014-10-02 13:38:44 +02:00
Shannon Deminick
69494c20f4 Merge pull request #491 from AndyButland/u4-5461 
U4-5461 - Close date picker once date is selected
 2014-10-02 21:18:21 +10:00
Shannon Deminick
caa0e82d77 Merge pull request #495 from AndyButland/u4-5012 
U4-5012 Moved preview step for RTE embed dialog to a button press
 2014-10-02 21:16:44 +10:00
Shannon
d2592bd79f Fixes: U4-5456 Cannot access all properties of member via MembershipHelper methods 2014-10-02 21:05:20 +10:00
Shannon
b90f28731c Ensures the return to list button isn't shown on items in the recycle bin since that would navigate back to their original parent. Updates the recycle bin list views to respect the list view configuration of their associated sections. 2014-10-02 19:55:24 +10:00
Sebastiaan Janssen
340328aeba Fixes merge issue 2014-10-02 11:44:41 +02:00
Shannon
c8264cff1e Updates the content type editor to have the list view customization inline instead of in a dialog. 2014-10-02 18:52:38 +10:00
Shannon
3400c52e45 Fixes: U4-5443 Unable to add images using markdown editor, U4-5442 Markdown editor breaks on navigation 2014-10-02 13:18:35 +10:00
Shannon
613dd76f81 removes removed db column from document dto 2014-10-02 12:52:26 +10:00
Shannon
7c7ef42216 fixes typo on downgrade 2014-10-02 12:27:29 +10:00
Shannon
0e736a8d32 Merge branch '7.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.2.0 2014-10-02 12:23:55 +10:00
Shannon
08ea69caae Fixes paging for MySQL (actually makes it a better query anyways), fixes null ref for member indexer, Fixes MNTP after upgrade from v6, fixes typo on migration downgrade. 2014-10-02 12:23:43 +10:00
antoine
2380217c21 Very Basic shadow for the canvas designer 2014-10-01 18:28:25 +02:00
antoine
1231975a78 Bad path refer to grid instead of canvas 2014-10-01 18:27:35 +02:00
antoine
14e241bf21 Layout Editor editor without default box value 2014-10-01 18:26:57 +02:00
antoine
c3c755755d Canvas designer, palette config path in EnableCanvasDesigner fixed 2014-10-01 15:01:16 +02:00
antoine
50d3b81ed9 Blank font style issue in canvas designer google font editor 2014-10-01 12:57:33 +02:00
antoine
371e4382cb set a no disposable unique row ID for row styling 2014-10-01 12:56:45 +02:00
antoine
45dde8717b Canvas designer Color editor issue 2014-10-01 12:55:32 +02:00
AndyButland
af256e754d Moved preview step for RTE embed dialog to a button press 2014-10-01 11:28:00 +02:00
Shannon
f875dc15f7 Merge branch '6.2.3' into 7.1.7 
Conflicts:
	build/Build.bat
	build/NuSpecs/UmbracoCms.Core.nuspec
	build/NuSpecs/UmbracoCms.nuspec
	build/NuSpecs/build/UmbracoCms.targets
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Core/Models/DeepCloneHelper.cs
	src/Umbraco.Core/Persistence/Querying/BaseExpressionHelper.cs
	src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs
	src/Umbraco.Core/Services/MediaService.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/Persistence/PetaPocoExtensionsTest.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/umbraco/dashboard/DesktopMediaUploader.ascx
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/DesktopMediaUploader.ascx
 2014-10-01 16:47:49 +10:00
Shannon
71242430da Fixes a query that would cause the new petapoco changes to have issues since it was asking for the wrong type 2014-10-01 16:37:42 +10:00