lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity
10,140 Commits 83 Branches 32 Tags
578184f50ff2e52196a1c2d8543b38ae44e04ce1
Commit Graph

5525 Commits

Author SHA1 Message Date
Sipke Schoorstra
578184f50f Fixed an audittrail diff bug. 
The bug caused a YSOD if the diffgram contained a match for a changed attribute being the last node of the diffgram.
 2015-11-12 21:06:44 +01:00
Sipke Schoorstra
978408765b Fixed an issue with copy/paste. 2015-11-12 20:25:35 +01:00
Sipke Schoorstra
391459d273 Merge branch 'dev' into feature/widget-elements 
Conflicts:
	src/Orchard.Web/Modules/Orchard.Layouts/Controllers/ElementController.cs
 2015-11-12 19:38:31 +01:00
Sipke Schoorstra
278e22e1b2 Merge pull request #6026 from harmony7/5995-ElementControllerBehavior 
Fixed behavior of Element Controller in an around editing and updating.
 2015-11-12 19:35:54 +01:00
Sipke Schoorstra
92fba4d76d Updated ClientValidationRegistrationCoordinator with updated interface. 2015-11-12 19:10:03 +01:00
Sipke Schoorstra
6ff17439e8 Implemented Import/Export support for harvesters. 
Also normalized the way drivers are invoked by moving code from the ElementManager to the ElementDriversCoordinator handler.
 2015-11-11 15:48:38 +01:00
Sipke Schoorstra
61f86895db Merge branch 'dev' into feature/widget-elements 
Conflicts:
	src/Orchard.Web/Modules/Orchard.Layouts/Scripts/Lib.js
	src/Orchard.Web/Modules/Orchard.Layouts/Scripts/dialog.js
	src/Orchard.Web/Modules/Orchard.Layouts/Styles/LayoutEditor.css
	src/Orchard.Web/Modules/Orchard.Layouts/Styles/Lib.css
 2015-11-11 13:12:18 +01:00
Katsuyuki Ohmuro
e9146f60c4 Fixed behavior of Element Controller in an around editing and updating. 
Also removed unused file, unused methods, and unused parameters.
 2015-11-11 17:38:42 +09:00
