lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity
8,427 Commits 83 Branches 32 Tags
4a5edec463077f309530b7b90c2b5fab9c6c902c
Commit Graph

8427 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicholas Mayne
4a5edec463 Updating ImageResizer to 3.4.3 2014-10-12 22:42:05 +01:00
Nicholas Mayne
938f20e4e1 Fixing project file 2014-10-12 22:08:09 +01:00
Stanley Goldman
e90001605d #20453: Adding Clone Button to Media Library 
#20453: Fixing Formatting Issues

#20453: Adding Clone Button to Media Library

Work Item: 20453

Conflicts:
	src/Orchard.Web/Modules/Orchard.MediaLibrary/Controllers/AdminController.cs
	src/Orchard.Web/Modules/Orchard.MediaLibrary/Scripts/media-library.js
 2014-10-12 16:17:01 -04:00
Stanley Goldman
b50ae151bd #20655: SettingsRecipeHandler now bypasses attribute that is not a property 
WorkItem: 20655
 2014-10-12 15:36:15 -04:00
Stanley Goldman
8ae9be76b9 Adding a Search Filter to Orchard Workflows Toolbox 2014-10-12 15:24:46 -04:00
Stanley Goldman
21e269ef20 #20590: Adding a file name editor to Media Library items 
#20590: Bugfix

#20590: Base Class Shape is Required

#20590: Formatting and file name comparison with OrdinalIgnoreCase

#20590: Removing base class Shape

#20590: Using Current instead of GetSetting

#20590: Updating comment

#20590: Migration Bugfix

#20590: Undoing rename

#20590: Removing extra whitespace in driver

#20590 Rename ShowFileNameEditor to FileNameEditor, Driver improvement, Updated Migration for MediaLibrary

Conflicts:
	src/Orchard.Web/Modules/Orchard.MediaLibrary/Migrations.cs

#20590 Bugfix

#20590 Improving File Name editors display

#20590: Notifier Message Fix

#20590: Functionality to rename a media item

Work Item: 20590

Conflicts:
	src/Orchard.Web/Modules/Orchard.MediaLibrary/Migrations.cs
	src/Orchard.Web/Modules/Orchard.MediaLibrary/Orchard.MediaLibrary.csproj

Conflicts:
	src/Orchard.Web/Modules/Orchard.MediaLibrary/Orchard.MediaLibrary.csproj
 2014-10-12 15:15:28 -04:00
Nicholas Mayne
1d0b574c5e Cleaning up references in Orchard.DesignerTools 2014-10-12 16:46:19 +01:00
Nicholas Mayne
5422a95921 Updating Newtonsoft JSON to 6.0.5 2014-10-12 16:42:16 +01:00
Nicholas Mayne
1bab01738b Updateing NHibernate to 4.0.1.4000 and Syscache to 4.0.0.4000 2014-10-12 16:37:26 +01:00
Nicholas Mayne
5e76bc9c8f Flipping RTL LTR on page load 2014-10-12 16:14:42 +01:00
Nicholas Mayne
cc6da3c7db #19694: Adding a language check in culture-lang('en') for example 
Work Item: 19694
 2014-10-12 16:00:56 +01:00
Nicholas Mayne
f6d552b28c Tweeking Project files for indexing and jobs 2014-10-12 15:37:46 +01:00
Nicholas Mayne
f7bf0cc09f Updating TinyMCE to 4.1.6 2014-10-12 15:02:25 +01:00
Nicholas Mayne
6b50414cfb making sure the ,Search matches Search - you might have 1 index then add another, but you dont want to reindex all your content if oyu havent selected it 2014-10-12 14:55:44 +01:00
Nicholas Mayne
648eb5d8bf Removing extra call to Indexing Tasks within Editor 2014-10-12 14:52:04 +01:00
Nicholas Mayne
f99e1a9c2b Merge branch 'feature/localizationchanges' into 1.x 2014-10-12 13:48:54 +01:00
Stanley Goldman
2ca1f857ff Removing outdated nHibernate patch information 2014-10-09 20:34:16 -04:00
Zoltán Lehóczky
872a1de928 Revert "#20314: DefaultShapeTableManager doesn't keep IShapeTableProviders alive too long any more either." This actually causes "Instances cannot be resolved and nested lifetimes cannot be created from this LifetimeScope as it has already been disposed." errors. 
This reverts commits 411e3f9ddd and b21d637ba4.
 2014-10-08 15:22:56 +02:00
Lombiq
b21d637ba4 #20314: Fixing tests broken because of Work<T> injected into DefaultShapeTableManager 
Work Item: 20314
 2014-10-08 13:43:47 +02:00
Lombiq
411e3f9ddd #20314: DefaultShapeTableManager doesn't keep IShapeTableProviders alive too long any more either. 
Work Item: 20314
 2014-10-08 12:41:03 +02:00
