yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26,222 Commits 4 Branches 7 Tags
162b90194de27d3353aba0dbe53bc5bc6cc14a8b
Commit Graph

4333 Commits

Author SHA1 Message Date
Morten Christensen
0cce4a1a9e Updating DefaultData and ContentControl to better support saving through the new api. 
DataTypes doesn't save directly to the db, but keeps the value in-memory so the save can be handled by the new api.
Correcting the usage of versioning in the ContentRepository.
 2012-12-14 11:43:16 -01:00
Morten Christensen
c386aa491b Merge with 6.0.0 2012-12-12 15:18:31 -01:00
Sebastiaan Janssen
21ead72d48 Add en_us files in VS project file so they'll actually be in the built zip file 2012-12-12 12:40:18 -01:00
Sebastiaan Janssen
23fff9be8c Remove the legacy Cache Browser 2012-12-12 10:25:34 -01:00
Morten Christensen
6c7484a1bf Merge with 6.0.0 2012-12-12 09:01:26 -01:00
Sebastiaan Janssen
094fbf2e6b Putting ClienntDependency.Mvc back now that we have assembly redirects 2012-12-12 07:20:58 -01:00
Morten Christensen
6516041617 Merge with 6.0.0 2012-12-11 08:55:45 -01:00
Morten Christensen
614ef15f8a Removing infrastructure setting, as its not needed any more 2012-12-11 08:00:06 -01:00
Sebastiaan Janssen
1674b440ee Make sure to always use only the Web.Template.Config when transforming during build.bat 2012-12-10 12:12:32 -01:00
Sebastiaan Janssen
dc72907c33 Correcting indentation of xml file to VS default (tabs) 2012-12-10 11:51:04 -01:00
Sebastiaan Janssen
7e3faf3810 Add FixedDisplayModes package, as per issue #U4-1305 2012-12-10 11:45:36 -01:00
Sebastiaan Janssen
400648d5bc Not sure how the Test.cs reference got back in App_Code 2012-12-10 11:39:31 -01:00
Shannon Deminick
c9f40a74de Changed all data services to create one repository type in the constructor instead of resolving 
them in each method since they are only supposed to be using their single unit of work anyways (resolving
will return the same repository anyways, but in some cases it might have been with a different UOW)
Removed SetUnitOfWork method on IRepository as this is not needed.
Removed the old implementation of RepositoryResolver and replaces it with the RepositoryInstanceResolver (but
maintained the name of RepositoryResolver)
 2012-12-10 02:58:23 +05:00
Shannon Deminick
084e2ee37f Updated EditMacro to use CSS instead of hard coded styles throughout. 2012-12-09 01:22:53 +05:00
Shannon Deminick
5870452cc9 Updated assembly binding for MVC(4, and really any other MVC version that requires assembly binding if 
old libraries are built against old MVC versions).
Fixes a check for the ScriptingFile in for Partial View macros.
 2012-12-09 00:50:58 +05:00
Shannon Deminick
73414f4504 Merge with default 2012-12-07 19:56:40 +05:00
Morten Christensen
77588252a6 Merge with 6.0.0 2012-12-07 09:30:48 -01:00
Morten Christensen
6a6302335d Setting trust level to full for the time being 2012-12-07 09:28:40 -01:00
Shannon Deminick
2a90e93a6f Updated partial view macro engine to support storing the files in the App_Plugins/[packagename]/Views/MacroPartials 
so they can be stored with a package and not pollute the main file system.
 2012-12-07 07:04:11 +05:00
Sebastiaan Janssen
cd2711957f Additional update for MVC4 support, nuget dependency updated, errors due to 
web.config file in Views folder fixed
 2012-12-06 11:33:17 -01:00
Sebastiaan Janssen
323af078ca Upgrade to MVC4 2012-12-06 10:31:54 -01:00
Sebastiaan Janssen
9da62aa965 Correct wrongly committed urlrewriting/xsltextensions configs 2012-12-06 10:30:52 -01:00
bpowell@LAWRENCE.network.bitmapped.net
d30791b8e0 Adding en_us language option. Modified existing en language name to clarify it is UK. 2012-12-06 01:21:58 +05:00
Morten Christensen
628800c14a Committing configs with correct spacing 2012-12-05 12:37:21 -01:00
Shannon Deminick
e0a71830fa Updated macro editor to support Partial view macros. Improves the JS in the editor (no more c# based js) which auto clears 
other fields and drop downs when other files are selected.
 2012-12-04 05:42:15 +05:00
Shannon Deminick
fb61c55fa7 Started on PartialViewMacros 2012-12-04 03:26:04 +05:00
Sebastiaan Janssen
71410f0f12 Merge changes from default into 6.0.0 2012-12-03 16:05:32 -01:00
Sebastiaan Janssen
97639040f0 New way of transforming web.config file that should work in both VS2010 and 2012 
Moved transform responsibility to Umbraco.Web.UI (mainly because circular
dependency has been solved already a few months ago)
Managed to clean up build.proj significantly in the process
 2012-12-03 15:53:06 -01:00
Shannon Deminick
41acb091eb Updated the Umbraco_Client folder casing in the UI project. All folders are now properly cased in the UI proj. 2012-12-03 05:58:27 +05:00
Shannon Deminick
24dc6abcc0 Fixed folder casing in the UI project for all folders (except the Umbraco_Client one which will be in the 
next commit). Now, VS thinks that all folders in the UI project are properly cased even though on the file system
they are not. This means that any webforms classes that are created in the UI project will automatically have the
correct namespace casing.
 2012-12-03 05:43:31 +05:00
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
Casey Neehouse
3bd98d851a Reverting the config files that inadvertently got committed. 2012-11-29 21:42:37 +05:00
Casey Neehouse
9eea46b19b Modification of UserControl usage to allow for Virtual Path to be used correctly. 2012-11-29 21:27:42 +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