Commit Graph

178 Commits

Author SHA1 Message Date
Shannon Deminick
fbcabc94f2 Merge with 4.11.5 2013-02-26 00:50:58 +06:00
Shannon Deminick
de9a27db10 Updates to latest Examine lib (another bug fixed) 2013-02-26 00:45:42 +06:00
Sebastiaan Janssen
87947871d1 Have to add new Examine version to Web.UI as well, else the build output from
build.bat file will not be able to find it.
2013-02-22 09:57:58 -01:00
Sebastiaan Janssen
87fee572ff Enable nuget package restore for teamcity, upgrade examine dll 2013-02-22 09:47:23 -01:00
Shannon Deminick
cf4781153e Fixes: #U4-873, #U4-888 - fixes media sorting in razor + MVC. Updates Nunit libs and Examine lib. Adds unit tests to
support new sorting fixes. Fixes up a few other issues with the legacy ExamineBackedMedia class, it will now handle all data
stored in Examine. Simplifies the Examine internal index sets to include all data.
2013-02-22 04:12:24 +06:00
Shannon Deminick
6e1316cb95 Fixes up some merge issues. 2013-02-01 19:41:23 +06:00
Shannon Deminick
bea6031de1 Removes UpgradeScripts stuff from 4.11.4 ... now to go remove it from there too since I've moved the script to a package. 2013-02-01 06:34:28 +06:00
Shannon Deminick
3608242b25 Merge with 4.11.4 2013-02-01 06:22:28 +06:00
Shannon Deminick
a5bea7fc59 Added the ability to automate any c# scripts for an upgrade process. I realize this is superceded already in 6.0
but we need a way to do this in 4.x too especially for this release since we need to run a script to fix some db
issues. I've added a framework using an UpgradeScriptManager and another install step + unit tests for some of the
UpgradeScriptManager methods.
2013-01-31 04:26:37 +06:00
Sebastiaan Janssen
59c844eb8f Upgrade to MySQL connector 6.6.4.0 to fix U4-1519 2013-01-26 15:10:02 -01:00
Shannon Deminick
f95cfc2ee0 Changes v4.x config transforms 2013-01-29 21:18:17 +06:00
Sebastiaan Janssen
e6337b8f14 Properly reference uGoLive MyGet package 2013-02-01 08:38:13 -01:00
Sebastiaan Janssen
5e2d991fab Update uGoLive 2013-02-01 08:16:10 -01:00
Shannon Deminick
1da27e6c2b Removes all upgrade script stuff since we've deployed the fix in a package. 2013-02-01 06:42:42 +06:00
Sebastiaan Janssen
c103f93004 Possible fix for U4-1452 Umbraco 6 beta / MySQL: Unable to find the requested
.Net Framework Data Provider.
2013-01-15 14:19:31 -01:00
Sebastiaan Janssen
a3338a5e22 Remove non-existing files from project.. 2013-01-14 16:56:19 -01:00
Sebastiaan Janssen
ac35d6ccbf Merge with 4.11.4 2013-01-14 14:14:58 -01:00
Sebastiaan Janssen
f7eb323bd5 Updated razor templates 2013-01-14 14:04:33 -01:00
Sebastiaan Janssen
d779422bf4 U4-1457 Missing File for "English (US)" Language Option 2013-01-14 09:08:23 -01:00
Sebastiaan Janssen
c150a91e50 Update uGoLive & Fixes U4-1447 uGolive result: Unable to find node
/configuration/system.web/compilation/@debug in config file web.config
2013-01-14 08:43:50 -01:00
Sebastiaan Janssen
a1cc58408f Include the new translation files in the project so they get in the build too 2013-01-10 11:22:42 -01:00
Sebastiaan Janssen
a53efb394f Closing 4.11.2 branch 2013-01-10 10:54:56 -01:00
Sebastiaan Janssen
98ed32c8cf Include the new translation files in the project so they get in the build too 2013-01-10 09:55:35 -01:00
Sebastiaan Janssen
080e8816a5 Remove non-existing files from project.. 2013-01-14 17:01:32 -01:00
Sebastiaan Janssen
7d0fecb078 Update uGoLive to v1.3.0 (has better reporting of which folders have incorrect permissions) 2013-01-07 14:06:07 -01:00
Shannon Deminick
b5635d5b25 Finished: #U4-1303 - adds 'create macro' checkbox for the Partial View Macros tree. 2013-01-04 02:57:40 +03:00
Sebastiaan Janssen
5994783644 Remove deleted images from the solution as well 2013-01-03 11:21:23 -01:00
Shannon Deminick
fdbf254e7a Changed over master pages to use Html5 DocType. Updated EditMacro to use correct JS classes and correct CSS instead of inline. Also updated
it to use knockoutjs for all UI handling and cleaned up a bit of the code (though it could still do with even more overhaul but at least its legible now).
Ensures that knockoutjs is included in all pages and dialog pages.
Now just need to update the EditMacro page to check for MVC vs Webforms to insert the correct macro syntax for MVC.
2013-01-02 07:20:01 +03:00
Shannon Deminick
a8f808f488 Converted EditMacro.aspx over to use the correct webforms inheritance. 2013-01-01 03:28:09 +03:00
Shannon Deminick
503f62b4d6 Merge 2012-12-31 18:40:29 +03:00
Shannon Deminick
b292cb3ab3 Crated InsertMacroSplitButton webforms control instead of the hacky js code used to insert the split button in the template editor.
Have implemented it now in the EditView (will transition over its use in editTemplate soon but is low priority).
Have got the js callbacks working now for inserting a macro for the mvc editor but need to implement the correct syntax. Also need
to migrate and update the editMacro dialog screen to check if we are rendering for MVC or not and if it is MVC then use the correct
syntax.
2012-12-31 18:39:36 +03:00
Sebastiaan Janssen
2b532f72c3 U4-1376 Remove redundant connectionstring 2012-12-31 12:15:46 -01:00
Emil Christiansen
8c9aa8f3e8 Changed editContent.aspx.cs so the 'access-denied' error messages look more Umbraco'ish
Added access-denied.png picture
Updated Umbraco.Web.UI.csproj so it includes the picture
2012-12-17 10:00:36 -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
094fbf2e6b Putting ClienntDependency.Mvc back now that we have assembly redirects 2012-12-12 07:20:58 -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
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
73414f4504 Merge with default 2012-12-07 19:56:40 +05:00
Sebastiaan Janssen
323af078ca Upgrade to MVC4 2012-12-06 10:31:54 -01:00
Shannon Deminick
fb61c55fa7 Started on PartialViewMacros 2012-12-04 03:26:04 +05: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
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
Sebastiaan Janssen
59c452d2ea Updated log4net to get the medium trust supported version from myget 2012-11-26 10:12:50 -01:00