lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
9,758 Commits 94 Branches 33 Tags
3729bac266f4028a79e5327343bae507b6d7567e
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastien Ros 3729bac266 Removing unnecessary usings 2015-08-27 11:09:40 -07:00
Sebastien Ros 4a2d3aeb7c Merge branch '1.9.x' into dev 
Conflicts:
	src/Orchard.Web/Modules/Orchard.ImportExport/Orchard.ImportExport.csproj
	src/Orchard.Web/Modules/Orchard.Recipes/RecipeHandlers/DataRecipeHandler.cs
	src/Orchard.Web/Modules/Orchard.Search/Drivers/SearchSettingsPartDriver.cs
	src/Orchard.Web/Modules/Orchard.Themes/Drivers/DisableThemePartDriver.cs
	src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj
 2015-08-27 10:45:16 -07:00
Sebastien Ros 6abb7d5459 Revert "Fixed broken setup due to auto-enabling features." 
This reverts commit 8f2bd16fed.
 2015-08-27 10:42:51 -07:00
Sebastien Ros 6d8460ad9c Removing Core dependency from jQuery 
The auto-enable feature code would load it and replace
the SafeModeSiteService by its implementation.
 2015-08-27 10:41:43 -07:00
Sebastien Ros 4b59569013 #5490 Fixing HttpRequestBase DependenciesShouldBeUpgradedFirst 
Fixes #5490
 2015-08-26 17:19:04 -07:00
Sébastien Ros a603c7e07a Merge pull request #5678 from jchenga/issues/5618 
#5618 taxonomy in autoroute needs to be saved twice

Fixes #5618
 2015-08-26 16:48:13 -07:00
Sebastien Ros 96f6cb36fd Reverting session factory changes 2015-08-26 16:40:02 -07:00
Sébastien Ros 3d63c6d333 Merge pull request #5544 from yw80/patch-2 
Remove the blank line at the bottom of every page after the default theme rendering.
 2015-08-26 16:11:35 -07:00
Sébastien Ros 4cdb081c9d Merge pull request #5543 from yw80/patch-1 
Correct CSS class name of MediaLibraryPickerField field
 2015-08-26 16:05:16 -07:00
Sébastien Ros 9ed6b4261d Merge pull request #5542 from jtkech/patch-2 
##5369: Allows simple properties null checking on a dynamic ContentItem or ContentPart

Fixes #5369
 2015-08-26 16:04:09 -07:00
Sébastien Ros a0e78f2eb0 Merge pull request #5571 from jersiovic/patch-6 
Fixed #5140 Recipe from Migrations didn't work
 2015-08-26 15:59:03 -07:00
Sébastien Ros af4e41a717 Merge pull request #5667 from qt1/IBN-Labs/ItemEditLink_htmlAttributes 
Support htmlAttributes in ItemEditLink

Fixes #5666
 2015-08-26 15:54:13 -07:00
Sébastien Ros 914423a345 Merge pull request #5634 from OrchardCMS/feature/auto-enable-dependencies 
Auto enable dependencies

Fixes #3132
 2015-08-26 15:47:02 -07:00
Sébastien Ros 247009d07a Merge pull request #5685 from planetClaire/5684 
Add missing activity, fixes #5684
 2015-08-26 15:28:30 -07:00
Sebastien Ros 7f91e787de Adding debug log when content item is imported 2015-08-26 14:44:56 -07:00
Sebastien Ros 6810cf473f Updating indexing tasks when content is imported or restored 2015-08-26 14:44:50 -07:00
Sebastien Ros 79a0ae86e8 Create index command should not delete existing index 2015-08-26 14:44:40 -07:00
Sebastien Ros 4cec35daf8 Disposing the session when a transaction is rolled back 2015-08-26 14:44:32 -07:00
Sebastien Ros 8d4cb98d59 Adding missing content handler Restore events 2015-08-26 14:44:25 -07:00
Sebastien Ros e6424e2589 Removing empty folder 2015-08-26 14:44:15 -07:00
Sebastien Ros dcc7783f12 Adding storage filter events for Import/Export 2015-08-26 09:47:39 -07:00
Sebastien Ros d35ebe04e7 Adding User identity resolver 
To improve import step for Users
 2015-08-26 09:47:26 -07:00
Sebastien Ros c80f2d4baa Fixing Search settings export 2015-08-26 09:46:46 -07:00
Sébastien Ros 9a4e0c1741 Merge pull request #5694 from dcinzona/patch-2 
Fixes #5693 - DisableTheme Part breaks admin theme
 2015-08-25 09:56:31 -07:00
Sebastien Ros 9e95f96195 Supporting .. syntax in watched assets 2015-08-21 16:01:44 -07:00
Sébastien Ros 5b42c707b1 Merge pull request #5627 from Codinlab/fixes/ContentTypeEncoding 
Fixes 5591 : ContentType's name encoding
 2015-08-20 13:03:28 -07:00
