jtkech
850a39bd8b
Update OrchardLog4netLogger.cs
2015-10-01 21:22:21 +02:00
jtkech
f3902feb35
Update WorkContextAccessor.cs
2015-10-01 21:09:44 +02:00
Sebastien Ros
508d97ed7d
Fixing merge
2015-10-01 09:14:21 -07:00
Jamie Phillips
a01b7dde23
URL Field for Dynamic Forms
...
Created this because I was binding to a content type that had a
URL
field. Need to do this validation when submitting the dynamic form.
2015-09-30 21:35:44 -04: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
Sebastien Ros
62136eb59f
Updating to Azure SDK 2.7
2015-09-30 15:50:05 -07:00
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
Jeff
fc759a107e
Added ElementAt operator to List token.
2015-09-30 12:03:43 +01:00
Sipke Schoorstra
39a6e10c76
Implemented Removing event.
2015-09-30 01:07:43 +01:00
Sipke Schoorstra
6a7452d68b
Removed unneeded property.
2015-09-29 23:42:30 +01:00
Sipke Schoorstra
994b17ebe1
Removed unused scripts.
2015-09-29 23:34:59 +01:00
Qingyu Zhou
e75b3aa06c
CookieCultureSelector.EvaluateResult is caught with NotImplementedException
...
The issue is caused by CookieCultureSelector is expecting a working implementation of HttpRequestBase.AnonymousID, yet in one case that wont'be true. During background task execution, which is started by SweepGenerator on a background thread without real HTTP request, the HttpRequestBase object is created using HttpRequestPlaceholder, which is trying to simulate a valid HTTP Request to some extent, particularly leaving its property AnonymousID not implemented. However, CookieCultureSelector.EvaluateResult is expecting context.Request.AnonymousID being implemented in some way.
This could be seen as a bug in Orchard.CultureSelector, as one can justify that it should be aware of fake HttpRequestBase object. On the other hand, this could be an Orchard bug as well, if the philosophy is to keep the users of HttpRequestBase objects ignorant of the actual implementation. I prefer the latter, thus this fix.
2015-09-29 15:34:40 -07:00
Sipke Schoorstra
b40a81a469
Merge branch 'dev' into feature/widget-elements
...
Conflicts:
src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj
src/Orchard.Web/Modules/Orchard.Layouts/Services/ElementManager.cs
2015-09-29 21:20:50 +01:00
Sipke Schoorstra
5f40af0f99
Changed LayoutRecord Guid type to Guid.
2015-09-29 21:13:11 +01:00
Sipke Schoorstra
5d5f55f535
Refactored Import process.
...
* Added Imported event to Elements.
* Invoking Imported event at the end after all content items have been imported.
Fixes #5848 .
2015-09-29 14:20:12 +01:00
Jeff
1706ee29ba
Merged sum operator.
2015-09-29 11:05:38 +01:00
Jeff
423fec90b3
Issue #3402 : Implemented List tokens.
2015-09-29 11:05:38 +01:00
Chris Payne
90feec6369
Fixes 1+n db call issue
...
Adds
2015-09-29 01:24:39 +01:00
Sébastien Ros
8ed39703e5
Merge pull request #5864 from Garpo001/patch-1
...
Serialization error is thrown when creating layout or page in the dashboard when using Layouts in a Web Farm.
2015-09-28 09:38:04 -07: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
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
