Commit Graph

9092 Commits

Author SHA1 Message Date
Sipke Schoorstra
98bcf73198 Updating SelectList shape with support for SelectListGroup. 2014-10-28 17:52:42 -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
Lombiq
a32691ba1d Merge branch 'feature/owin' of https://git01.codeplex.com/orchard into feature/owin
Conflicts:
	src/Orchard.Web/Web.config
2014-10-27 17:15:33 +01:00
Lombiq
dff7f54d90 Re-formatting Web.config after merge 2014-10-27 17:13:00 +01:00
Lombiq
cca9ecc693 Updating Microsoft.Owin and Microsoft.Owin.Host.SystemWeb to latest (v3.0) 2014-10-27 17:12:31 +01:00
Lombiq
dc772cf893 Merge remote-tracking branch 'origin/1.x' into feature/owin
Conflicts:
	src/Orchard.Web/Web.config
	src/Orchard/Orchard.Framework.csproj
2014-10-27 17:01:00 +01: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
1ee643d03a Adding test cases for Restore method. 2014-10-26 17:59:21 -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
873cfc7678 Assigning current date and time to ModifiedUtc when removing items. 2014-10-26 14:45:56 -07:00
Daniel Stolt
005ec51115 Prevented IIS site from being started for Orchard.Azure.MediaServices when running from VS. 2014-10-26 16:29:23 +01: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
595f6d7ae2 Implementing hard-delete of content items. 2014-10-25 21:18:41 -07:00
Stanley Goldman
e1bb92e709 Bugfix FormatJsonValue moved to ObjectDumper 2014-10-25 18:59:10 -04:00
Stanley Goldman
6796c71d5e #21034: Preventing recursive dump of ObjectDumper
WorkItem: 21034
2014-10-25 18:33:52 -04:00
Stanley Goldman
bc6daff857 Fixing ObjectDumper unit tests 2014-10-25 18:12:19 -04:00
Stanley Goldman
a1eb07063a ObjectDumper Unit Tests 2014-10-25 17:54:23 -04:00
Stanley Goldman
43bcded513 Moving ConvertToJson to ObjectDumper 2014-10-25 17:43:21 -04:00
Sipke Schoorstra
b942eff978 Implementing Recycle Bin functionality. 2014-10-25 00:39:07 -07:00
Sipke Schoorstra
f0db9c7997 Making Restore work for deleted items. 2014-10-25 00:38:38 -07:00
Sipke Schoorstra
15fe4c5440 Adding Recycle Bin local nav to admin menu. 2014-10-25 00:37:30 -07:00
Sipke Schoorstra
3d2fada947 Merge branch '1.x' of https://git01.codeplex.com/orchard into feature/rollback 2014-10-24 23:44:12 -07:00
Sebastien Ros
b5f1b49723 Merge branch '1.8.x' into 1.x
Conflicts:
	src/Orchard.Web/Modules/Orchard.Indexing/Settings/EditorEvents.cs
	src/Orchard.Web/Themes/TheAdmin/Scripts/admin.js
2014-10-23 20:53:47 -07:00
Stanley Goldman
4f4ad4d48f Revert "TagCloud Functionality to filter by User"
This reverts commit ff1e1bf25a.
2014-10-23 13:01:12 -04:00
Stanley Goldman
ff1e1bf25a TagCloud Functionality to filter by User 2014-10-22 20:27:40 -04:00
Stanley Goldman
180f76d351 #21016: Adding Import/Export Functionality to TagCloudDriver
WorkItem: 21016
2014-10-22 20:27:40 -04:00
Sebastien Ros
04c710ab8d Merge branch 'feature/messagebus' into 1.x
Conflicts:
	src/Orchard.Web/Modules/Orchard.Caching/Services/DefaultCacheStorageProvider.cs
2014-10-21 21:53:48 -07:00
Sebastien Ros
15740d1aad Optimizing keys count 2014-10-21 21:45:22 -07:00
Sebastien Ros
b77f3a4c24 Fixing style 2014-10-21 21:32:47 -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
a4cbb97b9f Removing unneeded code. 2014-10-21 12:08:37 -07:00
Sebastien Ros
d1f0eda6f4 Fixing specflow test 2014-10-21 11:57:21 -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
9106dce276 Adding rollback method on content manager.
The Rollback method allows for reverting to a previous version by creating a new version based on the specified previous one.
2014-10-21 01:18:28 -07:00
Sipke Schoorstra
57b09bc697 Implementing a more versatile approach to unsafe links.
This update enables you to configure anchor elements with a data-unsafe-url="Are you sure?" attribute, allowing the customization of the confirmation message.
2014-10-20 21:00:49 -07:00
Brett Morrison
245a296c3f #20476: Adding CacheAuthenticatedRequests setting.
Work Item: 20476
2014-10-20 17:10:52 -07:00
Sipke Schoorstra
c1e29b75a7 Removing unknown dependency listing. 2014-10-20 17:07:59 -07:00
Sipke Schoorstra
9a44d09c5e #20962: Handling text field keypress events on bulk actions to trigger the expected action.
Work Item: 20962
2014-10-20 13:05:19 -07:00
Sipke Schoorstra
5433b3215e #20962: Handling text field keypress events on bulk actions to trigger the expected action.
Work Item: 20962
2014-10-20 12:39:12 -07:00
Stanley Goldman
fa683f02d9 #21016: Adding Import/Export Functionality to TagCloudDriver
WorkItem: 21016
2014-10-19 14:56:24 -04:00
Lombiq
0a8b55892b Untabify ImportExport template 2014-10-18 23:31:29 +02:00
Bertrand Le Roy
7649724d80 Merge branch '1.x' of https://git01.codeplex.com/orchard into 1.x 2014-10-17 13:17:56 -07:00