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

1285 Commits

Author SHA1 Message Date
Morten Christensen
d522ca9fdd Refactoring usages of VersionMajor, VersionMinor and VersionPatch in umbraco.GlobalSettings. 
Its now using Umbraco.Core.Configuration.GlobalSettings.Version instead.
Fixes U4-1160
 2012-11-26 10:00:47 -01:00
Morten Christensen
3fe1975514 Refactoring usages of umbraco.GlobalSettings.CurrentVersion to use the new Umbraco.Core.Configuration.GlobalSettings.Version 2012-11-26 09:57:05 -01:00
Morten Christensen
e07fc8c2ba Adding language column to cmsContentVersion 2012-11-26 09:02:49 -01:00
Morten Christensen
78b05eb44c Correcting SolutionInfo and AssemblyInfo, so assembly version is correct for all shipped assemblies 2012-11-26 07:46:29 -01:00
Morten Christensen
1dd9b6c4d5 Removing nuget packages from repo as we are using package restore 2012-11-26 07:16:48 -01:00
Morten Christensen
4d351ad8ae Making all Macro related classes internal, as the new macro stuff won't be utilized in 6.0. 2012-11-26 07:06:18 -01:00
Morten Christensen
ce12bfa80e Adding numeric attribute for testing. 
Adding type test for composition implementation.
 2012-11-25 19:19:10 -01:00
Morten Christensen
599fb5a12d Merge 2012-11-25 17:56:52 -01:00
Morten Christensen
e16c92a197 Starting with composition via code first test. 2012-11-25 17:56:08 -01:00
Sebastiaan Janssen
b9ee9d551e Ammending previous commit - removes files from inclusion in csproj file as well 2012-11-25 08:25:34 -01:00
Sebastiaan Janssen
72eb1a573d Machine specific config files are no longer necessary. Upon first build, you get 
a new web.config file thats never commited to the repo, edit this one all you
want. It gets some values overwritten by the web.Template.Debug.config because
they should be used by everybody deving on the core (currently only MedTrust).
 2012-11-25 08:22:07 -01:00
Morten Christensen
97ebf8d51b Merge 2012-11-24 19:08:45 -01:00
Morten Christensen
ff89383386 Removing usage of IProfile on DataTypeDefinition. 
Giving the Code First POC an extra kick in the conventions, so the default PropertyType convention can be overridden.
If a Definition doesn't exist for the selected DataType one will be created - with backing unit test.
 2012-11-24 19:07:06 -01:00
Stephan
0513d6012c merge 2012-11-24 14:56:23 -01:00
Morten Christensen
e32880f215 Final Merge with 4.11.0 2012-11-23 19:59:28 -01:00
Morten Christensen
1053492a29 Freedom Friday POC of native code first - limited to test project. 
Making a few corrections to the serialization attributes after having tested ContentType Serialization.
Enabling bulk saving of new ContentTypes with Parent/Composition dependencies.
 2012-11-23 19:58:19 -01:00
Stephan
9f0ab6c297 U4-1245 - make it possible to create more than 1 wildcard domain 2012-11-23 15:23:39 -01:00
Sebastiaan Janssen
f1314628d7 One last hack to get the the macroengines to show up after install. 2012-11-23 12:01:43 -01:00
Sebastiaan Janssen
e23ed30b0c Took out the temporary tree fixes and put another temp fix in (reverts to the 4.10.x code) 
Also removed dependency on ClientDependency.Mvc for now to make upgrades easier (no requirement to do assembly redirects in web.config)
 2012-11-23 11:45:51 -01:00
PerPloug
55cb46927e Changes to template and masterpages helper 2012-11-23 09:37:35 -01:00
Morten Christensen
c7693386a2 Correcting a few unit tests after conditions have changed. 2012-11-23 08:35:58 -01:00
Sebastiaan Janssen
654c3b7403 Another temporary fix for trees being unavailable after install, the context is null during upgrades in the installer, so would cause a YSOD 2012-11-23 08:02:23 -01:00
Morten Christensen
99820bf5e1 Merge with 4.11.0 2012-11-23 07:53:22 -01:00
Sebastiaan Janssen
4195754b0c Pull in new translations before release 2012-11-23 07:36:58 -01:00
Sebastiaan Janssen
96a6f17bd7 Update for the WebPI build, should now automatically be good 
Fixes U4-132
 2012-11-22 16:06:06 -01:00
