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
5b0efdba58
Excluding long running tests from Test step
2015-09-25 16:00:10 -07: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
myates
65ae99abd4
Ensure the modified taxonomy items are not lost if a model validation error occurs.
2015-09-25 15:43:44 +10:00
armanforghani
985bb27708
Adding ManageTemplates permission.
...
Fixes #4951
2015-09-24 23:15:35 +03:30
Sebastien Ros
eb9bfa0d29
Merge branch 'feature/webpi' into 1.9.2
2015-09-24 09:10:44 -07:00
Sipke Schoorstra
0ad1ef3098
#5847 : Fixed CssClasses import/export.
2015-09-24 14:03:29 +01:00
Sebastien Ros
1724be5c72
Bumping version number
2015-09-23 17:23:54 -07: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
Erik Scofield
59d95f11ee
Enhancement to allow multi-select for the content picker
2015-09-23 00:11:43 -05: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
Sebastien Ros
248cc7ecde
Updating webpi package files
2015-09-21 15:29:31 -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
mvarblow
c7fde5bc72
Update TermCountProcessor.cs
...
Don't process the same term multiple times if it happens to be the parent of multiple terms on the list.
2015-09-18 10:59:32 -04:00
mvarblow
d080037af9
Update TaxonomyService.cs
2015-09-18 10:45:16 -04:00
mvarblow
5a6ba5ddd6
Update ITermCountProcessor.cs
2015-09-18 10:43:53 -04:00
mvarblow
658a5601a5
Update TermsPartHandler.cs
...
Queue a single task to process all terms updated within this work context.
2015-09-18 10:42:54 -04: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
