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
c3ab703a9c
Incremental work on placeable content.
2015-09-07 23:55:06 +01:00
Sipke Schoorstra
6243ecdcfe
Merge branch 'dev' into feature/widget-elements
2015-09-07 20:15:21 +01: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
Sipke Schoorstra
7d93bbbc10
Incremental work on placeable content.
2015-09-07 11:31:33 +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
dfce6deaf1
Incremental work on placeable content.
2015-09-04 12:42:08 +01: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
de3d205ca9
Implemented a Widget element harvester.
2015-08-22 16:59:17 +01:00
Sipke Schoorstra
47ac6ba0ad
Fixed a typo.
2015-08-22 16:58:44 +01:00
Sipke Schoorstra
59c711fdb0
Fixed a subtle bug.
2015-08-22 16:58:22 +01: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
Sipke Schoorstra
860282bb44
Refactored CustomElements import/export step.
2015-07-17 13:09:58 +01:00
Sipke Schoorstra
e562f6adbd
Merge branch '1.9.x' into dev
...
Conflicts:
src/Orchard.Web/Modules/Orchard.Taxonomies/Views/EditorTemplates/Fields/TaxonomyField.Autocomplete.cshtml
src/Orchard.Web/Modules/Orchard.Taxonomies/Views/EditorTemplates/Fields/TaxonomyField.cshtml
2015-07-17 09:52:23 +01:00
Sipke Schoorstra
ddaf49db4a
#5530 : Fixed a spelling mistake in Layouts.
...
Fixes #5530
2015-07-17 09:46:53 +01:00
Lombiq
99e05c8a09
Fixing exception in Layouts when a driver was inherited from a custom base driver, fixes #5509
2015-07-16 12:11:38 +02:00
