lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 03:25:23 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity
1,207 Commits 83 Branches 32 Tags
4546f2e14396561f12b2f5f1def37af98f59f129
Commit Graph

936 Commits

Author SHA1 Message Date
Suha Can
3f0c7e73dc - Fixing 16252: Add user exception when no email address entered 
--HG--
branch : dev
 2010-03-04 13:25:22 -08:00
Suha Can
7217a5f6f8 Merge 
--HG--
branch : dev
 2010-03-04 12:20:10 -08:00
Suha Can
99ec679363 - Fixing 16258: Save Comment throws SQLDateTime overflow or The view 'Create' was not found 
--HG--
branch : dev
 2010-03-04 12:19:03 -08:00
jowall
1741fc1e0c Updated the layout of the edit media page in the admin. 
--HG--
branch : dev
 2010-03-04 12:18:38 -08:00
Andrew Ma
c0b640c498 - Fixing 16274: If user is already logged on and goes to the LogOn page, user is redirected to ~/ 
--HG--
branch : dev
 2010-03-03 10:21:59 -08:00
Suha Can
b627b39193 Merge 
--HG--
branch : dev
 2010-03-04 11:07:51 -08:00
Suha Can
754381f858 - coding convention from previous checkin. 
- Please refer to the code for our coding conventions (we also have a Resharper file in the source tree under /src if you are using Resharper

--HG--
branch : dev
 2010-03-04 10:58:55 -08:00
Erik Porter
9ed55fc156 Merge 
--HG--
branch : dev
 2010-03-04 10:56:49 -08:00
Erik Porter
48ae1fc2be Made blog and page menu dynamic to hide the manage links when there are no items yet 
--HG--
branch : dev
 2010-03-04 10:55:29 -08:00
Nathan Heskew
7d52b4e7c9 Fixing a "null" slug suggestion bug 
- When the title was empty, null was suggested

--HG--
branch : dev
 2010-03-04 03:28:33 -08:00
Nathan Heskew
28e09002d7 Giving more style to the front end manage UI to keep it from being affected by Theme CSS 
First of many additions, most likely

--HG--
branch : dev
 2010-03-04 03:13:03 -08:00
Nathan Heskew
f2df4df51c Some more work on being able to add media from the (TinyMCE) editor 
- TinyMCE module takes a dependency on the current media module api with the addmedia plugin which is functional to the point of being able to add media*

* it still needs a setting of where the media should go (current spec and xmlrpc api say <blog slug>/<post slug> for a blog post but (1) I don't even have that context from the editor and (2) what about other content types)
* it (the plugin) still needs to do an async post and handle the returned JSON appropriatly (insert image tag into the editor using returned url and close the dialog otherwise present any given error)

--HG--
branch : dev
 2010-03-04 02:58:49 -08:00
Erik Porter
d1f9fad499 Added an action to the media admin controller to upload from javascript and return friendly strings 
--HG--
branch : dev
 2010-03-04 00:15:56 -08:00
Erik Porter
426dec25f6 Merge 
--HG--
branch : dev
 2010-03-03 23:32:18 -08:00
Erik Porter
a21471ddf3 Code cleanup and consistency (renaming to match patterns, moving namespaces, etc) 
--HG--
branch : dev
rename : src/Orchard.Web/Core/Common/Controllers/BodyDriver.cs => src/Orchard.Web/Core/Common/Drivers/BodyDriver.cs
rename : src/Orchard.Web/Core/Common/Controllers/RoutableDriver.cs => src/Orchard.Web/Core/Common/Drivers/RoutableDriver.cs
rename : src/Orchard.Web/Core/Common/Models/BodyAspectHandler.cs => src/Orchard.Web/Core/Common/Handlers/BodyAspectHandler.cs
rename : src/Orchard.Web/Core/Common/Models/CommonAspectHandler.cs => src/Orchard.Web/Core/Common/Handlers/CommonAspectHandler.cs
rename : src/Orchard.Web/Core/Common/Models/RoutableAspectHandler.cs => src/Orchard.Web/Core/Common/Handlers/RoutableAspectHandler.cs
rename : src/Orchard.Web/Core/Common/Records/BodyRecord.cs => src/Orchard.Web/Core/Common/Models/BodyRecord.cs
rename : src/Orchard.Web/Core/Common/Records/CommonRecord.cs => src/Orchard.Web/Core/Common/Models/CommonRecord.cs
rename : src/Orchard.Web/Core/Common/Records/CommonVersionRecord.cs => src/Orchard.Web/Core/Common/Models/CommonVersionRecord.cs
rename : src/Orchard.Web/Core/Common/Records/RoutableRecord.cs => src/Orchard.Web/Core/Common/Models/RoutableRecord.cs
rename : src/Orchard.Web/Core/Navigation/Records/MenuItemRecord.cs => src/Orchard.Web/Core/Navigation/Models/MenuItemRecord.cs
rename : src/Orchard.Web/Core/Navigation/Records/MenuPartRecord.cs => src/Orchard.Web/Core/Navigation/Models/MenuPartRecord.cs
rename : src/Orchard.Web/Core/Navigation/Services/MainMenu.cs => src/Orchard.Web/Core/Navigation/Services/MainMenuService.cs
rename : src/Orchard.Web/Core/Scheduling/Records/ScheduledTaskRecord.cs => src/Orchard.Web/Core/Scheduling/Models/ScheduledTaskRecord.cs
rename : src/Orchard.Web/Core/Settings/Controllers/SiteSettingsDriver.cs => src/Orchard.Web/Core/Settings/Drivers/SiteSettingsDriver.cs
rename : src/Orchard.Web/Core/Settings/Models/SiteSettingsHandler.cs => src/Orchard.Web/Core/Settings/Handlers/SiteSettingsHandler.cs
rename : src/Orchard.Web/Core/Settings/Records/SiteSettingsRecord.cs => src/Orchard.Web/Core/Settings/Models/SiteSettingsRecord.cs
rename : src/Orchard.Web/Core/Themes/Models/ThemeSiteSettingsHandler.cs => src/Orchard.Web/Core/Themes/Handlers/ThemeSiteSettingsHandler.cs
rename : src/Orchard.Web/Core/Themes/Records/ThemeRecord.cs => src/Orchard.Web/Core/Themes/Models/ThemeRecord.cs
rename : src/Orchard.Web/Core/Themes/Records/ThemeSiteSettingsRecord.cs => src/Orchard.Web/Core/Themes/Models/ThemeSiteSettingsRecord.cs
rename : src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogDriver.cs => src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogDriver.cs
rename : src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostDriver.cs => src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogPostDriver.cs
rename : src/Orchard.Web/Modules/Orchard.Blogs/Models/BlogArchiveHandler.cs => src/Orchard.Web/Modules/Orchard.Blogs/Handlers/BlogArchiveHandler.cs
rename : src/Orchard.Web/Modules/Orchard.Blogs/Models/BlogHandler.cs => src/Orchard.Web/Modules/Orchard.Blogs/Handlers/BlogHandler.cs
rename : src/Orchard.Web/Modules/Orchard.Blogs/Models/BlogPostHandler.cs => src/Orchard.Web/Modules/Orchard.Blogs/Handlers/BlogPostHandler.cs
rename : src/Orchard.Web/Modules/Orchard.Comments/Controllers/CommentDriver.cs => src/Orchard.Web/Modules/Orchard.Comments/Drivers/CommentDriver.cs
rename : src/Orchard.Web/Modules/Orchard.Comments/Controllers/HasCommentsContainerDriver.cs => src/Orchard.Web/Modules/Orchard.Comments/Drivers/HasCommentsContainerDriver.cs
rename : src/Orchard.Web/Modules/Orchard.Comments/Controllers/HasCommentsDriver.cs => src/Orchard.Web/Modules/Orchard.Comments/Drivers/HasCommentsDriver.cs
rename : src/Orchard.Web/Modules/Orchard.Comments/Models/CommentHandler.cs => src/Orchard.Web/Modules/Orchard.Comments/Handlers/CommentHandler.cs
rename : src/Orchard.Web/Modules/Orchard.Comments/Models/CommentSettingsHandler.cs => src/Orchard.Web/Modules/Orchard.Comments/Handlers/CommentSettingsHandler.cs
rename : src/Orchard.Web/Modules/Orchard.Comments/Models/HasCommentsContainerHandler.cs => src/Orchard.Web/Modules/Orchard.Comments/Handlers/HasCommentsContainerHandler.cs
rename : src/Orchard.Web/Modules/Orchard.Comments/Models/HasCommentsHandler.cs => src/Orchard.Web/Modules/Orchard.Comments/Handlers/HasCommentsHandler.cs
rename : src/Orchard.Web/Modules/Orchard.DevTools/Models/DebugLinkHandler.cs => src/Orchard.Web/Modules/Orchard.DevTools/Handlers/DebugLinkHandler.cs
rename : src/Orchard.Web/Modules/Orchard.Pages/Controllers/PageDriver.cs => src/Orchard.Web/Modules/Orchard.Pages/Drivers/PageDriver.cs
rename : src/Orchard.Web/Modules/Orchard.Pages/Models/PageHandler.cs => src/Orchard.Web/Modules/Orchard.Pages/Handlers/PageHandler.cs
rename : src/Orchard.Web/Modules/Orchard.Pages/Services/SlugConstraint.cs => src/Orchard.Web/Modules/Orchard.Pages/Routing/SlugConstraint.cs
rename : src/Orchard.Web/Modules/Orchard.Pages/Services/SlugConstraintUpdator.cs => src/Orchard.Web/Modules/Orchard.Pages/Routing/SlugConstraintUpdator.cs
rename : src/Orchard.Web/Modules/Orchard.Roles/Controllers/UserRolesDriver.cs => src/Orchard.Web/Modules/Orchard.Roles/Drivers/UserRolesDriver.cs
rename : src/Orchard.Web/Modules/Orchard.Roles/Models/UserRolesHandler.cs => src/Orchard.Web/Modules/Orchard.Roles/Handlers/UserRolesHandler.cs
rename : src/Orchard.Web/Modules/Orchard.Roles/Records/PermissionRecord.cs => src/Orchard.Web/Modules/Orchard.Roles/Models/PermissionRecord.cs
rename : src/Orchard.Web/Modules/Orchard.Roles/Records/RoleRecord.cs => src/Orchard.Web/Modules/Orchard.Roles/Models/RoleRecord.cs
rename : src/Orchard.Web/Modules/Orchard.Roles/Records/RolesPermissions.cs => src/Orchard.Web/Modules/Orchard.Roles/Models/RolesPermissionsRecord.cs
rename : src/Orchard.Web/Modules/Orchard.Roles/Records/UserRolesRecord.cs => src/Orchard.Web/Modules/Orchard.Roles/Models/UserRolesRecord.cs
rename : src/Orchard.Web/Modules/Orchard.Sandbox/Controllers/SandboxPageDriver.cs => src/Orchard.Web/Modules/Orchard.Sandbox/Drivers/SandboxPageDriver.cs
rename : src/Orchard.Web/Modules/Orchard.Sandbox/Models/SandboxContentHandler.cs => src/Orchard.Web/Modules/Orchard.Sandbox/Handlers/SandboxContentHandler.cs
rename : src/Orchard.Web/Modules/Orchard.Tags/Controllers/HasTagsDriver.cs => src/Orchard.Web/Modules/Orchard.Tags/Drivers/HasTagsDriver.cs
rename : src/Orchard.Web/Modules/Orchard.Tags/Models/HasTagsHandler.cs => src/Orchard.Web/Modules/Orchard.Tags/Handlers/HasTagsHandler.cs
rename : src/Orchard.Web/Modules/Orchard.Users/Controllers/UserDriver.cs => src/Orchard.Web/Modules/Orchard.Users/Drivers/UserDriver.cs
rename : src/Orchard.Web/Modules/Orchard.Users/Models/UserHandler.cs => src/Orchard.Web/Modules/Orchard.Users/Handlers/UserHandler.cs
 2010-03-03 23:31:42 -08:00
Suha Can
5481b2a9ea Merge 
--HG--
branch : dev
 2010-03-03 17:42:48 -08:00
Suha Can
ca477238f1 - Add Area scenario is now working. Areas added via MVC 2 RC 2 VS Tooling are discovered/loaded as Orchard modules. 
- Html.AddRenderAction to permit controller actions to display views in zones.
- Disabling the always on AntiForgery filter (will make it optional probably).

--HG--
branch : dev
 2010-03-03 17:39:24 -08:00
Louis DeJardin
a238d0e0d0 Relocating the default role/permission assignments 
Now that there is a SetupController that is a more appropriate place to simulate
one-time-only module activation. This avoids a problem where default permissions
would be re-applied when the app domain restarted.

--HG--
branch : dev
 2010-03-03 17:36:54 -08:00
Louis DeJardin
bcaa4462ec Changing the MVC hint path 
Invalid hint path causes problems on some machines

--HG--
branch : dev
 2010-03-03 17:35:25 -08:00
jowall
5a6d0f3bc0 Merge 
--HG--
branch : dev
 2010-03-03 16:45:11 -08:00
jowall
7d7afd6703 Adding pages.page.ascx files to classic and green themes. 
--HG--
branch : dev
 2010-03-03 16:41:38 -08:00
jowall
d622562515 Removed "published by" text from CMS pages in the classic and green themes. 
--HG--
branch : dev
 2010-03-03 16:40:49 -08:00
Louis DeJardin
ed4314ef2a Merge 
--HG--
branch : dev
 2010-03-03 16:38:40 -08:00
Nathan Heskew
cdf6568453 Fixing the (currently hard-coded) form action to add media from tinymce 
--HG--
branch : dev
 2010-03-03 15:01:53 -08:00
Nathan Heskew
f812a4d373 Adding an AddMedia TinyMCE plugin, that doesn't yet do anything 
--HG--
branch : dev
 2010-03-03 14:55:22 -08:00
Erik Porter
36fc37afd8 Merge 
--HG--
branch : dev
 2010-03-03 13:22:41 -08:00
Erik Porter
f22cd057ba Fixed a setup hack 
--HG--
branch : dev
 2010-03-03 13:21:39 -08:00
Nathan Heskew
e9628c4c8f Changing the Body aspect's manage link text back to what it should be, "Edit"... 
--HG--
branch : dev
 2010-03-03 13:19:09 -08:00
Nathan Heskew
8e4779977a Changing the Body aspect's manage template parts to be named more appropriately 
- Changed the templates to be prefixed with "Common.Body."

--HG--
branch : dev
rename : src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/ManageWrapperPost.ascx => src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.Manage.ascx
rename : src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/ManageWrapperPost.ascx => src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.ManageWrapperPost.ascx
rename : src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/ManageWrapperPre.ascx => src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.ManageWrapperPre.ascx
 2010-03-03 13:15:50 -08:00
Suha Can
7a2aa714ed - Fixing bug in livewriter rsd url 
--HG--
branch : dev
 2010-03-03 12:51:17 -08:00
Erik Porter
d700b95354 Added a not found page (needs default text) 
--HG--
branch : dev
 2010-03-03 11:49:56 -08:00
Erik Porter
a4a81b86e7 Fixed bug #16243 
--HG--
branch : dev
rename : src/Orchard.Web/Modules/Orchard.Pages/Services/PagesHomePageProvider.cs => src/Orchard.Web/Modules/Orchard.Pages/Services/PageHomePageProvider.cs
 2010-03-03 11:41:51 -08:00
Louis DeJardin
3d7a6a517b Adding a Futures project to hold Widget concept 
Conceptual implementation of Widget and HasWidgets parts
Adds "HtmlWidget" content type and "Widget" display type
WidgetFilter adds widget display view models to named zones (for non-admin requests)

--HG--
branch : dev
 2010-03-03 11:32:00 -08:00
Nathan Heskew
32df33832c Merge 
--HG--
branch : dev
 2010-03-03 03:32:31 -08:00
Nathan Heskew
1f417fbe23 Adding Common.Body.Summary template that displays a generated body excerpt 
- Added body summary template
- Added an Ellipsize(int length) string extension
- Added an Excerpt(string markup, int length) HtmlHelper extension
- Added a LongestMatch method to ContentPartTemplateResult (pretty much a copy/paste from item) to get the fallback on filename functionality
- Changed the BodyDriver to try to display SummaryAdmin or Summary template variations on Body if the displayType fits

--HG--
branch : dev
 2010-03-03 03:32:01 -08:00
Andrew Ma
615703b304 - Fixing 16273 : Missing IOrchardServices services in constructor 
--HG--
branch : dev
 2010-03-03 00:53:33 -08:00
Erik Porter
7bf03123c0 Changed page management to match functionality with blog post management 
--HG--
branch : dev
 2010-03-03 00:51:48 -08:00
Nathan Heskew
98b483f827 Moving Orchard.Core/Common handlers into Models 
--HG--
branch : dev
rename : src/Orchard.Web/Core/Common/Providers/BodyAspectHandler.cs => src/Orchard.Web/Core/Common/Models/BodyAspectHandler.cs
rename : src/Orchard.Web/Core/Common/Providers/CommonAspectHandler.cs => src/Orchard.Web/Core/Common/Models/CommonAspectHandler.cs
 2010-03-03 00:40:32 -08:00
Erik Porter
1cc1d7518d A little page list cleanup 
--HG--
branch : dev
 2010-03-02 21:54:43 -08:00
Suha Can
afb9f1800e - Fixing 15873: Username is case sensitive. 
--HG--
branch : dev
 2010-03-02 17:23:45 -08:00
jowall
6cc1b9d939 Started adding primary button to admin. Fixed some layout issues in manage media. 
--HG--
branch : dev
 2010-03-02 16:59:03 -08:00
Erik Porter
a8901c5411 Finished hooking up actions for blog post admin summary with antiforgery get urls 
--HG--
branch : dev
 2010-03-02 16:04:01 -08:00
jowall
d703cfbc10 Made page titles on manage pages links. Removed branding from green theme. 
--HG--
branch : dev
 2010-03-02 15:19:28 -08:00
Suha Can
6a5d07a67c - BBcode support for url,url with anchor and image bbcodes for the content body. 
--HG--
branch : dev
 2010-03-02 14:51:08 -08:00
Nathan Heskew
459fd7f155 A couple of small changes to the front-end manage content UI 
--HG--
branch : dev
 2010-03-02 14:48:50 -08:00
Nathan Heskew
21db0b1af8 Merge 
--HG--
branch : dev
 2010-03-02 14:08:36 -08:00
Nathan Heskew
783b731866 More work on the front end content management experience (what little there is atm) 
- Wrapped the body aspect itself (oddly, w/out an idea of wrappers for zone items atm) with an injected manage/edit template so any content item w/ a body aspect gets some manage experience
- Changed the Page and Blog Post to not insert their own manage templates

--HG--
branch : dev
 2010-03-02 14:07:58 -08:00
jowall
0d181118ce Manage Pages: Indent status bar row (under title) and updated layout (html/CSS). Removed inline styles. 
--HG--
branch : dev
 2010-03-02 14:06:19 -08:00
Erik Porter
6d86a752dc Merge 
--HG--
branch : dev
 2010-03-02 12:46:49 -08:00
Erik Porter
8a8a8c6f6b Fixed a missing file proj problem 
--HG--
branch : dev
 2010-03-02 12:44:16 -08:00