Daniel Stolt
b5d4cf01b5
Moved CopySqlCeBinaries earlier in the build process of Orchard.Web.csproj.
...
This fixes an issue where, if Orchard.Web has not previously been built, the SQL CE binaries will not be included when doing a Web Deploy publish of Orchard.Web.
2015-09-30 20:59:32 +02:00
Daniel Stolt
7d4ed4416d
Updated to latest version of MSBuild community tasks.
...
This makes it possible to execute Orchard.proj to build and package on a build server that doesn't have .NET Framework 3.5 installed.
2015-09-30 19:29:12 +02:00
Daniel Stolt
e0fe699049
Corrected build action of Placement.info in Orchard.Dashboards.
2015-09-30 19:12:01 +02:00
Sébastien Ros
9bafa7ff9a
Merge pull request #5674 from RoyalVeterinaryCollege/4409
...
#4409 : Use service for autocomplete enabled taxonomy field and maintain ordering
2015-09-28 09:37:29 -07:00
Jeff
c81fc70251
Added admin check and moved tag class to separate file with serialization attributes for lowercasing property names.
2015-09-28 16:19:11 +01:00
Jeff
8adb69de54
Loading terms via a service for autocomplete enabled taxonomy field. It also maintains the order the terms are selected.
...
Issue #4409 .
2015-09-28 16:19:10 +01:00
Sipke Schoorstra
e2e539897e
Updated Azure Host.config.
2015-09-28 15:23:49 +01:00
Sipke Schoorstra
0ad1ef3098
#5847 : Fixed CssClasses import/export.
2015-09-24 14:03:29 +01:00
Sebastien Ros
145c8037b0
Merge branch '1.9.x' into dev
2015-09-23 17:19:28 -07:00
Sebastien Ros
7a289ca1ad
[ Fixes #5846 ] Saving settings would reset Markdown part settings
2015-09-23 17:12:59 -07:00
Sebastien Ros
b7a0b007e4
[ Fixes #5835 ] Restoring cache invalidation propagation
2015-09-23 16:14:19 -07:00
Sebastien Ros
f2fb1d520d
Preventing concurrency when monitoring extensions
2015-09-23 10:17:17 -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
bb41f1f559
Merge pull request #5831 from OrchardCMS/feature/ownmedia
...
Implementing own media management
2015-09-21 15:08:19 -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
Sébastien Ros
46182edc5d
Merge pull request #5827 from rtpHarry/1.9.x
...
[Fixes #5826 ] Restore placements confirmation message fix
2015-09-21 14:36:44 -07:00
Sebastien Ros
accd4196dc
Implementing own media management
2015-09-21 14:09:37 -07:00
Sebastien Ros
d3d85f3519
Adding ManageLayout permission
2015-09-21 14:04:37 -07:00
Sébastien Ros
6e90f704f8
Merge pull request #5833 from mjy78/issue/5829
...
[Fixes #5829 ] Cannot delete spam comment when viewing comment details
2015-09-21 13:02:32 -07:00
Sébastien Ros
497b782a6a
Merge pull request #5837 from mjy78/issue/5836
...
#5836 Fix null ref exception in CommentPartDriver
2015-09-21 12:58:01 -07:00
Sebastien Ros
bc935f18b3
Fixing unit tests
2015-09-21 12:45:57 -07:00
Sebastien Ros
12a51ea7af
[ Fixes #5751 , #5794 ] Removing Edit inline
2015-09-21 12:08:19 -07:00
Sebastien Ros
f0b1639143
[ Fixes #5616 ] Revert "Using master content item to create translations"
...
This reverts commit fa09e2e83a
2015-09-21 11:27:46 -07:00
myates
9bb95efaaa
#5836 Fix null ref exception in CommentPartDriver
2015-09-21 10:26:14 +10:00
Daniel Stolt
7278c0286f
Fixed a potential exception in Gulpfile when asset group output doesn't exist.
2015-09-19 22:20:29 +02:00
myates
e6c042d1a0
Fix build error
2015-09-19 22:03:12 +10:00
myates
df583ea571
Merge branch 'Orchard-1.9.x' into issue/5829
2015-09-19 21:20:21 +10:00
myates
adbab55ffc
Comment service now fetches latest (instead of published) when deleting a comment.
2015-09-18 16:45:10 +10:00
Daniel Stolt
52e7fd12b1
Fixed incorrect export condition in LinkFieldDriver.
2015-09-18 02:50:11 +02:00
Daniel Stolt
1edf94756c
Changed field drivers to not export empty elements.
...
This results in much cleaner recipes.
2015-09-18 02:42:40 +02:00
Matthew Harris
20fbd99658
updated all instances of RemoveUrl checks
2015-09-17 22:58:58 +01:00
Matthew Harris
d9a0e040c1
don't overwrite confirmRemoveMessage
2015-09-17 22:54:47 +01:00
Matthew Harris
4aaf4d34d0
amends based on PR feedback
2015-09-17 21:58:12 +01:00
Sipke Schoorstra
d310a56c38
Merge pull request #5814 from OrchardCMS/task/machinenameprovider
...
Refactor renamed IMachineNameProvider.
2015-09-17 21:52:15 +01:00
Sipke Schoorstra
8d0205ebfb
Changed namespace.
2015-09-17 21:51:58 +01:00
Sébastien Ros
ee59a61733
Merge pull request #5815 from OrchardCMS/issue/recipeexecutiontimeout
...
Added configurable RecipeExecutionTimeout properties.
2015-09-17 12:06:04 -07:00
Matthew Harris
7143792c0e
fix #5826
2015-09-17 19:44:25 +01:00
Sebastien Ros
4214329a1f
Prevent unnecessary db calls for containers
2015-09-16 17:52:33 -07:00
Sebastien Ros
921b2472f1
Adding filter for own content
2015-09-16 17:52:27 -07:00
Sebastien Ros
9e9e19c439
Add setting to hide Container editor
2015-09-16 17:52:13 -07:00
Sebastien Ros
f3595881fe
Hide taxonomy link if permission is not granted
2015-09-16 17:52:04 -07:00
Sebastien Ros
ba36eae848
Prevent MediaLibrary popup without permissions
...
If the user doesn't have ManageMedia permissions,
the markdown editor will use a specific image editor.
2015-09-16 17:51:50 -07:00
Sebastien Ros
0bf76dc7ac
Implementing a positioned wrapper for text elements
...
When adding a text directly to a zone, the position will now
be taken into account. This is also useful for the Capture feature.
Conflicts:
src/Orchard/Orchard.Framework.csproj
2015-09-16 17:51:23 -07:00
Sipke Schoorstra
951391f4dd
Refactored DefaultMessageBus.
...
* Replaced private GetHostName with IHostNameProvider.
2015-09-16 23:18:19 +01: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
Sipke Schoorstra
8ee09eacd0
Added configurable RecipeExecutionTimeout properties.
...
* Added RecipeExecutionTimeout to SetupController.
* Added RecipeExecutionTimeout to ExecuteRecipeAction.
* Added property-injection registration source to ShellContainerFactory so that controllers can have their public properties be configured.
2015-09-15 23:41:58 +01:00
Sipke Schoorstra
3896a8f921
Minor cleanup and formatting.
2015-09-15 23:02:58 +01:00
Sipke Schoorstra
c6a87f5228
Refactor renamed IMachineNameProvider.
2015-09-15 22:58:21 +01:00
Sipke Schoorstra
66ff5d36e9
Merge pull request #5810 from Codinlab/issue/5809
...
Fixes #5809 : Layouts : DisplayText encoded twice in Design mode
2015-09-15 14:03:55 +01:00
Thierry Fleury
749ff5dc72
Fixes #5809 : Layouts : DisplayText encoded twice in Design mode
2015-09-15 14:53:52 +02:00