Sébastien Ros 73683ec057 Merge pull request #5640 from jtkech/patch-4 
#5552: ContentPicker Search Route issue

Fixes #5552
 2015-08-20 12:26:09 -07:00
Sébastien Ros 83a35f89cf Merge pull request #5644 from mvarblow/patch-1 
Allow for packaging a debug build
 2015-08-20 12:22:00 -07:00
Sébastien Ros b206a656e8 Merge pull request #5603 from mahsaro/WidgetLayersOrder_1.9.x 
Ordered layers alphabetically in Widget admin UI.
 2015-08-06 12:41:19 -07:00
Sébastien Ros 32669d347a Merge pull request #5610 from psenechal/1.9.x 
Update Module.txt
 2015-08-06 12:40:44 -07:00
Sébastien Ros 5bdfb6e98a Merge pull request #5476 from dcinzona/patch-1 
Added mimetype declarations to root web.config
 2015-08-06 12:40:01 -07:00
Sébastien Ros 8f9d52307b Merge pull request #5615 from OrchardCMS/issue/4097/fix-duplicate-content 
#4097: Changed Import to accommodate expected behavior as defined as …

Fixes #4097
 2015-08-06 12:32:54 -07:00
Sébastien Ros 5f51c7c31a Merge pull request #5567 from OrchardCMS/issue/homepage-alias 
Issue/homepage alias
 2015-08-06 12:31:40 -07:00
Sébastien Ros 7e95f78ec9 Merge pull request #5619 from OrchardCMS/issue/5271/module-manifest-metadata 
#5271: Added Lifecycle Status field to module manifest.

Fixes #5271
 2015-08-06 12:20:35 -07:00
Sebastien Ros 41bd9ce9bc Adding a file system backed output cache provider 2015-08-05 16:59:34 -07:00
Sebastien Ros e346170f24 Adding some documentation for IAppDataFolder 2015-08-05 14:21:22 -07:00
Sebastien Ros 430c3de460 Compressing output cache content in Redis 2015-08-04 17:28:49 -07:00
Sebastien Ros f25758cc05 Refactoring connection multiplexer usage 
For consistency with other services using Redis
 2015-08-04 10:30:23 -07:00
Sebastien Ros bb6a44634d Handling output cache provider exceptions 2015-08-04 10:29:46 -07:00
Sebastien Ros 8a08680a74 Localizing RedisTagCache keys 2015-08-03 14:37:25 -07:00
Sebastien Ros 4740283ab2 Merge branch '1.9.x' into dev 
Conflicts:
	src/Orchard.Tests.Modules/Users/Services/MembershipServiceTests.cs
 2015-07-31 17:50:22 -07:00
Sebastien Ros 25670b9620 Fixing pager text encoding 
Fixes #5359
 2015-07-31 17:00:31 -07:00
Sebastien Ros fa09e2e83a Using master content item to create translations 
Fixes #5535
 2015-07-31 16:19:34 -07:00
Sebastien Ros a9a1413331 Fixing unit tests 2015-07-31 16:12:36 -07:00
Sebastien Ros 637cea6a02 Fixing Redis connection creation 
With the previous code, when multiple threads tried to create
a Redis connection, the ConcurrentDictionary would have
called the factory delegate multiple times and added only one
of the resulting connections. This is by design, and a solution
is to use a Lazy object to defer the creation of the connection.
Multiple Lazy objects will be created but it doesn't have any impact.
 2015-07-31 15:10:08 -07:00
Sebastien Ros 5fd02aacd9 Merge branch '1.9.x' into dev 
Conflicts:
	README.md
 2015-07-30 15:51:28 -07:00
Sebastien Ros cc82bfcca0 Fixing duplicate session creation 2015-07-30 15:49:13 -07:00
Sébastien Ros f3f0352063 Merge pull request #5573 from emeraldarcher/issue/5572 
Fixes #5572 - Bug fixes for Google ReCaptcha 2.0 update
 2015-07-30 12:41:06 -07:00
Sébastien Ros c0ebbd4ce7 Merge pull request #5548 from minglei84/1.9.x 
Fixed [Default Value] And [DropForeignKeyCommand] For Mysql
 2015-07-23 12:35:15 -07:00
Sébastien Ros b3c9a6da65 Merge pull request #5531 from urbanit/patch-2 
ItemEditLink with Html Attributes
 2015-07-23 12:15:43 -07:00
Sébastien Ros d92fc869bf Merge pull request #5332 from emeraldarcher/issue/5331 
Update Google Recaptcha API

Fixes #5331
 2015-07-23 12:11:06 -07:00
