lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-04-05 21:01:35 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
11,444 Commits 73 Branches 31 Tags 239 MiB
b18afbe867
Commit Graph

11444 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lombiq
b18afbe867 ContentTypes: Adding missing T-strings in EditPlacement shape and fixing that translations could break admin-placementeditor.js 2019-08-28 14:35:09 +02:00
Lombiq
54a4acc042 Merge branch '1.10.x' into dev 
# Conflicts:
#	src/Orchard.Web/Modules/Orchard.ContentTypes/Controllers/AdminController.cs
#	src/Orchard.Web/Modules/Orchard.ContentTypes/Orchard.ContentTypes.csproj
#	src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/EditPlacement.cshtml
 2019-08-28 14:26:54 +02:00
Lombiq
3d8bb6d460 ContentTypes: Fixing previous breaking change in validation when editing the display name of a type and a field 2019-08-27 22:50:56 +02:00
Lombiq
f46be479a3 ContentTypes: Fixing that a validation error when adding the first field to a type breaks fields for that type, fixes #6310 #6588 2019-08-27 22:25:34 +02:00
Lombiq
c8f5fd731e ContentTypes: Fixing and DRYing Type/Part/Field display and technical name validation, code styling, fixes #906 #7770 2019-08-27 19:52:14 +02:00
Lombiq
142ef2b458 ContentTypes: Code styling and page title standardization (with encoding fix) in Admin templates 2019-08-27 19:42:02 +02:00
Lombiq
b018234e39 ContentTypes: Removing commented out ViewModel class 2019-08-27 19:40:54 +02:00
Lombiq
d32fd660a0 Layouts: Code styling and simplification in ElementController 2019-08-27 11:38:39 +02:00
Brian Roskamp
1a7d6c6f62 Layouts: Update CreateDescribeContext to query latest content (#7687), fixes #7686 
ElementDriver.OnDisplaying ElementDisplayingContext.Content is not being populated properly when the content item is saved, but not yet published. Instead of query the content only for the published version, use the latest version instead.
 2019-08-27 11:21:07 +02:00
Benedek Farkas
a3602ce7b0
Core/Common and Users: Adding indices to IdentityPartRecord.Identifier and UserPartRecord.NormalizedUserName (#8269) 
Lombiq Technologies: ORCH-26
 2019-08-26 20:16:30 +02:00
ramiassi
2db5255467 Core/Containers: Fixing that contained items should be ordered by Position ascending (#7406) 2019-08-26 17:42:24 +02:00
Lombiq
190de04df2 Fields: Fixing DateTimeField export and "not required" null value's compatibility with default value 2019-08-26 17:05:12 +02:00
ViRuSTriNiTy
ecf3e66ee1 Fields: Fixing that a "not required" DateTimeField should store a null value (#7248), fixes #6966 2019-08-26 16:58:21 +02:00
Another Developer
78420a02ac Users: Making the notification for RequestLostPassword a bit more user-friendly (#7061), fixes #7070 2019-08-25 17:17:20 +02:00
Lombiq
bae1bc6763 Recipes: Code styling and simplifications for 41cdb8e852 2019-08-25 16:59:20 +02:00
Kappas
41cdb8e852 Recipes: Moving Extension recipe execution from Orchard.Modules, recipe execution result now shows failed steps (#6957), fixes #6924 
The changes are taken from PR #6957, but this commit also includes the necessary merge conflict resolution.
 2019-08-25 16:46:41 +02:00
Lombiq
e4131cd58c Users Tests: Enabling AccountControllerTests.ResetPasswordLinkShouldBeSent 2019-08-25 15:30:44 +02:00
Sipke Schoorstra
f0d307712b Users: IUserEventHandler.ChangedPassword now includes the changed password too (#6955), fixes #6937 
This enables external modules to record the changed passwords
to implement additional password change policies.
 2019-08-25 15:15:59 +02:00
Lombiq
a5a24d07b7 Localizations: DRYing and code styling in LocalizationService 2019-08-23 21:19:15 +02:00
Benedek Farkas
93c6fbef86 Merge branch '1.10.x' into dev 
# Conflicts:
#	src/Orchard.Web/Core/Navigation/Views/EditorTemplates/Parts.MenuWidget.Edit.cshtml
#	src/Orchard.Web/Modules/Orchard.Layouts/Views/EditorTemplates/Elements.Menu.cshtml
#	src/Orchard.Web/Modules/Orchard.Localization/Services/LocalizationService.cs
#	src/Orchard.Web/Modules/Orchard.MediaLibrary/MediaFileName/MediaFileNameDriver.cs
 2019-08-23 20:36:03 +02:00
Lombiq
83ba470cd2 Roles: Fixing and DRYing IsInRoleActivity and RoleCondition to be able handle "Anonymous" and "Authenticated" + code styling, fixes #6948 2019-08-23 19:04:09 +02:00
Lombiq
bbd0d9bb16 Localization: Code styling in LocalizationService 2019-08-23 13:45:08 +02:00
Alex Petryakov
093be0ba77 Localization: Fixing that LocalizationService.GetLocalizedContentItem should find translations within the group (#6931) 2019-08-23 13:35:07 +02:00
Sergio Navarro
0cd7409a0f Projections: Removing length limitation from PropertyEditViewModel.RewriteText 
This change is a modified version of PR #6923 according to the discussion there.
https://github.com/OrchardCMS/Orchard/pull/6923
 2019-08-23 12:24:14 +02:00
Lombiq
efde9e6d4d Core/Navigation and Layouts: Fixing grammar in MenuWidgetPart editor and Menu Element editor templates 2019-08-23 12:22:14 +02:00
Lombiq
9b9ea88b09 Core/Navigation: Untabifying and code styling in MenuWidgetPart editor template 2019-08-23 12:20:47 +02:00
Lombiq
86b2495858 DynamicForms: Code styling in TaxonomyElementDriver 2019-08-22 20:32:06 +02:00
Sergio Navarro
3ad43bcf3f DynamicForms: Importing and Exporting a TaxonomyElement now uses Identity (#6828), fixes #6821 2019-08-22 20:23:33 +02:00
Lombiq
c34c00ef49 Fixing "Valitator" typos 2019-08-22 20:14:54 +02:00
Lombiq
039335f79d DynamicForms: Deleting ValidationElementDriver (commented out) 2019-08-22 20:11:29 +02:00
Jack Cheng
a3e9bef3ca Media Library: Fixing that renaming files to a reserved Windows name should cause an error, fixes #6802 (#6919) 2019-08-22 19:39:09 +02:00
Lombiq
0279b1e79e DynamicForms: Adding FormSubmission.FormName token 
Contrib by Pablo Sanchez (https://github.com/psp589)
 2019-08-22 19:21:06 +02:00
Lombiq
5a5983a893 Comments: Fixing placement so that default editor buttons are not rendered when editing a Comment, fixes #7927 2019-08-22 18:26:48 +02:00
Lombiq
035a47a911 Comments: Creating separate Comments.Count Detail display shape so it can be overridden without overriding ListOfComments 
It's a breaking change, because Parts.Comments.Count was used for Summary display,
but it's now for Detail display and a separate Parts.Comments.Count.Summary was added.
 2019-08-22 17:46:56 +02:00
Lombiq
0913d78951 Updating the Web.config in ContentPreview and MediaLibrary.WebSearch to fix build warnings 2019-08-19 16:57:58 +02:00
Lombiq
3770e65bda Merge remote-tracking branch 'origin/1.10.x' into dev 
# Conflicts:
#	src/Orchard.Web/Core/Contents/Views/Content.SummaryAdmin.cshtml
#	src/Orchard.Web/Core/Contents/Views/Parts.Contents.Clone.SummaryAdmin.cshtml
#	src/Orchard.Web/Core/Contents/Views/Parts.Contents.Publish.SummaryAdmin.cshtml
#	src/Orchard.Web/Modules/Orchard.AntiSpam/Views/Parts/SpamFilter.Metadata.Actions.cshtml
#	src/Orchard.Web/Modules/Orchard.Blogs/Views/Content-BlogPost.SummaryAdmin.cshtml
#	src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Index.cshtml
#	src/Orchard.Web/Modules/Orchard.Comments/Views/Parts.Comment.SummaryAdmin.cshtml
#	src/Orchard.Web/Modules/Orchard.Comments/Views/Parts.CommentForm.cshtml
#	src/Orchard.Web/Modules/Orchard.Localization/Orchard.Localization.csproj
#	src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Index.cshtml
#	src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Index.cshtml
#	src/Orchard.Web/Modules/Orchard.Widgets/Views/WidgetPlacement.Zones.cshtml
 2019-08-19 16:47:31 +02:00
Lombiq
f7a5ec7c34 Framework/Resources: Fixing automatic merge mistake in ResourceManager 
The merge commit 61d9b462a2 from 1.10.x did not bring over
a method call in the PR #8177 (fix for #8166) making the bugfix inoperable
 2019-08-19 13:05:14 +02:00
Lombiq
8c5d3b6fc7 Framework/Resources: Fixing ResourceManager code styling and failing ResourceManagerTests 
PR #8177 (fix for #8176) added new dependencies to ResourceManager, whose stubs need to be registered for unit tests.
 2019-08-19 12:59:53 +02:00
Lombiq
d2aa33d494 Framework/Resources: Fixing a regression with Style.Include, so it supports paths with a query string again, fixes #8231 2019-08-15 23:59:46 +02:00
Zoltán Lehóczky
638a588101 Live preview feature (Orchard.ContentPreview back-port; Lombiq Technologies: WESD-1) (#8260) 2019-08-15 12:21:45 -07:00
DiegoMarguerettaz-Laser
04ae8096de Add Token for Request Header (#8263) 2019-08-15 12:20:30 -07:00
LorenzoFrediani-Laser
6c7390a073 Change returnurl from abosuleurl to relaviveurl (#8265) 2019-08-15 12:17:19 -07:00
Lombiq
dce04a2587 Localization: ContextHelpers.IsRequestAdmin refactored to AdminFilter static method 2019-08-13 20:30:42 +02:00
Lombiq
a808fdbb6b ContentTypes: Removing punctuation from the permissions' description to match other permissions 2019-08-13 18:41:06 +02:00
Lombiq
a7b0e33a43 AuditTrail: Fixing notification messages in RecycleBinController regarding the necessary permissions 2019-08-13 18:37:52 +02:00
Benedek Farkas
bbc86d38cd Merge branch '1.10.x' into dev 
# Conflicts:
#	src/Orchard.Web/Core/Contents/Controllers/AdminController.cs
#	src/Orchard.Web/Modules/Orchard.MediaLibrary/Scripts/media-library.js
 2019-08-13 17:38:13 +02:00
Lombiq
b03d83473f Localization: Code styling in FrontEndCultureSelector, displaying culture name instead of code in AdminCultureSelector 2019-08-13 16:25:07 +02:00
Lombiq
eba6f118dd TheAdmin: Code styling in AdminCultureSelector override 2019-08-13 16:17:10 +02:00
Lombiq
9ce774efa5 Framework: Marking the Permissions.RequiresOwnership property obsolete 2019-08-13 15:25:49 +02:00
Matteo Piovanelli
21417a9768 Taxonomies: Refactoring Terms' FullWeight calculation including Upgrade path, fixes #8209 (#8214) 
FullWeight is now correctly computed based on hierarchy, then Weight, then alphabetical order (in this order).
 2019-08-08 13:42:15 +02:00