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

10636 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephan
53ea491bd6 U4-5286 - add property converter for color picker 2014-07-29 09:52:00 +02:00
Stephan
c2816e759b Fail IPublishedContentFactory faster 2014-07-25 11:00:56 +02:00
Shannon Deminick
7ab8ea4da4 Merge pull request #432 from AndyButland/u4-5138 
U4 5138 - fixed a couple of issues with list view styling and function
 2014-07-24 15:24:51 -07:00
Shannon
1e8f016234 Fixes: U4-5111 7.1.4 JavaScript runtime error: 'UmbClientMgr' is undefined 2014-07-24 15:13:41 -07:00
Shannon
d07ba12e73 Fixes merge 2014-07-24 14:50:06 -07:00
Shannon
7d7fa0e389 Merge remote-tracking branch 'origin/6.2.2' into 7.1.5 
Conflicts:
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/PropertyEditors/ValueConverters/RteMacroRenderingValueConverter.cs
	src/Umbraco.Web/Umbraco.Web.csproj
 2014-07-24 09:42:44 -07:00
Shannon
fdab6d5de5 Merge branch '6.2.2' of https://github.com/umbraco/Umbraco-CMS into 6.2.2 2014-07-24 09:39:12 -07:00
Shannon
ff94eba3a7 Fixes: U4-5273 6.2: Umbraco.Field no longer rendering macro container 2014-07-24 09:39:05 -07:00
Shannon
834de2099f updates manifest watcher just to ensure we don't try to shut down the app domain more than once. 2014-07-24 09:06:45 -07:00
Shannon
904ee40a34 Merge branch '7.1.5' of https://github.com/umbraco/Umbraco-CMS into 7.1.5 2014-07-24 08:57:07 -07:00
Shannon
99973841e3 Fixes up packaging service - problem with setting property values properly on import due to a wip portion of getting tag values set correctly, though this was solved at the repo level and i unfortunately forgot to re-update this code. 2014-07-24 08:57:02 -07:00
Sebastiaan Janssen
e200e2fc48 Removes obsolete cachebrowser 2014-07-24 16:17:40 +02:00
Sebastiaan Janssen
69c7ecad59 Got bitten by stray files that were left behing in _BuildOutput folder, clean before build 2014-07-24 14:43:40 +02:00
Sebastiaan Janssen
b1350fa4a6 Customize button was displayed lower than installer button 2014-07-24 14:40:33 +02:00
Sebastiaan Janssen
6014608d5a Microsoft.AspNet.WebApi.Host doesn't exist ;) 2014-07-24 14:24:13 +02:00
Shannon
929180224f Merge remote-tracking branch 'origin/6.2.2' into 7.1.5 2014-07-23 14:07:47 -07:00
Shannon
22dde5a421 U4-4738 Backoffice search should support node ID search 2014-07-23 14:07:21 -07:00
Shannon
ee5c532be7 Fixes: U4-4738 Backoffice search should support node ID search 2014-07-23 14:07:05 -07:00
Shannon
c9b27b5a70 Merge remote-tracking branch 'origin/6.2.2' into 7.1.5 
Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
 2014-07-23 12:32:53 -07:00
Shannon
7f510c107a updates proj's with correct specific version attributes 2014-07-23 12:31:38 -07:00
Shannon
2ebfd8f3d4 updates nuspec to have latest versions for all dependencies 2014-07-23 12:31:16 -07:00
Shannon
6e20be993b updates nuspec to have latest versions for all dependencies 2014-07-23 12:31:03 -07:00
Shannon
84fad1300b All nuget refs are now up to date and installed correctly with copy local set correctly for all non gac 4.5 assemblies as well as the specific version attribute. 2014-07-23 12:19:40 -07:00
Shannon
fd7930256b Uninstalls package CodeSharp.Package.AspNetWebPage and removes refs to Nuget.Core and Webpages.Administration - neither of which are used anywhere... but we've been shipping Umbraco with them for some reason. 2014-07-23 10:53:30 -07:00
Shannon
6319b10881 Merge remote-tracking branch 'origin/6.2.2' into 7.1.5 
Conflicts:
	src/SQLCE4Umbraco/SqlCE4Umbraco.csproj
	src/SQLCE4Umbraco/app.config
	src/Umbraco.Core/app.config
	src/Umbraco.Tests/App.config
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/app.config
	src/umbraco.MacroEngines/App.Config
	src/umbraco.businesslogic/app.config
	src/umbraco.datalayer/app.config
	src/umbraco.editorControls/app.config
 2014-07-23 10:08:01 -07:00
