lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 03:16:18 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
10,294 Commits 83 Branches 32 Tags
aaced541e33d8b9a3f0e951d80da63e20846e0c3
Commit Graph

10294 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Daniel Stolt
d0f8fcdcf7 Changed FormsAuthenticationService to remember that authenticated user is non-item throughout the request. 
Fixes #5997
 2015-11-10 09:19:38 +01:00
Ryan Drew Burnett
6699245cbe Reply button only displays if user has permission to post comments. 2015-11-06 09:01:10 +00:00
Ryan Drew Burnett
778bc8a9dc Fixed reply button and comment link and added useful CSS class. 2015-11-05 21:48:04 +00: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
92cbf8925b Merge branch 'master' into 1.9.x 2015-11-03 21:38:19 +01:00
Lombiq
c8b7c64d93 Changing DotNest casing to the official one in the Readme 2015-11-03 21:37:13 +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
Chris Payne
4b93f3f493 Fires Updating and Updated events when menu items are re-ordered 
Fixes #6005
 2015-11-03 14:44:25 +00:00
jtkech
b6adf43b5d Update JobsQueueProcessor.cs 2015-11-03 09:03:58 +01:00
Sébastien Ros
d7cc9f4a5c Merge pull request #5990 from qt1/IBN-Labs/additional-module-directories-dev-5 
Adding support for custom themes and modules locations

Fixes #5019, #5241, #5354
 2015-10-29 21:43:23 -07:00
Sipke Schoorstra
388932b41f Merge pull request #5992 from harmony7/LayoutEditorSaveJquery 
With the Element editor dialog, use dialog iframe's jQuery for form submission
 2015-10-29 14:27:57 +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
Sipke Schoorstra
ab60db84b3 Added Orchard.Dashboards to Project Dependencies. 2015-10-29 13:02:07 +01:00
Lombiq
b9d441e6a3 INavigationProvider-provided menus are now run through INavigationFilters, fixes #5377 2015-10-29 00:50:08 +01:00
jtkech
348461d41f Update MvcModule.cs 2015-10-29 00:24:44 +01: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
Baruch Nissenbaum
1584bf703b Additional Module and Theme directories (squashed commit) 2015-10-24 20:05:21 +03: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
Sébastien Ros
219f29cd20 Merge pull request #5972 from rtpHarry/patch-4 
Revamp readme.md and update version to 1.9.2
 2015-10-22 12:20:48 -07:00
Sébastien Ros
51003bf582 Merge pull request #5967 from carlwoodhouse/redis-patch 
[Fixes #5958] Improving Redis extensions use of keys
 2015-10-22 12:19:26 -07:00
Sebastien Ros
0d5cff66a9 Fixing Azure Portal integration 2015-10-21 14:41:41 -07:00
Lombiq
7e66c98dd5 Adding the ability to add a menu item under another item directly, #4009 2015-10-21 19:52:03 +02: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
Matthew Harris
9ae372a920 revamp and update version to 1.9.2 
It was still talking about the project in the context of v1 and had a duplicate section about getting involved
 2015-10-21 00:11:42 +01:00
Carl Woodhouse
eecb61a132 Redis extensions use of keys #5958 2015-10-20 12:35:34 +01:00
jtkech
d2ef174479 Update HttpContextBaseExtensions.cs 2015-10-20 05:59:40 +02:00
jtkech
fbd0f878f5 Update MvcModule.cs 2015-10-20 05:56:27 +02:00
jtkech
0384c55011 Update MvcModule.cs 2015-10-20 05:46:40 +02:00
jtkech
afd80a8c72 Update HttpContextAccessor.cs 2015-10-20 05:44:28 +02:00
jtkech
9bdf130cc9 Update WorkContextAccessor.cs 2015-10-20 05:40:01 +02:00
Sébastien Ros
968e6b965b Merge pull request #5963 from RoyalVeterinaryCollege/5962 
[Fixes #5962] Last tag cannot be deleted
 2015-10-19 16:36:50 -07:00
Sébastien Ros
4574a9fb0b Merge pull request #5915 from rtpHarry/patch-1 
[Fixes #5912] Improve warning css in multi-tenant edit
 2015-10-19 16:35:44 -07: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