lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
997 Commits 94 Branches 33 Tags
4957a259d03a2d6f4719986471fa8e8751dd7467
Commit Graph
997 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
smwhit 4957a259d0 Merge 2010-04-07 15:36:41 +01:00
smwhit 8fcbea38c2 Issue 16229. Validation for empty filenames when uploading media 2010-04-07 15:31:16 +01:00
Suha Can 40d7c95b72 Merge 2010-04-06 13:40:54 -07:00
Suha Can 76b5297713 - Fixing build break due to missing file. 
- Code convention enforcement to previous contribution.
 2010-04-06 13:23:59 -07:00
Simon Whittemore 7fd128d2f3 fix for issue 2010-04-06 19:40:51 +01:00
smwhit 4a88a8bf10 Fix for issue 16353 2010-04-06 17:17:39 +01:00
Andrew Ma fde6eef6b9 Fix for issue [workitem:16371] 
Removing FollowReturnUrl filter because it always gets executed and does not allow actions to return other view or redirect to other locations.
Replacing filter with a Controller extension method called ReturnUrlRedirect which parses the ReturnUrl in the querystring and returns a RedirectFilter action with that Url.
 2010-04-05 22:36:30 -07:00
Nathan Heskew e41d711242 Added tag MIX10 for changeset e048b594f336 2010-03-12 00:47:38 -08:00
Nathan Heskew 48f2de11ff Merging branches: dev -> default 2010-03-12 00:47:22 -08:00
mibach 56cead2791 Merge 
--HG--
branch : dev
 2010-03-12 00:10:38 -08:00
mibach d5d43de13a Completion of Corporate Business Theme 1.0 
--HG--
branch : dev
 2010-03-12 00:09:35 -08:00
rpaquay@microsoft.com 3f89eb1417 Fix issue with generating LINK tags for Live Writer manifests 
Use "AbsoluteAction" helper method instead of hard-coded
"http://localhost:30320".

--HG--
branch : dev
 2010-03-11 17:03:37 -08:00
rpaquay@microsoft.com 69312b625d Fix issue with BaseViewModel override 
When the main view doesn't use a BaseViewModel class, we create an
AdaptedViewModel for the layout and document. However, we don't want
to "Eval" the various properties to the original ViewModel to avoid
conflicting rendering of zones.

--HG--
branch : dev
 2010-03-11 15:55:26 -08:00
Louis DeJardin 2943b7887e Allowing first RC in addition to RTM and RC2 when found in GAC 
--HG--
branch : dev
 2010-03-11 14:38:29 -08:00
Louis DeJardin 0d07a3c691 Merge 
--HG--
branch : dev
 2010-03-11 14:09:49 -08:00
Louis DeJardin 820c71a01a Updating Orchard to ASP.NET MVC 2 RTM 
Binaries taken from installation of public download
http://www.microsoft.com/downloads/details.aspx?displaylang=en&FamilyID=c9ba1fe1-3ba8-439a-9e21-def90a8615a9
Version check updated to allow Orchard to run with RTM or RC2 of System.Web.Mvc.dll in GAC

--HG--
branch : dev
 2010-03-11 14:08:54 -08:00
Michael Dorian Bach ba24b5f9ee Working copy of Corporate theme added. More work needed. Not in usable state. 
--HG--
branch : dev
 2010-03-11 13:57:08 -08:00
Jonathan Wall 3a346284af Starting some ie6 fixes. 
--HG--
branch : dev
 2010-03-10 21:04:33 -08:00
Jonathan Wall b1a9447ce6 Added the notification styles from the admin to the green and classic themes. 
--HG--
branch : dev
 2010-03-10 14:34:41 -08:00
Jonathan Wall c28fc55a17 More minor updates to classic and classic dark CSS. 
--HG--
branch : dev
 2010-03-10 12:44:31 -08:00
Jonathan Wall ce28540efe Minor updates to theme preview toolbar and classic CSS. 
--HG--
branch : dev
 2010-03-10 12:19:44 -08:00
Jonathan Wall f3d42957de Hooked up last image in theme preview toolbar. 
--HG--
branch : dev
 2010-03-10 11:20:58 -08:00
Nathan Heskew 4fdc3bde2a Resolving CSS image URLs in the ThemePreview template 
--HG--
branch : dev
 2010-03-10 11:04:45 -08:00
Nathan Heskew 060d9b21af Ensuring the content edit button on the front stays above everything 
--HG--
branch : dev
 2010-03-10 10:59:17 -08:00
jowall a307588309 Updated both classic themes and moved some CSS from live edit to theme preview bar. 
--HG--
branch : dev
 2010-03-10 10:51:15 -08:00
Michael Dorian Bach 0f57bfcfe1 Fixed CSS rendering issue where form styling was affecting theme preview selector 
--HG--
branch : dev
 2010-03-10 10:14:48 -08:00
jowall e065d5053c Update to csproj file. 
--HG--
branch : dev
 2010-03-10 09:38:25 -08:00
Nathan Heskew e7dbae2796 Encoding directly the site name in the default header template 
Instead of getting the encoding from Html.TitleForPage which also adds the title to the page title...something not needed here

--HG--
branch : dev
 2010-03-09 22:25:06 -08:00