Sébastien Ros
adc92fb1b4 Merge pull request #6002 from jtkech/patch-3 
[Fixes #5882] No record could be found in the database for lock
 2015-11-10 12:57:15 -08:00
Sipke Schoorstra
bcf4813c3e Merge branch '1.9.x' into dev 
Conflicts:
	README.md
	src/Orchard.Web/Modules/Orchard.Dashboards/Web.config
	src/Orchard.Web/Modules/Orchard.DynamicForms/Orchard.DynamicForms.csproj
	src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/Compare.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/EmailAddress.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/Mandatory.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/OptionRequired.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/RegularExpression.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/Required.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/StringLength.cs
 2015-11-03 22:44:13 +01:00
Sipke Schoorstra
06ee7849c1 Removed tokenization from dynamic form error messages. 2015-11-03 22:34:11 +01:00
Sipke Schoorstra
61c91ff858 Merge pull request #5884 from phillipsj/1.9.x 
Resolves #5878 : URL Field for Dynamic Forms
 2015-11-03 22:08:22 +01:00
Lombiq
9572ef9ad3 Removing unnecessary Web.config file from the unused "Orchard.Dashboards" module folder, #6010 
Fixes #6010
 2015-11-03 21:25:51 +01:00
Sipke Schoorstra
d63a9ed9d1 Updated ElementDisplay to use Invoke extension method. 
The generic Invoke extension method has the advantage of catching any exceptions occurring in client code and logging them, preventing the rest of the Layouts from breaking down.
 2015-11-03 20:38:57 +01:00
jtkech
b6adf43b5d Update JobsQueueProcessor.cs 2015-11-03 09:03:58 +01:00
Katsuyuki Ohmuro
829f69198c With the Element editor dialog, use dialog frame's jQuery for form submission. 2015-10-29 21:40:47 +09:00
Baruch Nissenbaum
9c2ea80670 Merge branch 'IBN-Labs/additional-module-directories-squashed' into IBN-Labs/additional-module-directories-dev-5 
Conflicts:
	src/Orchard.Web/Web.config
 2015-10-28 17:59:25 +02:00
Lombiq
393f5bc9d3 Fixing possibility of open redirection attack on post-registration screens 
Fixing the fix of #2295.
 2015-10-27 22:31:26 +01:00
Lombiq
8c7508546c Fixing more line endings 2015-10-27 22:31:15 +01:00
Lombiq
d54e5c3e3c Fixing line endings in template files 2015-10-27 22:22:57 +01:00
Sipke Schoorstra
e3026b199e Added Priority setting to the Orchard.Setup module manifest. 
Fixes #5980
 2015-10-27 10:08:11 +01:00
Nicholas Mayne
169543b26f Removing duplicate recipe call 2015-10-26 22:32:42 +00:00
Lombiq
db92e1a803 Adding a "Go back to where you were" link to post-registration pages, fixes #2295 2015-10-26 18:44:19 +01:00
Jamie Phillips
4648a252b9 Correcting formatting and handling of error message. 
Corrected the formatting and correct the handling of the error message.
 2015-10-23 17:12:24 -04:00
Jamie Phillips
14c2ee7944 Updating Validation Message for URL Field 
This change is made to now be in sync with the recent changes to how validation messages are being handled.
 2015-10-20 20:34:23 -04:00
Carl Woodhouse
eecb61a132 Redis extensions use of keys #5958 2015-10-20 12:35:34 +01:00
Matthew Harris
bec9a6d792 Merge branch '1.9.x' into patch-1 
Conflicts:
	src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Edit.cshtml
 2015-10-20 00:09:16 +01:00
Jeff
53d4f9eafa Fixes #5962. Add any tags that are no longer selected but were initially on page load. 2015-10-18 23:27:46 +01:00
Nicholas Mayne
fb4ecff18e Andout Count to Any and removing usings 2015-10-18 20:52:52 +01:00
Nicholas Mayne
452c03fa6f Changing Count for Any 2015-10-18 20:43:54 +01:00
Nicholas Mayne
98ae7172ff Removing NHibernate dependency from Recipies 2015-10-18 19:00:46 +01:00
Kegan Maher
dbe89d0a82 avoid null exception in AzureBlobStorageProvider.GetStoragePath, fixes #4402 2015-10-16 14:19:39 -07:00
Sipke Schoorstra
255547288b Fixed T usage in ValidationRules, round 2. 2015-10-16 10:45:08 +02:00
Sebastien Ros
e6215a93b3 Fixing build 2015-10-15 17:58:19 -07:00
Lombiq
a9abc294e3 Fixing that module tests codegen created projects with the old .NET framework version 2015-10-15 15:51:44 -07:00
Sebastien Ros
07c539e749 Merge remote-tracking branch 'origin/dev' into dev 2015-10-15 15:08:45 -07:00
Sebastien Ros
f1cd6aa38d Merge branch '1.9.x' into dev 
Conflicts:
	lib/windowsazure/Microsoft.WindowsAzure.Storage.xml
	src/Orchard.Specs/Hosting/Orchard.Web/Web.config
	src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Web.config
	src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Edit.cshtml
	src/Orchard.Web/Modules/Orchard.Taxonomies/Drivers/TaxonomyFieldDriver.cs
	src/Orchard.Web/Modules/Orchard.Taxonomies/Handlers/TermsPartHandler.cs
	src/Orchard.Web/Modules/Orchard.Taxonomies/Services/TermCountProcessor.cs
	src/Orchard.Web/Web.config
 2015-10-15 15:07:19 -07:00
Sebastien Ros
101d61b808 Merge branch 'master' into 1.9.x 2015-10-15 15:00:14 -07:00
Sipke Schoorstra
054925c297 Fixed T usage in ValidationRules. 2015-10-15 21:47:01 +02:00
Sébastien Ros
260d0efaf6 Merge pull request #5926 from JRKelso/patch-3 
[Fixes #5885] Validating permalink length
 2015-10-15 12:23:16 -07:00
Sébastien Ros
ff97d1e975 Merge pull request #5918 from rtpHarry/patch-3 
[Fixes #5908] Triple columns don't fit on small screens
 2015-10-15 12:22:16 -07:00
Sébastien Ros
e26fee3d6c Merge pull request #5844 from escofieldnaxos/feature/Content-Picker-MultiSelect 
Enhancement to allow multi-select for the content picker
 2015-10-15 12:09:10 -07:00
Sebastien Ros
ec0ea5e321 Updating ManageOwnMedia defaults 
Fixes #5894
 2015-10-15 11:41:07 -07:00
Sébastien Ros
dd9d67fe48 Merge pull request #5952 from dcinzona/patch-2 
Fixes #5896 - AzureFileStorageProvider
 2015-10-15 11:36:49 -07:00
Ryan Kelso
74a5c8d2aa Fixes error message wording problem 2015-10-14 13:47:01 -04:00
Sébastien Ros
52c6debc97 Merge pull request #5937 from dcinzona/patch-1 
Fixes for #5936 #5938 #5941 and #5891
 2015-10-14 09:11:08 -07:00
Gustavo Tandeciarz
d64541d47a Fixes #5896 - AzureFileStorageProvider 
Needs verification that this will not break anything else - don't think it will.
 2015-10-14 10:15:06 -04:00
dcinzona
855d183be3 Fixes #5935 Updates Azure.Storage to 5.0.2.0 2015-10-13 15:38:57 -04:00
Sipke Schoorstra
161ac92c9e Removed unused Guid property from LayoutRecord. 2015-10-13 20:41:05 +02:00
Sipke Schoorstra
5344ed2e2a Fixed order of exported content part elements. 
This fixes an issue where the LayoutPart XML element would appear last in the content item XML element due to the fact that the <LayoutPart> element was being added only in the Exported event and not in the Exporting event.

To fix this, the <LayoutPart> element is no first added during the Exporting event, and later updated in the Exporting event.
 2015-10-13 20:17:03 +02:00