d8d131be93
Merge
2012-11-29 06:48:55 -01:00
c8387d58f5
Fix (expected!) merge problem.
2012-11-28 14:39:11 -01:00
f6e8cbf6de
Merge with default
2012-11-28 14:34:55 -01:00
267cd46ea0
Another additional fix to make the reloading of trees work after package install
2012-11-28 13:34:35 -01:00
7bc53adc67
Closing 4.11.1 branch
2012-11-28 13:06:01 -01:00
35e65ad18c
add support for "/foo" hostnames ONLY for backward compat.
...
fix invalid hostname message
2012-11-28 12:43:19 -01:00
8def8eaa86
Bumping the version to 4.11.1
2012-11-28 09:44:03 -01:00
f306cbe457
Move invalidDomain entry to the correct area.
2012-11-28 09:24:40 -01:00
577b989c4c
Aha, string needs to start all the way to the left to appear nicely in the editor
2012-11-28 08:41:54 -01:00
e6b162f4f6
Add translation for invalid hostname
2012-11-28 08:37:08 -01:00
8a7c7bf77d
Merge
2012-11-27 21:47:20 +05:00
38a1179de5
applied patch from rev 189f37a1dd63 which reverts the last minute changes before 4.11
...
release, namely changes to the ApplicationTreeRegistrar, TreeDefinitionCollection, theend installer step.
2012-11-27 21:45:57 +05:00
f263b4d92b
Fixes U4-1162 - In MVC mode, creating a child template doesn't set the layout
...
correctly (it's missing the .cshtml extension)
2012-11-27 15:36:54 -01:00
6edea4a8ee
Adding some of the database changes that is part of v6 - just renaming a few columns so far.
...
Refactoring the installer, which is not working 100% yet.
2012-11-27 15:07:53 -01:00
c612727116
Add translations that got lost in merge, fixes U4-1254
2012-11-27 14:07:13 -01:00
ab9c9df7d6
Reverting last minute hacks around the pluginmanager and adding Shannon's fixes
...
from changeset 85f9e5879e60
2012-11-27 13:27:33 -01:00
c607e50433
U4-1245, U4-1186... fix the mess I created with hostnames
2012-11-27 12:43:57 -01:00
d98bd97c5f
Merge
2012-11-27 11:39:27 -01:00
5233dff63f
Workaround for database setup in the installer, cause medium trust won't play nice.
2012-11-27 11:38:09 -01:00
d6c9f1f991
Reverting SolutionInfo.
...
Updating DatabaseContext for installer although not fully working because of medium trust issue with refreshing connectionstrings.
2012-11-27 10:05:26 -01:00
d5e184b133
Adds logging to the package installer for debugging. Updates DisposableTimer to pass delegates for logging for tracing/info.
...
Fixes PluginManager cache file handling. Ensures cache file is written with the correct TypeResolutionKind. Have added a check to
ensure the file is replaced if a legacy file is found. Added a check to the PluginManager to load from scanning if the cache item is
not found in the file, this fixes all install issues with the type finding in 4.11.
Added new batch file to reset an umbraco install to vanilla (not 100% complete yet)
2012-11-27 10:42:22 +05:00
e9c154f0a2
removed other non used legacy test files.
2012-11-27 07:04:18 +05:00
5973c20b24
Removed old test runner configs for the legacy tests project which is not loaded into the sln at the moment.
...
We will migrate many of these tests over in time.
2012-11-27 07:03:32 +05:00
060ebe2c4f
reverts last minute changes in 4.11 to get trees displaying on install so that we can determine the real cause.
...
Fixes naming conventions on MasterpageHelper.
2012-11-27 06:58:58 +05:00
4796cdd803
MySQL: Corrected a typo in the "DropDow" data-type definition.
2012-11-26 22:04:44 +00:00
7641bafd17
Refactoring installer
2012-11-26 17:58:42 -01:00
e5ec9eb06f
Reducing the usage of the DatabaseFactory
2012-11-26 17:20:58 -01:00
df8b4351c1
Merge
2012-11-26 17:11:56 -01:00
9d5b1e178a
Move all the lib files to NuGet/MyGet and remove legacy folders
2012-11-26 17:11:13 -01:00
7140922e7a
Refactoring installer to use the new datalayer for installation.
2012-11-26 15:57:03 -01:00
92913389b8
Fixing an issue I had introduced in ExpressionHelper
2012-11-26 14:13:50 -01:00
00f2458edd
Adding a few unit tests to verify the outcome of the generated sql syntax for the Content- and ContentType repositories.
2012-11-26 12:28:59 -01:00
a5db5a3e0b
Don't generate documentation file in release mode
2012-11-26 12:07:16 -01:00
ca69ef7810
Merge
2012-11-26 11:29:53 -01:00
8ee0fffb84
Content repo sql tests
2012-11-26 11:29:20 -01:00
9f9f754d15
Update log4net references to use the medtrust version
2012-11-26 11:27:56 -01:00
c98d3a8a1f
Merge
2012-11-26 11:18:56 -01:00
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
f9fadf9d80
Merge
2012-11-26 10:13:29 -01:00
59c452d2ea
Updated log4net to get the medium trust supported version from myget
2012-11-26 10:12:50 -01:00
34ac97442d
Merge
2012-11-26 10:08:49 -01:00
4cc20efa08
Refactoring usages of CurrentVersion to use Version in GlobalSettings.
...
Completes U4-1160
2012-11-26 10:07:08 -01:00
6cbb536dea
Set the correct 'Source' path for the TransformXml in 'umbraco.presentation.targets'.
2012-11-26 11:05:17 +00:00
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
3fe1975514
Refactoring usages of umbraco.GlobalSettings.CurrentVersion to use the new Umbraco.Core.Configuration.GlobalSettings.Version
2012-11-26 09:57:05 -01:00
e07fc8c2ba
Adding language column to cmsContentVersion
2012-11-26 09:02:49 -01:00
78b05eb44c
Correcting SolutionInfo and AssemblyInfo, so assembly version is correct for all shipped assemblies
2012-11-26 07:46:29 -01:00
1dd9b6c4d5
Removing nuget packages from repo as we are using package restore
2012-11-26 07:16:48 -01:00
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
ce12bfa80e
Adding numeric attribute for testing.
...
Adding type test for composition implementation.
2012-11-25 19:19:10 -01:00
Morten Christensen