Shannon
c24775adb0 re-installs mvc, webapi and ensures running the latest 2.0.x versions of webpages and razor, now all proj's are consistent with correct versions referenced and copy local set correctly. 2014-07-23 10:03:26 -07:00
Shannon
0d164ffb08 Merge branch '7.1.5' of https://github.com/umbraco/Umbraco-CMS into 7.1.5 2014-07-23 09:04:01 -07:00
Shannon
dd83dced4c Fixes up back office search, U4-5048, U4-5021, U4-5167, U4-5194 2014-07-23 09:03:54 -07:00
Sebastiaan Janssen
ea56363f6d Adds logging to the RteEmbedController when there's an exception, instead of silently swallowing the error 2014-07-23 14:04:50 +02:00
Sebastiaan Janssen
f86902bc89 Microsoft.Bcl 1.1.7 requires NuGet 2.8.1 - also registering MyGet feed from the build.bat file so that it actually works for everybody 2014-07-23 11:39:40 +02:00
Shannon
b207521f4b Merge remote-tracking branch 'origin/6.2.2' into 7.1.5 
Conflicts:
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/Umbraco.Web.csproj
 2014-07-22 16:15:02 -07:00
Shannon
a2aaa9a1ea updates proj references to have SpecificVersion set to false 2014-07-22 16:14:13 -07:00
Shannon
217f591db0 updates proj references to have SpecificVersion set to false for libs 2014-07-22 16:13:26 -07:00
Shannon
b835cfb76d Merge remote-tracking branch 'origin/6.2.2' into 7.1.5 
Conflicts:
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/packages.config
 2014-07-22 15:55:06 -07:00
Shannon
82cfbab17a Ensures all WebApi DLLs are copied local 2014-07-22 15:51:44 -07:00
Shannon
d453aedd0d Microsoft.Net.Http required a reinstall command for the UI project as noted by it's persisted 'requiresReinstall' attribute in the packages.config - also ensures that ALL of the WebApi DLLs are copied local 2014-07-22 15:51:13 -07:00
Shannon
851181f861 Microsoft.Net.Http required a reinstall command for the UI project as noted by it's persisted 'requiresReinstall' attribute in the packages.config - and then the project wouldn't actually build anymore. 2014-07-22 15:39:07 -07:00
Shannon Deminick
4680b643f6 Merge pull request #426 from arknu/searchimprovements 
Fix U4-5194 and U4-5167: Handle multiple spaces and quoted searches in the backoffice correctly
 2014-07-22 15:26:38 -07:00
Shannon
05be2a5e86 adds test 2014-07-22 15:13:01 -07:00
AndyButland
8445c9c29b Applied styling to list view paging (active class on page numbers, disabled on prev and next when not available 2014-07-22 23:11:22 +01:00
AndyButland
e8eea039e1 Reset page number to one when applying filter on list view 2014-07-22 22:35:58 +01:00
Shannon
cd8b8dc704 Fixes: U4-5212 Preview button only greyed and not disabled while previewing. (was save button) 2014-07-22 11:33:58 -07:00
Shannon
e98ed8561a Fixes: U4-5252 2014-07-23 04:10:48 +10:00
Shannon
626e155c07 Fixes SO issue when tags contain an empty string 2014-07-23 03:54:27 +10:00
Shannon Deminick
de968a18dd Merge pull request #431 from AndyButland/u4-5097 
U4-5097 - fixed issue with inital value of slider not being saved
 2014-07-23 01:47:43 +10:00
AndyButland
8d1d2f2414 Initialised slider scope model value if not already set from a previous save 2014-07-21 22:27:04 +02:00
Stephan
4bb38609ad Merge pull request #429 from leekelleher/U4-5253 
U4-5253 PublishedContentModelFactory case-sensitive dictionary
 2014-07-21 16:45:13 +02:00
leekelleher
0370a1bcf2 PublishedContentModelFactory: Changes the private 'constructors' dictionary to be case-insensitive. 2014-07-21 15:32:16 +01:00
arknu
188613e5e7 U4-5167: Handle quoted searches in the backoffice correctly 2014-07-18 17:42:47 +02:00
arknu
a9261d217e U4-5194: Fix handling of multiple words in backoffice search 2014-07-18 17:00:59 +02:00