Shannon Deminick
ca62b3aedb
adds umb favicon to installer and back office. This also ensures it doesn't get overridden by package files (some do that).
2012-12-03 03:21:07 +05:00
Morten Christensen
2f83e5ba31
Fixing a few broken unit tests
2012-11-29 13:05:51 -01:00
Morten Christensen
acb909c706
Refactoring installer to use the DatabaseContext for installing the umbraco db schema and default data.
...
Minimizing the use of the json/ajax calls during installation.
2012-11-29 12:40:48 -01:00
Morten Christensen
d8d131be93
Merge
2012-11-29 06:48:55 -01:00
Sebastiaan Janssen
f6e8cbf6de
Merge with default
2012-11-28 14:34:55 -01:00
Stephan
35e65ad18c
add support for "/foo" hostnames ONLY for backward compat.
...
fix invalid hostname message
2012-11-28 12:43:19 -01:00
Sebastiaan Janssen
f306cbe457
Move invalidDomain entry to the correct area.
2012-11-28 09:24:40 -01:00
Sebastiaan Janssen
e6b162f4f6
Add translation for invalid hostname
2012-11-28 08:37:08 -01:00
Sebastiaan Janssen
c612727116
Add translations that got lost in merge, fixes U4-1254
2012-11-27 14:07:13 -01:00
Stephan
c607e50433
U4-1245, U4-1186... fix the mess I created with hostnames
2012-11-27 12:43:57 -01:00
Morten Christensen
d98bd97c5f
Merge
2012-11-27 11:39:27 -01:00
Morten Christensen
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
Sebastiaan Janssen
9d5b1e178a
Move all the lib files to NuGet/MyGet and remove legacy folders
2012-11-26 17:11:13 -01:00
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
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
78b05eb44c
Correcting SolutionInfo and AssemblyInfo, so assembly version is correct for all shipped assemblies
2012-11-26 07:46:29 -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
e32880f215
Final Merge with 4.11.0
2012-11-23 19:59:28 -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
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
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
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
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
Sebastiaan Janssen
2218459877
Correcting the path for the targets file, should work now even if there are spaces in the path
2012-11-19 08:59:23 -01:00
Sebastiaan Janssen
8f5e2946d6
Merge
2012-11-19 08:10:16 -01:00
Sebastiaan Janssen
19c3b251a0
Include the VS targets file so that the build server can find it as well
2012-11-19 08:09:43 -01:00
Stephan
8609389bdb
U4-1198 - publish dialog does not detect that a parent is not published
2012-11-17 14:55:58 -01:00
Morten Christensen
f9328af55f
Merge with 4.11.0
2012-11-17 14:41:54 -01:00
Stephan
b02afb3af8
u4-1186 - Manage hostnames UI bug with validators
2012-11-17 13:45:53 -01:00
Shannon Deminick
10df6e878c
updated config
2012-11-14 22:05:58 +05:00
Morten Christensen
c5d86e9525
Merge with 4.10.0
2012-11-08 18:29:07 -01:00
Sebastiaan Janssen
bd4e6eaa62
Merge
2012-11-08 11:30:10 -01:00
Sebastiaan Janssen
d27e32e918
Medium Trust on by default in debug web.configs
...
Don't overwrite root web.config on each build if already exists
Should make F5-debug a lot easier
2012-11-08 11:17:21 -01:00
sitereactor
9f95c48242
Updating swedish language file.
2012-11-08 08:26:24 -01:00
sitereactor
5541ba8a30
Merge with 4.10.0
2012-11-08 08:00:20 -01:00
Sebastiaan Janssen
e2934bb036
Merge
2012-11-08 07:06:07 -01:00
Sebastiaan Janssen
664a0ff4ec
Add MVC3 dlls to bin folder so that hosts don't have to have MVC installed
...
Fixed #U4-1137
2012-11-08 07:05:29 -01:00
sitereactor
715f0ddac1
Updating Chinese language files from github.
2012-11-08 06:56:55 -01:00
Shannon Deminick
29c96c2c64
Converted QuickSearch over to use correct codebehind
2012-11-08 08:12:24 +05:00
sitereactor
f438ad16e0
Merge with 4.10.0
2012-11-06 07:28:14 -01:00
Shannon Deminick
315e8b27a0
Migrated loadStarterKitDesigns to use the new codebehind structure.
2012-11-06 09:14:39 +06:00