Sébastien Ros e964d80f7e Merge pull request #5537 from jtkech/patch-1 
#5512: Incorrect message of DynamicForms StringLength rule if only Maximum is specified
 2015-07-19 09:58:24 -07:00
Sébastien Ros 56addb2629 Fixing urls 2015-07-17 16:24:58 -07:00
Sébastien Ros 25c8c81382 Adding test links in the readme.md 2015-07-17 16:23:59 -07:00
Sébastien Ros 24b0f894ce Merge pull request #5524 from urbanit/patch-1 
Queries Index Page missing Title
 2015-07-16 12:38:13 -07:00
Sébastien Ros d63119b1e6 Merge pull request #5433 from jersiovic/patch-3 
Issue #5432 Differentiator is ignored processing placement
 2015-07-16 12:02:46 -07:00
Sébastien Ros b100634587 Merge pull request #5486 from jersiovic/patch-4 
Issue #5141 Retrieve/Store methods from InfoSet doesn't support char type
 2015-07-09 13:00:10 -07:00
Sébastien Ros a071f21f4e Merge pull request #5485 from jersiovic/patch-1 
Issue #5061 GetImageProfileUrl reprocess images obtained through a dynamic profile on every restart 1.9.x pull request
 2015-07-09 12:57:48 -07:00
Sébastien Ros eed1a9a063 Merge pull request #5479 from dcinzona/patch-3 
Fixes #5398 - ShellDescriptorCache in HostComponents
 2015-07-09 12:57:20 -07:00
Sébastien Ros 0faaa22546 Merge pull request #5465 from qt1/IBN-Labs/Support-Guid-in--CreateColumn 
Support CreateColumn<Guid>()
 2015-07-09 12:32:29 -07:00
Sébastien Ros 0f6fa5844b Merge pull request #5442 from yw80/1.9.x 
Fixed the items count in media library when modify the item size in css
 2015-07-09 12:18:09 -07:00
Sébastien Ros c75ba007e6 Merge pull request #5453 from kumards/patch-1 
Fix for duplicate version number on creating a new draft
 2015-07-02 12:28:36 -07:00
Sébastien Ros b5b3ffea8e Merge pull request #5425 from jersiovic/patch-1 
Issue #5061 GetImageProfileUrl reprocess images obtained through a dynamic profile on every restart
 2015-07-02 12:18:30 -07:00
Sébastien Ros dbba4e2787 Merge pull request #5458 from dcinzona/patch-1 
Update web.config MVC bindings for Azure Cloud Service
 2015-07-01 07:46:39 -07:00
Sébastien Ros 27365a71d9 Merge pull request #5460 from dcinzona/patch-3 
Web.Config: Orchard Layouts Updating MVC reference to 5.2.3
 2015-07-01 07:46:20 -07:00
Sébastien Ros 6a5028b80a Merge pull request #5461 from dcinzona/patch-4 
Web.config - Dynamic Forms: MVC reference updated to 5.2.3
 2015-07-01 07:46:00 -07:00
Sébastien Ros f3fc2b53ba Merge pull request #5429 from dalenewman/patch-2 
Fix moderator notification
 2015-06-25 13:20:16 -07:00
