lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-26 20:16:15 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
11,844 Commits 84 Branches 32 Tags
9f65be8e263ab5549f884ab88aedb9651895f413
Commit Graph

265 Commits

Author SHA1 Message Date
Sebastien Ros
622b191ad5 Merge branch '1.9.x' into dev 2015-06-22 10:11:56 -07:00
Sebastien Ros
78fb58f016 Fixing localization gender 2015-06-22 10:10:58 -07:00
agriffard
4eb8d1d2ea Fix some typos #5405 2015-06-21 15:44:04 +02:00
Sebastien Ros
0e47295b9f Merge branch '1.9.x' into dev 
Conflicts:
	src/Orchard.Web/Modules/Orchard.Comments/Web.config
	src/Orchard.Web/Modules/Orchard.Fields/Web.config
	src/Orchard.Web/Modules/Orchard.OutputCache/Filters/OutputCacheFilter.cs
	src/Orchard.Web/Modules/Orchard.Taxonomies/Web.config
 2015-06-19 11:33:12 -07:00
Sebastien Ros
1180425109 Updating libraries 2015-06-19 10:39:00 -07:00
Sebastien Ros
6d58498b82 Merge branch '1.9.x' into dev 
Conflicts:
	src/Orchard.Web/Modules/Orchard.DynamicForms/Web.config
	src/Orchard.Web/Modules/Orchard.ImageEditor/Web.config
	src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj
	src/Orchard/Localization/Text.cs
 2015-06-18 10:35:06 -07:00
Sebastien Ros
cd49d2ccf2 Updating ruleset location for all projects 2015-06-16 16:22:04 -07:00
Lombiq
6aabc4d9f9 Fixing that the Audit Trail Recycle Bin caused YSOD if a content item didn't have a display text (like Comments) 2015-06-14 23:18:25 +02:00
Lombiq
66af4a8cdf Adding null check for query string parameters in AuditTrail to prevent possible YSOD 2015-06-13 01:02:16 +02:00
Sebastien Ros
2c45b9b13e Merge branch 'master' into 1.x 2015-05-05 21:40:02 -07:00
Sipke Schoorstra
3311c9a8a4 Updated web.config files to fix intellisense for Razor view files. 
This fixes the side effect of setting CopyLocal=False on the Orchard.Framework project references where Razor intellisense was broken.
Although not necessary in most cases, I also added Orchard.Core for free, for those rare cases where a service is directly consumed in a Razor view.
 2015-05-02 10:14:29 +02:00
Sebastien Ros
ddfb72faaa Updating version number 2015-04-28 12:14:30 -07:00
Wojciech Gadziński
b9973d91d8 Move all usages of LazyField to Orchard.ContentManagement.Utilities.LazyField 
There is one change which have to verify:
Orchard.ContentManagement.Handlers.StorageFilter
Orchard.ContentManagement.Handlers.StorageVersionFilter
because I removed _value parameter from loader delegate - it was pointless and used nowhere except above filters.
 2015-04-26 23:56:04 +02:00
Kees Damen
2cfcdfaa8b Fixed project references to Orchard.Core and Orchard.Framework 2015-04-16 16:23:12 +02:00
Sipke Schoorstra
8a3d05779f Fixed a typo in a comment. 2015-03-06 20:24:15 +01:00
Sipke Schoorstra
ce23bb5a3e #21237: Moved IClientIpAddressProvider into Orchard.Framework. 
This changeset also renames the service to IClientAddressAccessor and refactors the settings into being configurable from HostComponents instead of through a site settings part.

Work Item: 21237
 2015-03-06 19:59:52 +01:00
Daniel Stolt
1a8ebf2548 Fixed version conflict build warnings and cleaned up all Web.config files. 2015-03-04 02:06:09 +01:00
Daniel Stolt
2515f943f6 Moved xmldiffpatch dependency to root lib folder. 2015-02-11 23:55:54 +01:00
Daniel Stolt
a446ebdb3e Made xmldiffpatch reference private in Orchard.AuditTrail. 2015-02-07 15:58:23 +01:00
Sipke Schoorstra
da72fc9809 #21091: Fixing audit trail bug. 
This fixes an issue causing a YSOD on the AuditTrail screen by recording all relevant data for the AuditTrailSettings event provider, such that the event providers themselves can be disabled without breaking the recorded events (which relied on the Event Descriptor to be available when rendering the event, which is unavailable if its providing feature is disabled).

Work Item: 21091
 2014-11-27 16:55:18 -08:00
