Daniel Stolt
df216b6a18
Merge from Orchard/dev.
2015-10-04 01:57:19 +02:00
Daniel Stolt
42914c7896
Fixed a column resizing issue.
2015-10-03 19:32:50 +02:00
Daniel Stolt
bd96bf9895
Enabled focusing (and thereby pasting into) non-sealed templated containers.
2015-10-03 19:26:13 +02:00
Sebastien Ros
508d97ed7d
Fixing merge
2015-10-01 09:14:21 -07:00
Sebastien Ros
d0b364c28e
Merge branch '1.9.x' into dev
...
Conflicts:
src/Orchard.Azure/Orchard.Azure.CloudService/ServiceConfiguration.Cloud.cscfg
src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj
src/Orchard.Web/Core/Reports/Module.txt
src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Web.config
src/Orchard.Web/Modules/Orchard.Azure/Services/Environment/Configuration/AzureBlobShellSettingsManager.cs
src/Orchard.Web/Modules/Orchard.Azure/Services/Environment/Configuration/DefaultPlatformConfigurationAccessor.cs
src/Orchard.Web/Modules/Orchard.Layouts/Drivers/LayoutPartDriver.cs
src/Orchard.Web/Modules/Orchard.Layouts/Elements/Column.cs
src/Orchard.Web/Modules/Orchard.Layouts/Module.txt
src/Orchard.Web/Web.config
2015-09-30 15:57:34 -07:00
Gert Smith
a3ded18eb6
Update ElementSessionState.cs
...
Make Model Serializable for use in Web Farms with session state stored in a database. Currently a Serialization error is thrown when creating layout or page in the dashboard.
2015-09-26 10:52:39 +02:00
Sebastien Ros
8865041a8b
[ Fixes #5820 ] Fixing default layout support
...
The default layout was just set in the text editor, and would not be
taken into account if the Part settings were not saved. A user would
then think the default template was there but actually not.
The change here is to leave the text editor empty, and if the setting is
empty load the default from the service. To actually have an empty template
a user needs to provide an empty object.
2015-09-25 15:07:56 -07:00
Sebastien Ros
d9e833ba58
[ Fixes #5112 ] Removing Layout dependency on TinyMce
2015-09-25 15:05:33 -07:00
Sebastien Ros
9137414305
[ Fixes #5819 ] Fixing column element default size
2015-09-25 15:04:06 -07:00
Sebastien Ros
80c600fa02
Merge branch '1.9.x' into dev
...
Conflicts:
src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/EditPlacement.cshtml
src/Orchard.Web/Modules/Orchard.Layouts/Assets/JavaScript/Models/Element.js
src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj
src/Orchard.Web/Modules/Orchard.Layouts/Scripts/LayoutEditor.js
src/Orchard.Web/Modules/Orchard.Layouts/Scripts/LayoutEditor.min.js
src/Orchard.Web/Modules/Orchard.Layouts/Scripts/Models.js
src/Orchard.Web/Modules/Orchard.Layouts/Scripts/Models.min.js
src/Orchard.Web/Modules/Orchard.Layouts/Views/LayoutEditor.Template.Toolbox.cshtml
src/Orchard.Web/Modules/Orchard.MediaLibrary/Controllers/ClientStorageController.cs
src/Orchard.Web/Modules/Orchard.Search/Drivers/SearchSettingsPartDriver.cs
src/Orchard.Web/Modules/Orchard.Search/ViewModels/SearchSettingsIndexViewModel.cs
src/Orchard.Web/Modules/Orchard.Search/Views/EditorTemplates/Parts/Search.SiteSettings.cshtml
src/Orchard.Web/Modules/Orchard.Widgets/Controllers/AdminController.cs
src/Orchard/Orchard.Framework.csproj
2015-09-21 16:15:40 -07:00
Sébastien Ros
5903f75665
Merge pull request #5828 from OrchardCMS/feature/layoutpermission
...
Adding ManageLayout permission
2015-09-21 15:07:57 -07:00
Sebastien Ros
d3d85f3519
Adding ManageLayout permission
2015-09-21 14:04:37 -07:00
Sebastien Ros
12a51ea7af
[ Fixes #5751 , #5794 ] Removing Edit inline
2015-09-21 12:08:19 -07:00
Daniel Stolt
b011594be6
Improved asset manifest file change handling in Gulpfile.js.
...
Code now only restarts watchers for the asset groups in the changed asset manifest file, rather than *all* asset groups. The "build" task now forces rebuild of a given asset group if its asset manifest file is newer than its concatenated output. Refactored and cleaned up the code.
2015-09-16 16:56:51 +02:00
Thierry Fleury
749ff5dc72
Fixes #5809 : Layouts : DisplayText encoded twice in Design mode
2015-09-15 14:53:52 +02:00
Sebastien Ros
b26690d747
Merge branch '1.9.x' into dev
...
Conflicts:
src/Orchard.Tests.Modules/Recipes/Services/RecipeManagerTests.cs
src/Orchard.Web/Modules/Orchard.Widgets/Controllers/AdminController.cs
src/Orchard/Data/Migration/AutomaticDataMigrations.cs
src/Orchard/Environment/DefaultOrchardShell.cs
2015-09-08 17:19:58 -07:00
Sebastien Ros
c83f5d88cb
Supporting lazy cache manager resolution
2015-09-08 17:04:45 -07:00
Lombiq
2a0f866f26
Fixing exception when importing Projection Elements with the default layout selected
...
Fixed the export of this previously, this was remaining.
2015-09-08 01:01:23 +02:00
Sipke Schoorstra
4ad806af8e
Refactored the way elements are instantiated.
...
Elements are now resolved using work context scope.
2015-09-07 18:22:56 +01: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
04f29ba70c
Revert "Cherry picked ce630f980c7a79ae17b36598f3834c4ffd523739."
...
This reverts commit aba53e122d
2015-09-04 10:59:31 -07:00
Sipke Schoorstra
d0ad5de25c
Rebuilt assets with Gulp.
2015-09-02 17:29:36 +01:00
Sipke Schoorstra
6995f26fd5
Revert "Relaxed focus targets to allow pasting of elements into templated containers."
...
This reverts commit dd34d87ac9
2015-09-02 13:21:30 +01:00
Sipke Schoorstra
a762cdf63e
Revert "Incremental work on selectable elements."
...
This reverts commit 54c53b7a12
2015-09-02 13:16:41 +01:00
Sipke Schoorstra
3c3ece6404
Revert "Work on selectable container elements."
...
This reverts commit b639d893c0
2015-09-02 13:12:11 +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
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
6abb7d5459
Revert "Fixed broken setup due to auto-enabling features."
...
This reverts commit 8f2bd16fed
2015-08-27 10:42:51 -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
Daniel Stolt
d6f3bfd419
Updated to Newtonsoft.Json 7.0 and Azure SDK 2.7.
2015-08-25 16:17:32 +02:00
Sipke Schoorstra
2555302ed7
Removed unintentionally added file.
2015-08-21 23:21:13 +01:00
Sipke Schoorstra
811001143e
Corrected interface name.
...
Potentially breaking, but I highly doubt anyone implemented this interface.
2015-08-21 23:14:37 +01:00
Daniel Stolt
dfa1ada978
Deleted folder to resolve git case inconsistency.
2015-08-16 16:25:58 +01:00
Daniel Stolt
c508584e63
Merge branch '1.9.x' into dev
2015-08-14 11:57:38 +01:00
Lombiq
64585223ee
Fixing that Layouts couldn't be export/imported properly because they lacked an identity
2015-08-13 17:02:50 +02: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
Sipke Schoorstra
783281321c
Updated generated assets.
2015-08-04 17:07:32 +01:00
Sipke Schoorstra
2ad324d4e2
Merge branch 'dev' into issue/homepage-alias
...
Conflicts:
src/Orchard.Web/Modules/Orchard.ImportExport/Views/Admin/ImportResult.cshtml
src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj
2015-08-04 16:25:35 +01:00
Daniel Stolt
df25fbad8f
Reverted my own stupidity.
...
(i.e. injecting the actual dependency instead of a WorkContextAccessor to resolve it.)
2015-08-03 16:44:58 +01:00
Daniel Stolt
43922eaf20
Extended recipe execution logging.
2015-08-03 15:01:33 +01:00
Daniel Stolt
f023f66d63
Merged branch '1.9.x' into dev.
2015-07-26 01:28:38 +01:00
Daniel Stolt
6da6c5c214
#5450 : Implemented generalized Gulp automation.
...
Fixes #5446 .
2015-07-26 01:14:14 +01:00
Sipke Schoorstra
e8cc0cba6e
Merge branch 'dev' into issue/homepage-alias
...
Conflicts:
src/Orchard.Web/Modules/Orchard.Autoroute/Drivers/AutoroutePartDriver.cs
src/Orchard.Web/Modules/Orchard.Autoroute/Handlers/AutoroutePartHandler.cs
src/Orchard.Web/Modules/Orchard.Autoroute/ImportExport/HomeAliasExportStep.cs
src/Orchard.Web/Modules/Orchard.Autoroute/Orchard.Autoroute.csproj
src/Orchard.Web/Modules/Orchard.Autoroute/Services/AutorouteService.cs
src/Orchard.Web/Modules/Orchard.ImportExport/Views/Admin/ImportResult.cshtml
src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj
src/Orchard.Web/Modules/Orchard.Localization/Providers/LocalizationDateTimeFormatProvider.cs
src/Orchard.Web/Modules/Orchard.Pages/Orchard.Pages.csproj
src/Orchard/Localization/Services/CultureDateTimeFormatProvider.cs
src/Orchard/Localization/Services/DefaultDateFormatter.cs
src/Orchard/Localization/Services/IDateTimeFormatProvider.cs
2015-07-24 14:11:00 +01:00
Sipke Schoorstra
4159584d85
Merge branch 'dev' into issue/homepage-alias
...
Conflicts:
src/Orchard.Web/Modules/Orchard.Autoroute/Drivers/AutoroutePartDriver.cs
src/Orchard.Web/Modules/Orchard.Autoroute/Handlers/AutoroutePartHandler.cs
src/Orchard.Web/Modules/Orchard.Autoroute/Services/AutorouteService.cs
2015-07-24 13:33:36 +01:00
Sipke Schoorstra
f3a7aeffcb
Merge branch '1.9.x' into dev
2015-07-23 11:44:57 +01:00
Sipke Schoorstra
34947136d4
Fixed and updated scripts and gulp in Dynamic Forms and Layouts.
2015-07-23 11:42:16 +01:00
Sipke Schoorstra
1494aec836
Removed mixed tabs and spaces.
2015-07-20 20:10:58 +01:00
Sipke Schoorstra
65509b5eea
Fixed code formatting.
2015-07-17 13:30:07 +01:00