Sébastien Ros 1a9b7af4ac Merge pull request #5430 from jchenga/issues/5148-1.9.x 
[Fixes #5418] Lost Password not working with Anonymous Access Off
 2015-06-25 13:15:32 -07:00
Sébastien Ros 7bf2c702a1 Merge pull request #5427 from jersiovic/patch-2 
#5426 Projections don't order queries following Position field
 2015-06-25 12:41:42 -07:00
Sébastien Ros 61d432ba4c Merge pull request #5413 from dcinzona/patch-2 
Assembly binding to azure storage 4.3.0
 2015-06-25 12:23:20 -07:00
Sébastien Ros 7cdb9ecf53 Merge pull request #5404 from MpDzik/pr/localize-quote 
Fix handling localized strings with quotes
 2015-06-25 12:22:52 -07:00
Sébastien Ros 1aefd0fdbd Merge pull request #5267 from Skrypt/autoroute-patterns-localization 
Autoroute patterns localization
 2015-06-25 12:12:06 -07:00
Sébastien Ros ac305af963 Merge pull request #5406 from MpDzik/pr/media-import-loc 
MediaLibrary - Fix localization of Import button
 2015-06-22 15:45:46 -07:00
Sébastien Ros 3c3a6df6dd Merge pull request #5391 from paynecrl97/5390/delay_output_cache_key_creation 
Defers output cache key creation until we know we need it
 2015-06-19 09:35:10 -07:00
Sébastien Ros a3a252fb19 Merge pull request #5392 from paynecrl97/5356/abstract_active_layer_evaluation 
Abstract active layer evaluation away from the Widget Filter
 2015-06-18 12:53:21 -07:00
Sébastien Ros 5560cd76db Merge pull request #5376 from thekaveman/dev 
adding 'export file' command for use in Orchard.exe
 2015-06-18 12:40:22 -07:00
Sébastien Ros 1fcf7c86d0 Merge pull request #5371 from gcsuk/1.9.x 
Improved Recipe Journal Logging Detail
 2015-06-18 12:39:05 -07:00
Sébastien Ros d2ad3e31bb Merge pull request #5358 from oldrev/feature/postgresql 
Feature: PostgreSQL Support
 2015-06-18 12:35:03 -07:00
Sébastien Ros bca643bf1f Merge pull request #5292 from Hazzamanic/1.9.x 
fixing placementeditor try/catch block
 2015-06-18 12:28:00 -07:00
Sébastien Ros 6763bd8bb8 Merge pull request #5344 from gcsuk/5342 
Added logging for invalid recipe files
 2015-06-04 13:10:38 -07:00
Sébastien Ros c3379489d7 #5348: Splitting ItemDisplayText in two 2015-06-04 12:51:58 -07:00
Sébastien Ros 5c5ce99083 Merge pull request #5338 from qt1/IBN-Labs/Schemabuilder.TableDbName 
Provide full table name prefix for migrations
 2015-06-04 12:32:30 -07:00
Sébastien Ros e709593197 Merge pull request #5321 from Xeevis/1.9.x 
#5109: Email field shouldn't specify email type in design mode
 2015-06-04 12:23:18 -07:00
Sébastien Ros 1b8e00a9c6 Merge pull request #5256 from jtkech/patch-4 
#5235: Awaiting activities not cleared on saving
 2015-06-04 12:04:31 -07:00
Sébastien Ros 3d25ca42c9 #5327: Fixing Orchard.Roles web.config file 2015-05-28 12:50:07 -07:00
Sébastien Ros 7b6e7deea7 Merge pull request #5314 from Skrypt/Fixing-#4963 
Fixing #4963
 2015-05-28 12:20:17 -07:00
Sébastien Ros 52038c677e Merge pull request #5313 from Skrypt/fixed-#5281 
Fixing #5281
 2015-05-28 12:19:48 -07:00
Sébastien Ros 3e55c1649e Merge pull request #5273 from Xeevis/1.9.x 
#5224: Fix for missing charset in response header for cached output
 2015-05-21 12:21:59 -07:00
Sébastien Ros 95221229ac Merge pull request #5257 from keesd/dev 
Fix for bugs #2536 and #5024
 2015-05-21 12:11:30 -07:00
Sébastien Ros 1f10abb9ea Merge pull request #5301 from gitter-badger/gitter-badge 
Add a Gitter chat badge to README.md
 2015-05-19 12:06:49 -07:00
Sébastien Ros 475feb923d Merge pull request #5278 from mvarblow/1.9.x 
Fix for Issue #5274 - Faulty import in SslSettingsPartDriver
 2015-05-14 12:58:40 -07:00
Sébastien Ros d53d7346ee Merge pull request #5276 from mvarblow/mvarblow-patch-5275 
Mvarblow patch 5275
 2015-05-14 12:42:12 -07:00
Sébastien Ros 73336e19ba Merge pull request #5255 from jtkech/patch-3 
#5234 Duplicate lines in WorkflowManager
 2015-05-07 12:30:58 -07:00
Sébastien Ros cd479efdae Merge pull request #5213 from Skrypt/1.x 
Workflow Definition fixes
 2015-04-30 12:43:29 -07:00
Sébastien Ros b86f7146f8 Merge pull request #5208 from RoyalVeterinaryCollege/4977 
fixes #4977 Incorrect BlogPartArchive count
 2015-04-30 12:39:23 -07:00
Sébastien Ros fc09661fd6 Merge pull request #5206 from Ermesx/pr/deprecate-lazyField 
Make Orchard.Core.Common.Utilities.LazyField<T> [Obsolete]
 2015-04-30 12:37:26 -07:00
Sébastien Ros 1a9be8c57a Merge pull request #5202 from jtkech/patch-3 
#5113: SecureSocketsLayer, incorrect Hostname when port number is included
 2015-04-30 12:33:48 -07:00
Sébastien Ros f2f9d8c1ca Merge pull request #5201 from thekaveman/1.8.x 
Fix null exception in AzureBlobStorageProvider.GetStoragePath
 2015-04-30 12:32:10 -07:00
Sébastien Ros 21d80434e8 Merge pull request #5196 from fakedevil/feature/modified-by 
Adding fallback to owner if VersionModifiedBy is not filled up
 2015-04-24 11:10:30 -07:00
Sébastien Ros c0a06becd0 Merge pull request #5199 from vairam-svs/1.x 
Remove Duplicate code that could be cleanedup for better maintenance.
 2015-04-24 11:09:49 -07:00