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
10,015 Commits 83 Branches 32 Tags
80a51561b5e3992417f2a792fe0f75c0f5ea0fc6
Commit Graph

10015 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sipke Schoorstra
ce15e438ca Getting rid of a compiler warning regarding deprecated ExportOptions type. 2015-09-02 14:10:41 +01:00
Sipke Schoorstra
6995f26fd5 Revert "Relaxed focus targets to allow pasting of elements into templated containers." 
This reverts commit dd34d87ac9.

Conflicts:
	src/Orchard.Web/Modules/Orchard.Layouts/Assets/JavaScript/Models/Canvas.js
	src/Orchard.Web/Modules/Orchard.Layouts/Scripts/Models.js
	src/Orchard.Web/Modules/Orchard.Layouts/Scripts/Models.min.js
 2015-09-02 13:21:30 +01:00
Sipke Schoorstra
a762cdf63e Revert "Incremental work on selectable elements." 
This reverts commit 54c53b7a12.

Conflicts:
	src/Orchard.Web/Modules/Orchard.Layouts/Assets/JavaScript/Models/Canvas.js
	src/Orchard.Web/Modules/Orchard.Layouts/Scripts/Models.js
	src/Orchard.Web/Modules/Orchard.Layouts/Scripts/Models.min.js
 2015-09-02 13:16:41 +01:00
Sipke Schoorstra
3c3ece6404 Revert "Work on selectable container elements." 
This reverts commit b639d893c0.

Conflicts:
	src/Orchard.Web/Modules/Orchard.DynamicForms/Scripts/Forms.js
	src/Orchard.Web/Modules/Orchard.DynamicForms/Scripts/Forms.min.js
 2015-09-02 13:12:11 +01:00
Sipke Schoorstra
748a354632 Merge pull request #5628 from OrchardCMS/feature/distributed-locking 
Feature/distributed locking
 2015-09-02 12:49:38 +02:00
Sipke Schoorstra
db03498cfa Deletes lock records when Count reaches 0. 
Also some minor polishing and changed ObjectDisposedException to OrchardException in case a lock was already released.
 2015-09-02 11:43:12 +01:00
Sipke Schoorstra
553a0e260a Merge branch 'dev' into feature/distributed-locking 
Conflicts:
	src/Orchard/Orchard.Framework.csproj
 2015-09-02 10:20:57 +01:00
Sipke Schoorstra
e9799d5537 Fixed a potential "ValueFactory attempted to access the Value property of this instance" issue. 
The underlying cause of such an error is a recursive call issue, where some code in a background task accesses the current http context (which is a stand in), while its construction also (indirectly) accesses the http context in order to get the site content item and query the configured BaseUrl. In theory we could access this information straight from the database without loading the Site content item, but since the URL value doesn't really matter it is better to keep it simple.
 2015-09-01 15:05:28 +01:00
Lombiq
fcc4a944bb Fixing that Projection Elements with the Default Layout selected weren't exported 2015-08-30 22:29:12 +02:00
Sebastien Ros
a0d61c67b8 Refactoring Import methods 2015-08-28 17:06:34 -07:00
Sébastien Ros
638c05b5ff Merge pull request #5720 from jtkech/patch-4 
#5715: Feature key checking in CompositionStrategy
 2015-08-28 15:42:45 -07:00
jtkech
46de0273d5 Update CompositionStrategy.cs 2015-08-29 00:27:09 +02:00
Lombiq
42ff708da8 #5664: Lucene should page operations with the highest possible page size 2015-08-28 23:38:30 +02:00
Sipke Schoorstra
735ab882b2 Removed unnecessary feature from setup context. 2015-08-28 12:25:35 +01:00
Sebastien Ros
b52a846c5f #5664: Lucene should page operations 
Fixes #5664
 2015-08-27 15:31:39 -07:00
Sébastien Ros
9a8b64393e Merge pull request #5671 from RoyalVeterinaryCollege/4352 
#4352: orphaned awaitingactivities

Fixes #4352
 2015-08-27 12:39:24 -07:00
Sébastien Ros
035ad949a8 Merge pull request #5687 from planetClaire/5686 
Fix user defined outcome connections in Branching activities
 2015-08-27 12:08:02 -07:00
Sebastien Ros
6eb32a93df Fixing ShapeDesigner 
Fixes #5647
 2015-08-27 11:30:52 -07:00
Sebastien Ros
becc4abf23 Fixing Visual Studio warnings on web.config files 2015-08-27 11:11:10 -07:00
Sebastien Ros
2750b04173 Fixing feature name case 2015-08-27 11:10:35 -07:00
Sebastien Ros
935d07bb1b Fixing duplicate overload 2015-08-27 11:09:56 -07:00
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
Sipke Schoorstra
8f2bd16fed Fixed broken setup due to auto-enabling features. 
This change will only auto-enable features for already running shells.
 2015-08-27 14:32:43 +01:00
Jeff
bd1f14eeb0 Fix Issue #4352: Added prompt on workflow save to give choice of stopping running workflows. 2015-08-27 10:59:50 +01: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
Sébastien Ros
4831b72bd1 Improving DateTimeRelative shape 
The implementation was not relative for span further than a week.
 2015-08-26 15:18:40 -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
Gustavo Tandeciarz
47d3d2b738 Fixes #5693 
Will not disable the admin theme.
 2015-08-25 12:54:26 -04:00
Daniel Stolt
a8db54d994 Added missing PDF file. 2015-08-25 16:24:29 +02:00