Sebastiaan Janssen
61d99c4061 Of course we also need the assembly redirect for MVC2 -> 3 in the template config to start with (so the build.bat picks it up as well) 2012-11-22 15:45:14 -01:00
Sebastiaan Janssen
0a6e91a2f9 Fixed U4-1235 Changing document type alias YSOD's on SQL CE 2012-11-22 15:04:27 -01:00
jeavonleopold
cf9e786e45 U4-1241 Fix - BaseTreePicker GetItemBreadcrumbs causes YSOD for Property Editors that do not store numeric ID's 2012-11-22 15:17:12 +00:00
Sebastiaan Janssen
ba1d3fd3e6 Fix Library.Search not giving back an list of DynamicNodes any more, breaking accessibility to custom properties 2012-11-22 13:23:20 -01:00
Sebastiaan Janssen
ac01fd48fa Some refactoring of the Umbraco:image implementation after code review 2012-11-22 12:30:58 -01:00
Sebastiaan Janssen
f53fb694be Tightened up and renamed the ReadPublished method (relating to pull request for U4-606) 2012-11-22 09:53:11 -01:00
Sebastiaan Janssen
1ecd8fa87d Temporary fix for trees being unavailable after install 2012-11-22 09:34:05 -01:00
Sebastiaan Janssen
ce1c9d697b Add assemblyredirect for System.Web.Mvc because ClientDependency.Core.Mvc relies on Mvc v2 while we're using 3. 2012-11-22 09:30:07 -01:00
Sebastiaan Janssen
c67a76fb03 json2.js was not included in VS, so not in the build 2012-11-22 08:06:39 -01:00
Shannon Deminick
3d72a4497c Merge 2012-11-22 02:56:53 +05:00
Morten Christensen
f11dc7f3cd Correcting a few methods in the DataTypeService. 
Adding publish = false in save methods, to ensure that Published isn't set to true.
 2012-11-21 17:38:54 -01:00
Sebastiaan Janssen
30cc8e0861 Merge 2012-11-21 11:05:38 -01:00
Sebastiaan Janssen
30ca3f6df9 Bump the version to 4.11.0 2012-11-21 11:05:30 -01:00
Stephan
cccfed6efe U4-1222 - improve alternate template consistency 2012-11-21 10:12:04 -01:00
Sebastiaan Janssen
82c148e997 Fixed U4-596 with thanks to firepol! 2012-11-21 09:50:47 -01:00
Sebastiaan Janssen
c50a3e7a27 I broke the build, oh noes! Sorry. :-) 2012-11-21 09:46:04 -01:00
callicj@M2UA1450WRW.us.maritz.net
811cbe2339 Added new method to the Document Service named readPublished() which returns the published version of the document. 
Added new method to the Document class named GetPublishedVersion() which returns the published version of the document.
 2012-11-21 08:03:53 -01:00
ksykora@ksykora-Win7
a8bf881ae1 * Fixed an umbraco bug where the macro editor, if it tried to enumerate over a 
property whose value was null, would throw a null reference exception instead
 of just ignoring the property.
 2012-11-21 07:53:29 -01:00
ksykora@ksykora-Win7
c446be734c Moved ParseMacros from Init into Load in ItemRenderer to fix an issue where the 
NodeId property on the Item control was being set after the ItemRenderer had
already loaded it into memory.
 2012-11-21 07:54:17 -01:00
Morten Bock
f0f7f6af55 Include some missing files 2012-11-21 07:23:15 -01:00
Shannon Deminick
19bd8ae193 Fixes overloads for TypedMedia, TypedContent, Content, Media calls on UmbracoHelper now that 
GetPropertyValue returns 'object'
 2012-11-21 09:09:37 +05:00
Shannon Deminick
81d8f74e0d Small update to hashcodecombiner and pluginmanager 2012-11-21 08:39:10 +05:00
Shannon Deminick
0011d568c6 Fixes up HashCodeCombiner with correct long field intead of int with correct initialization. 
Adds App_Code and global.asax to be monitored for changes to create the hash code.
 2012-11-21 08:28:11 +05:00
Shannon Deminick
159718bf4f Updated sln to use Nuget for ClientDependency references, ensures that all config changes 
are backward compatible. Have updated the new ClientDependency.config file with the new
features, though these are not required for existing installs but we should advise to merge
the new changes in.
Added ClientDependency.Core.Mvc to the UI project so that it will now ship with this library.
 2012-11-21 08:01:23 +05:00
Shannon Deminick
b9ff3ca729 updated proj references, was getting warnings in build that they could not be referenced. Might be a VS 2012 thing. 2012-11-20 07:41:12 +05:00