yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,908 Commits 4 Branches 7 Tags
e0a71830fa9b0a9e2bf5092b3c2dccfe57b50dbf
Commit Graph

2908 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
5b0057c258 Added missing files. 2012-12-04 03:29:02 +05:00
Shannon Deminick
fb61c55fa7 Started on PartialViewMacros 2012-12-04 03:26:04 +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
Sebastiaan Janssen
76fb5d260f Moved tag Release-4.11.1 to changeset 6eb5f2fb5a88 (from changeset 7f827760cb49) 2012-11-28 13:35:30 -01:00
Sebastiaan Janssen
267cd46ea0 Another additional fix to make the reloading of trees work after package install 2012-11-28 13:34:35 -01:00
Sebastiaan Janssen
96f6a0161f Merge with 4.11.1 2012-11-28 13:08:13 -01:00
Sebastiaan Janssen
7bc53adc67 Closing 4.11.1 branch 2012-11-28 13:06:01 -01:00
Sebastiaan Janssen
8ecff73c18 Added tag Release-4.11.1 for changeset 7f827760cb49 2012-11-28 13:05:21 -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
8def8eaa86 Bumping the version to 4.11.1 2012-11-28 09:44:03 -01:00
Sebastiaan Janssen
c0774ad9b9 Merge 2012-11-28 09:24:54 -01:00
Sebastiaan Janssen
f306cbe457 Move invalidDomain entry to the correct area. 2012-11-28 09:24:40 -01:00
Sebastiaan Janssen
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
Sebastiaan Janssen
e6b162f4f6 Add translation for invalid hostname 2012-11-28 08:37:08 -01:00
Stephan
b40cc1879f missing entry in language file 2012-11-28 07:36:08 -01:00
Shannon Deminick
8a7c7bf77d Merge 2012-11-27 21:47:20 +05:00
Shannon Deminick
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
Sebastiaan Janssen
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
Sebastiaan Janssen
c612727116 Add translations that got lost in merge, fixes U4-1254 2012-11-27 14:07:13 -01:00
Sebastiaan Janssen
ab9c9df7d6 Reverting last minute hacks around the pluginmanager and adding Shannon's fixes 
from changeset 85f9e5879e60
 2012-11-27 13:27:33 -01:00
Stephan
c607e50433 U4-1245, U4-1186... fix the mess I created with hostnames 2012-11-27 12:43:57 -01:00
Stephan
df5555bdf1 Opened branch 4.11.1 2012-11-27 12:40:42 -01:00
Sebastiaan Janssen
9506339e6f Merge with 4.11.0 2012-11-23 13:37:17 -01:00
Sebastiaan Janssen
68605a7560 Closed branch 4.11.0 2012-11-23 13:36:14 -01:00
Sebastiaan Janssen
839dd7315a Added tag Release-4.11.0 for changeset 20e4dff821d8 2012-11-23 13:33:15 -01:00
Sebastiaan Janssen
f1314628d7 One last hack to get the the macroengines to show up after install. 2012-11-23 12:01:43 -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
PerPloug
55cb46927e Changes to template and masterpages helper 2012-11-23 09:37:35 -01:00
Sebastiaan Janssen
654c3b7403 Another temporary fix for trees being unavailable after install, the context is null during upgrades in the installer, so would cause a YSOD 2012-11-23 08:02:23 -01:00
Sebastiaan Janssen
4195754b0c Pull in new translations before release 2012-11-23 07:36:58 -01:00
Sebastiaan Janssen
96a6f17bd7 Update for the WebPI build, should now automatically be good 
Fixes U4-132
 2012-11-22 16:06:06 -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
0a6e91a2f9 Fixed U4-1235 Changing document type alias YSOD's on SQL CE 2012-11-22 15:04:27 -01:00
jeavonleopold
cf9e786e45 U4-1241 Fix - BaseTreePicker GetItemBreadcrumbs causes YSOD for Property Editors that do not store numeric ID's 2012-11-22 15:17:12 +00:00
Sebastiaan Janssen
ba1d3fd3e6 Fix Library.Search not giving back an list of DynamicNodes any more, breaking accessibility to custom properties 2012-11-22 13:23:20 -01:00
Sebastiaan Janssen
ac01fd48fa Some refactoring of the Umbraco:image implementation after code review 2012-11-22 12:30:58 -01:00
Sebastiaan Janssen
f53fb694be Tightened up and renamed the ReadPublished method (relating to pull request for U4-606) 2012-11-22 09:53:11 -01:00
Sebastiaan Janssen
1ecd8fa87d Temporary fix for trees being unavailable after install 2012-11-22 09:34:05 -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
Sebastiaan Janssen
30cc8e0861 Merge 2012-11-21 11:05:38 -01:00
Sebastiaan Janssen
30ca3f6df9 Bump the version to 4.11.0 2012-11-21 11:05:30 -01:00
Stephan
cccfed6efe U4-1222 - improve alternate template consistency 2012-11-21 10:12:04 -01:00
Sebastiaan Janssen
82c148e997 Fixed U4-596 with thanks to firepol! 2012-11-21 09:50:47 -01:00
Sebastiaan Janssen
c50a3e7a27 I broke the build, oh noes! Sorry. :-) 2012-11-21 09:46:04 -01:00
callicj@M2UA1450WRW.us.maritz.net
811cbe2339 Added new method to the Document Service named readPublished() which returns the published version of the document. 
Added new method to the Document class named GetPublishedVersion() which returns the published version of the document.
 2012-11-21 08:03:53 -01:00
ksykora@ksykora-Win7
a8bf881ae1 * Fixed an umbraco bug where the macro editor, if it tried to enumerate over a 
property whose value was null, would throw a null reference exception instead
 of just ignoring the property.
 2012-11-21 07:53:29 -01:00