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
sitereactor
edc80a12ab
Adding DbProviderFactories sqlce config setting to web.config template.
2012-11-02 12:32:36 -01:00
sitereactor
a897f51511
Merge with 4.10.0
2012-11-02 12:29:17 -01:00
Sebastiaan Janssen
ed5a0be20e
Merge with updated language files
2012-11-02 09:32:54 -01:00
Sebastiaan Janssen
4e82d282bf
Cleaned up and updated the web.Template.config before release
...
Also reformatted in hopes to keep the formatting consistent between releases from now on
2012-11-02 09:32:20 -01:00
sitereactor
fe003edd02
Adding language files from github localization repo.
2012-11-02 09:23:59 -01:00
Sebastiaan Janssen
17f326dc89
Enable relationtypes tree in release version as well
2012-11-02 08:52:12 -01:00
Stephan
2c38f7ce7f
fix BaseRest config management - would throw when missing config files
2012-11-01 16:46:04 -01:00
sitereactor
b1240abf0b
Unit tests covering the ContentService.
...
Adding new configurations to the release configs.
Refactoring the publishing strategy and a few of the services.
2012-11-01 10:59:32 -01:00
sitereactor
42d233239a
Adding dummy files, so unit tests doesn't fail in TC
2012-11-01 07:25:02 -01:00
Sebastiaan Janssen
55ac779bf2
Changed the Chines language files to have a zh prefix in the key instead of en.
...
Now the chinese translation files actually work.
Fixed #U4-1126
2012-11-05 10:07:51 -01:00
Sebastiaan Janssen
f8732cd70b
Removed the ExportCode dialog as it's not needed any more now that L2U is gone.
2012-11-05 09:19:20 -01:00
Shannon Deminick
7df9921441
Fixes: #U4-1142, Changed ctor for RenderModel so people can actually create one to pass in to their views if they want.
...
Changed the way that UmbracoTemplatePage works in that if you pass in an IPublishedContent model instead of a RenderModel,
it will be generated for you without a YSOD. Changed the UmbracoHelper ctor so that it can be passed a custom IPublishedContent model
so that it's context is of that model and not the one routed to. Added Umbraco.Web.Mvc to the imported namespaces for Views.
2012-11-05 11:27:28 +06:00
Shannon Deminick
292ded852e
Changed IPropertyEditorValueConverter to public #U4-1141
...
Changed the /umbraco folder in the UI project to be properly cased according to VS (this is initial, we need to
do this for everything but need to write a script, see https://groups.google.com/forum/?pli=1#!topic/umbraco-dev/_KDTHpPPFM8 )
2012-11-05 06:04:40 +06:00
Shannon Deminick
b337f4e5e4
Fixes issue with installing starter kits in the back office after upgrading the installer to install
...
the starter kits properly. Not sure if this was actually working before 4.10 but in any case does work again
now and installs them the correct way whilst waiting for the app pool to restart (we need to put this in place
for the normal packages too!). Upgraded the StarterKits.aspx to have the correct code behind structure. Fixes issue
with missing or invalid referenced images.
2012-11-03 07:18:12 +06:00
sitereactor
a4a4ab433d
Merge with 4.10.0
2012-10-31 15:17:20 -01:00
sitereactor
3e6c56a394
Merge with 4.10.0
2012-10-25 18:39:33 -02:00
Ismail Mayat
f0690ec55f
U4-1069 localize file umbraco.web.ui\umbraco
2012-10-25 14:47:00 -01:00