Michael Dorian Bach b5bf9cf6f4 Merge 
--HG--
branch : dev
 2010-03-09 21:10:37 -08:00
jowall 7798083a8d Updated CSS to green, classic, and classic dark themes. 
--HG--
branch : dev
 2010-03-09 20:55:38 -08:00
Michael Dorian Bach 274b96449b Updated Cotoso theme CSS. 
Fixed triple site name in page title.
Removed trailing "Author" content at the end of blog pages.

--HG--
branch : dev
 2010-03-09 20:55:06 -08:00
Nathan Heskew a9c7c8ea14 Giving the blog post metadata summary template a little inline info 
--HG--
branch : dev
 2010-03-09 19:51:38 -08:00
Michael Dorian Bach 189d1e9a10 Merge 
--HG--
branch : dev
rename : src/Orchard.Web/Themes/Contoso/DesignerNotes/Highlights.html => src/Orchard.Web/Themes/Contoso/Zones/Highlights.html
 2010-03-09 19:41:09 -08:00
Michael Dorian Bach 1cd6b63006 Merge 
--HG--
branch : dev
 2010-03-09 19:35:57 -08:00
Michael Dorian Bach bdff945dbc CSS Fixes for Contoso Theme. 
Add HTML for markup around various elements in module views index/search

--HG--
branch : dev
 2010-03-09 19:35:06 -08:00
Michael Dorian Bach c52f802827 Wrapping div around archive bread-crumb trail and added class to H1 page header 
--HG--
branch : dev
 2010-03-09 18:11:12 -08:00
Nathan Heskew fa9dc2d728 Wrapping up some cleanup work in the admin. 
--HG--
branch : dev
 2010-03-09 17:08:37 -08:00
Erik Porter 4b41550957 Renamed "DesignerNotes" to "Zones" 
--HG--
branch : dev
rename : src/Orchard.Web/Themes/Classic/DesignerNotes/Sidebar.html => src/Orchard.Web/Themes/Classic/Zones/Sidebar.html
rename : src/Orchard.Web/Themes/Contoso/DesignerNotes/Highlights.html => src/Orchard.Web/Themes/Contoso/Zones/Highlights.html
rename : src/Orchard.Web/Themes/Contoso/DesignerNotes/Home-Hero-Gallery.html => src/Orchard.Web/Themes/Contoso/Zones/Home-Hero-Gallery.html
rename : src/Orchard.Web/Themes/Contoso/DesignerNotes/Home-Hero.html => src/Orchard.Web/Themes/Contoso/Zones/Home-Hero.html
rename : src/Orchard.Web/Themes/Contoso/DesignerNotes/Sidebar-w2.html => src/Orchard.Web/Themes/Contoso/Zones/Sidebar-w2.html
rename : src/Orchard.Web/Themes/Contoso/DesignerNotes/Sidebar-w3.html => src/Orchard.Web/Themes/Contoso/Zones/Sidebar-w3.html
rename : src/Orchard.Web/Themes/Green/DesignerNotes/User1.html => src/Orchard.Web/Themes/Green/Zones/User1.html
rename : src/Orchard.Web/Themes/Green/DesignerNotes/User2.html => src/Orchard.Web/Themes/Green/Zones/User2.html
rename : src/Orchard.Web/Themes/Green/DesignerNotes/User3.html => src/Orchard.Web/Themes/Green/Zones/User3.html
 2010-03-09 16:19:45 -08:00
Erik Porter 7800b75e77 Fixed a compile bug in the Contoso theme 
--HG--
branch : dev
 2010-03-09 15:58:22 -08:00
Erik Porter 40ca536d1a Wording change to admin dashboard 
--HG--
branch : dev
 2010-03-09 15:54:29 -08:00
Nathan Heskew 390538a744 Fixing the page.summary display title link when used from a different module 
--HG--
branch : dev
 2010-03-09 15:45:59 -08:00
Erik Porter 61105565d7 Updated temp text in NotFound page 
--HG--
branch : dev
 2010-03-09 15:40:46 -08:00
Michael Dorian Bach 571a39b737 Adding first rev of Contoso Theme 
--HG--
branch : dev
 2010-03-09 15:28:38 -08:00
Nathan Heskew ff6415a8bf Fixing the FileREgistrationContext to make link tags self-closing 
--HG--
branch : dev
 2010-03-09 15:14:40 -08:00
jowall fc08a61594 Merge 
--HG--
branch : dev
 2010-03-09 15:05:06 -08:00
jowall 94ff65840e Changed id to class in menu file and updated themes. 
--HG--
branch : dev
 2010-03-09 15:03:49 -08:00
Nathan Heskew 9535f18573 Making the permalink input UI for blog, post and page consistent 
--HG--
branch : dev
 2010-03-09 14:57:24 -08:00
jowall 53fbe1fe86 Added primary button to manage menus page. 
--HG--
branch : dev
 2010-03-09 14:09:44 -08:00
jowall 2a6d05c964 Styled tag page in Green, Classic, and Classic Dark theme. 
--HG--
branch : dev
 2010-03-09 12:09:32 -08:00
jowall b5878aec4b Merge 
--HG--
branch : dev
 2010-03-09 11:48:50 -08:00