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,140 Commits 83 Branches 32 Tags
578184f50ff2e52196a1c2d8543b38ae44e04ce1
Commit Graph

5525 Commits

Author SHA1 Message Date
Sébastien Ros
0f757655b8 Merge pull request #5736 from Codinlab/issue/5735 
Fixes #5735 : ContentType name encoding in Lists
 2015-09-04 16:35:03 -07:00
Sebastien Ros
3f5c6e49ef Revert "Fixing ShapeDesigner" 
This reverts commit 6eb32a93df.
 2015-09-04 16:20:02 -07:00
Sebastien Ros
428b44a900 Merge branch '1.9.x' into dev 
Conflicts:
	src/Orchard.Web/Modules/Orchard.Autoroute/Drivers/AutoroutePartDriver.cs
	src/Orchard.Web/Modules/Orchard.Autoroute/Migrations.cs
	src/Orchard.Web/Modules/Orchard.Search/Drivers/AdminSearchSettingsPartDriver.cs
	src/Orchard/Environment/DefaultOrchardShell.cs
	src/Orchard/Mvc/HttpContextAccessor.cs
	src/Orchard/Orchard.Framework.csproj
	src/Orchard/Tasks/BackgroundService.cs
 2015-09-04 13:15:43 -07:00
Sebastien Ros
c2194381f8 Removing unused usings 2015-09-04 12:12:13 -07:00
Sebastien Ros
04f29ba70c Revert "Cherry picked ce630f980c7a79ae17b36598f3834c4ffd523739." 
This reverts commit aba53e122d.

Conflicts:
	src/Orchard.Web/Modules/Orchard.Layouts/Handlers/LayoutPartHandler.cs
	src/Orchard/Mvc/HttpContextAccessor.cs
	src/Orchard/Mvc/IHttpContextAccessor.cs
	src/Orchard/Mvc/MvcModule.cs
	src/Orchard/Orchard.Framework.csproj
	src/Orchard/Tasks/BackgroundService.cs
 2015-09-04 10:59:31 -07:00
Thierry Fleury
894e90f485 Use new ActionLink extension method. 2015-09-04 15:08:30 +02:00
Sipke Schoorstra
dfce6deaf1 Incremental work on placeable content. 2015-09-04 12:42:08 +01:00
Sébastien Ros
65c3b2ab2e Merge pull request #5734 from OrchardCMS/feature/morelocking 
Refactoring locking strategy
 2015-09-03 15:05:42 -07:00
Sebastien Ros
9ea87837c3 Refactoring locking strategy 
Adding support for tenants
Removed ThreadId field
Removed Count field
Optimized db access by using Monitor for the local machine/tenant checks
Removed Machine/Thread scopes
 2015-09-03 15:03:42 -07:00
Sipke Schoorstra
e02bf2dacb Merge pull request #5680 from OrchardCMS/feature/initializing-tenant 
Implemented Initializing status.
 2015-09-03 13:15:42 +02:00
Thierry Fleury
2b61e3368d Fixes #5737 : ChangeListView throws NRE on unpublished Lists 2015-09-03 11:01:18 +02:00
Thierry Fleury
f5772334e1 Fixes #5735 : ContentType name encoding in Lists 2015-09-03 10:05:02 +02:00
Sipke Schoorstra
d0ad5de25c Rebuilt assets with Gulp. 2015-09-02 17:29:36 +01:00
Sipke Schoorstra
902021c686 Fixed default dashboard layout data string. 2015-09-02 14:40:15 +01:00
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
553a0e260a Merge branch 'dev' into feature/distributed-locking 
Conflicts:
	src/Orchard/Orchard.Framework.csproj
 2015-09-02 10:20:57 +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
Lombiq
42ff708da8 #5664: Lucene should page operations with the highest possible page size 2015-08-28 23:38:30 +02: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
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
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
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
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
e6424e2589 Removing empty folder 2015-08-26 14:44:15 -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
Gustavo Tandeciarz
47d3d2b738 Fixes #5693 
Will not disable the admin theme.
 2015-08-25 12:54:26 -04:00
Daniel Stolt
d6f3bfd419 Updated to Newtonsoft.Json 7.0 and Azure SDK 2.7. 2015-08-25 16:17:32 +02:00
marshy
e46af0f757 Fix user defined outcome connections in Branching activities - fixes #5686 2015-08-24 16:36:28 +08:00
marshy
bccdc0337e Add missing activity, fixes #5684 2015-08-24 10:21:32 +08:00
Sipke Schoorstra
81adb78818 Implemented Initializing status. 2015-08-23 18:27:36 +01:00
Sipke Schoorstra
b560a4c3d0 Corrected labels on import screen. 2015-08-22 23:35:45 +01:00