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

3120 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastiaan Janssen
a5db5a3e0b Don't generate documentation file in release mode 2012-11-26 12:07:16 -01:00
Sebastiaan Janssen
9f9f754d15 Update log4net references to use the medtrust version 2012-11-26 11:27:56 -01:00
Morten Christensen
c98d3a8a1f Merge 2012-11-26 11:18:56 -01:00
Morten Christensen
0ae707fe78 Refactoring the umbraco version from GlobalSettings to be a seperate class that simply wraps the version from the assembly. 
Since the version will come from the assembly there is no need to have it as part of the GlobalSetting, which is internal and needs a makeover of its own.
 2012-11-26 11:18:06 -01:00
Sebastiaan Janssen
f9fadf9d80 Merge 2012-11-26 10:13:29 -01:00
Sebastiaan Janssen
59c452d2ea Updated log4net to get the medium trust supported version from myget 2012-11-26 10:12:50 -01:00
Morten Christensen
34ac97442d Merge 2012-11-26 10:08:49 -01:00
Morten Christensen
4cc20efa08 Refactoring usages of CurrentVersion to use Version in GlobalSettings. 
Completes U4-1160
 2012-11-26 10:07:08 -01:00
leekelleher
6cbb536dea Set the correct 'Source' path for the TransformXml in 'umbraco.presentation.targets'. 2012-11-26 11:05:17 +00:00
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
5d3fdde39d Adding ServiceStack as nuget package dependency instead of shipping the assembly. 2012-11-26 07:19:34 -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
2512bf3c6b bugfix hgignore 2012-11-24 14:57:49 -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
68605a7560 Closed branch 4.11.0 2012-11-23 13:36:14 -01:00
Sebastiaan Janssen
839dd7315a Added tag Release-4.11.0 for changeset 20e4dff821d8 2012-11-23 13:33:15 -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