Sipke Schoorstra
85f6871d44 Fixing HQL syntax error. 2014-11-12 23:53:49 -08:00
Sipke Schoorstra
6761b1c20f Fixing recycle bin error. 
Unfortunately we can't sort by ModifiedUtc without grouping by it. The problem with grouping by ModifiedUtc i that it will cause to show items that are no longer deleted. I think we need a Deleted flag.
 2014-11-12 23:46:22 -08:00
Sipke Schoorstra
8975f9a505 Merge branch '1.x' into feature/rollback 2014-11-12 22:18:58 -08:00
Sipke Schoorstra
2737ec8ab5 Executing enumerable early on to avoid a potential issues. 2014-10-31 17:56:57 -07:00
Sipke Schoorstra
84d34276c7 Adding optional QueryHints parameter. 2014-10-31 17:43:57 -07:00
Sipke Schoorstra
f35ea47f57 Consistifying bulk actions UI. 2014-10-28 14:18:18 -07:00
Sipke Schoorstra
e0ad32d6ce Moving Recycle Bin to its own feature. 2014-10-28 14:00:15 -07:00
Sipke Schoorstra
c21c8098fe Removing "hard-delete" option for now. 2014-10-28 13:37:06 -07:00
Sipke Schoorstra
a0c5f59b58 Fixing model binding. 2014-10-28 13:20:44 -07:00
Sipke Schoorstra
836513be01 Correcting HQL. 2014-10-28 13:20:15 -07:00
Sipke Schoorstra
d18bbedc42 Handling null version records in audit trail content provider. 
VersionRecord is null in cases where a content item was created in the same request. E.g. creating a comment on the front end.
 2014-10-27 01:19:15 -07:00
Sipke Schoorstra
7c2f8e07cb Enabling restoration of removed content from audit trail history view. 2014-10-26 17:37:43 -07:00
Sipke Schoorstra
10ee9e1057 Sorting removed items by ModifiedUtc (des). 2014-10-26 16:09:56 -07:00
Sipke Schoorstra
b229748d50 Adding Removed column to the recycle bin screen. 2014-10-26 15:40:24 -07:00
Sipke Schoorstra
a17cab3534 Implementing audit trail event handler for hard-deleted content items. 2014-10-25 21:19:53 -07:00
Sipke Schoorstra
6324789016 Implementing UI to hard-delete of content items from recycle bin. 2014-10-25 21:19:29 -07:00
Sipke Schoorstra
b942eff978 Implementing Recycle Bin functionality. 2014-10-25 00:39:07 -07:00
Sipke Schoorstra
15fe4c5440 Adding Recycle Bin local nav to admin menu. 2014-10-25 00:37:30 -07:00
Sipke Schoorstra
1a736dadf8 Renaming Rollback to Restore. 2014-10-21 16:43:45 -07:00
Sipke Schoorstra
ccc07b73e2 Saving restored version as Draft instead of Published, depending on ContentTypeSettings,Draftable. 2014-10-21 16:06:59 -07:00
Sipke Schoorstra
7fd9bc01eb Adding Rollback command to content published events and added logging of the rolled back event. 2014-10-21 01:20:40 -07:00
Sipke Schoorstra
a096e3abd1 Removing Name property on ContentTypeDefinitionBuilder and updating usages to use .Current.Name. 2014-09-25 13:04:13 -07:00
Stanley Goldman
efb2aa3437 #20912: Fixing AuditTrailEvent-Content.cshtml Exception 2014-08-30 09:01:10 -04:00
Sebastien Ros
288d1cb8ad More config files updates 2014-08-20 14:01:35 -07:00
Daniel Stolt
6bdf4a0348 Adding missing display of client IP address on inline audit trail, and removing conditional display of historically logged client IP addresses. Improving some UI language. 2014-08-20 01:53:11 +02:00
Sipke Schoorstra
2ef4eea1d7 Adding support for client IP address logging. 2014-08-18 14:43:25 -07:00
Sebastien Ros
ecda1daf77 Including placement.info as content 2014-08-15 14:38:05 -07:00
Sebastien Ros
221197f314 Upgrading to .NET Framework 4.5.1 2014-08-13 14:07:45 -07:00
Sipke Schoorstra
6b70c086b0 Rendering newlines as <br/> when displaying audit trail event comments. 2014-08-07 17:30:51 -07:00
Sebastien Ros
978713a061 Removing unused field 2014-08-07 11:20:21 -07:00