Nicholas Mayne
46d8e82c3b Small tweaks 2014-10-05 15:53:33 +01:00
Lombiq
0440d866e2 #20314: Fixing tests broken because of Work<T> injected into DefaultShapeTableManager 
Work Item: 20314
 2014-10-03 13:39:52 +02:00
Zoltán Lehóczky
8215849bc6 #20314: DefaultShapeTableManager doesn't keep IShapeTableEventHandlers alive too long any more. 
Work Item: 20314
 2014-10-02 23:16:39 +02:00
Sebastien Ros
6efbde45ac Finishing Redis cache provider 2014-09-29 17:47:32 -07:00
Nicholas Mayne
17a1209abd Fixing broken checkin 2014-09-26 10:45:29 +01:00
Sipke Schoorstra
a096e3abd1 Removing Name property on ContentTypeDefinitionBuilder and updating usages to use .Current.Name. 2014-09-25 13:04:13 -07:00
Nicholas Mayne
f0efbeb406 #18210: Changing preview to pass a version through, this was layers are kicked in. 
Work Item: 18210
 2014-09-25 20:21:56 +01:00
Sebastien Ros
9f84c29e39 #20959: Refactoring the Taxonomy service 
Work Item: 20959
 2014-09-25 11:34:19 -07:00
Nicholas Mayne
ae30267df0 Fixing Media Picker after bad merge. 2014-09-24 10:26:48 +01:00
Sipke Schoorstra
af51f0b17b Configuring ProjectionPage to be Listable by default. 2014-09-23 16:13:03 -07:00
Nicholas Mayne
cfeefb496f small optimization to browser language 2014-09-23 23:28:56 +01:00
Nicholas Mayne
292354a65d Removing deprecated call to cultureinfo in favour replacement 2014-09-23 23:11:09 +01:00
Nicholas Mayne
a618ed7102 Fixes to localizationservice to get with of silly select.. 2014-09-23 22:57:25 +01:00
Nicholas Mayne
ba16115128 Moving away from the providers and pushin all to Selectors, makes for a cleaner iplementation 2014-09-23 22:21:03 +01:00
Nicholas Mayne
b2bd25f1af Merge 1.x 2014-09-23 13:21:31 +01:00
Nicholas Mayne
08630cd5c2 Clean up 2014-09-23 00:14:15 +01:00
Nicholas Mayne
1cb7404bb1 Moving a few things around 2014-09-22 23:34:18 +01:00
Lombiq
938765f2e3 Adding a missing file to Themes.csproj (TheAdmin/Styles/images/error.gif) 2014-09-19 20:37:13 +02:00
Lombiq
1fe8acf615 Removing old, orphaned files 2014-09-19 20:35:53 +02:00
Sebastien Ros
8dfd9048b3 Merge branch '1.8.x' into 1.x 
Conflicts:
	src/Orchard.Web/Modules/Orchard.Indexing/Settings/EditorEvents.cs
	src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/EditorTemplates/Fields/MediaLibraryPicker.Edit.cshtml
 2014-09-19 10:19:29 -07:00
Sebastien Ros
1824a738a9 Fixing IContentManagerSession usage 2014-09-19 10:15:28 -07:00
Sebastien Ros
ba9a812d87 #20366: Fixing sort criteria order 
Work Item: 20366
 2014-09-18 16:02:50 -07:00
Josh Berry
3db2c7597a #20903: Fixing overflowing media titles 
Work Item:20903
 2014-09-18 15:45:28 -07:00
Sebastien Ros
c590337df1 #20900: Creating Indexing tasks by batches 
Work Item: 20900
 2014-09-18 15:39:03 -07:00
Sebastien Ros
a0e8fda8a2 Clearing IContentManagerSession in SessionLocator 2014-09-18 15:38:42 -07:00
Sebastien Ros
65abba550f #20634: Removing unallowed media chars in requests 
Work Item: 20634
 2014-09-18 15:09:53 -07:00
Sebastien Ros
d5507f2661 #20953: Fixing potentially corrupted IndexTaskRecord 
Work Item: 20953
 2014-09-18 14:37:34 -07:00
Sebastien Ros
6665cff9d7 Fixing target framework in codegen template 2014-09-18 11:25:42 -07:00
Sebastien Ros
84993f3a4e Merge branch '1.8.x' into 1.x 
Conflicts:
	src/Orchard.Web/Modules/Orchard.Alias/Implementation/Updater/AliasHolderUpdater.cs
	src/Orchard.Web/Modules/Orchard.Alias/Orchard.Alias.csproj
	src/Orchard.Web/Modules/Orchard.Indexing/Services/IndexingTaskExecutor.cs
 2014-09-18 10:53:40 -07:00
Sebastien Ros
e349349860 Bullet proofing TransactionManager.Cancel() 2014-09-18 10:45:31 -07:00