lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-07-15 13:53:34 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
10,159 Commits 73 Branches 31 Tags 239 MiB
cbcffb52d0
Commit Graph

10159 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
flew2bits
cbcffb52d0 Fixed braces 2015-11-20 15:35:52 -05:00
flew2bits
0da9370296 Added signal to invalidate media profile cache when newly published. 2015-11-20 15:20:03 -05:00
Sébastien Ros
0e627f8810 Renaming css selector for comment id 2015-11-19 12:36:38 -08:00
Sébastien Ros
d64bb02783 Merge pull request #6015 from ryandrewburnett/dev 
Fixed reply button and comment link and added useful CSS class.
 2015-11-19 12:35:21 -08:00
Sébastien Ros
2f9a2c0c38 Merge pull request #6041 from sunz7/issue/6000 
[Fixes 6000] Fixed typo in IndexingCommands.cs
 2015-11-19 12:26:20 -08:00
Sipke Schoorstra
a93398eac0 Merge pull request #6030 from OrchardCMS/feature/widget-elements 
Widgets in Layouts
 2015-11-19 14:08:25 +01:00
Sipke Schoorstra
bda0f3d732 Merge branch 'dev' into feature/widget-elements 2015-11-19 14:03:16 +01:00
Sipke Schoorstra
5c18f49fa3 Layouts, Widgets and Conditions. 
- Moved Rules engine code to new Orchard.Conditions module.
- Refactored Layouts and Widgets to use Conditions.
- Moved Widgets element harvester to the Widgets module as a separate feature.
 2015-11-19 14:02:12 +01:00
Lombiq
d42065acb8 Merge branch '1.9.x' into dev 2015-11-19 13:59:15 +01:00
Lombiq
b32fc1b7ba Adding proper end of line handling when cloning from Mercurial 2015-11-19 13:58:47 +01:00
Zhi Sun
8965750dab Fixed typo in IndexingCommands.cs 
Fixes issue #6000
 2015-11-16 20:19:06 -08:00
Sipke Schoorstra
db8c11d79b Added tabbed editor UI support to MenuItem types. 2015-11-16 22:08:59 +01:00
Sipke Schoorstra
3b4b3c578a Fixed potential widget orphans when deleting layout content. 
This fixes the scenario where you have a layout with a widget element pointing to a widget content item, and the layout content item is being deleted.
Doing so will now correctly invoke Remove on all elements within the layout content item being deleted.
 2015-11-12 21:38:33 +01:00
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
Sébastien Ros
4573f65c19 Merge pull request #6006 from paynecrl97/bug/6005/menu_events 
Fires Updating and Updated events when menu items are re-ordered
 2015-11-12 12:05:26 -08: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
Daniel Stolt
500255c3b1 Merge pull request #6028 from mvarblow/patch-3 
Update CacheItemRecord.cs

Fixed database output cache module when using SQL Server database. This resolves the following exception which results from NHibernate trying to truncate the Output field to 8K: NHibernate.AssertionFailure: null id in Orchard.OutputCache.Models.CacheItemRecord entry (don't flush the Session after an exception occurs)
 2015-11-11 18:36:18 +01:00
mvarblow
67096961ce Update CacheItemRecord.cs 
Fixed database output cache module when using SQL Server database.  This resolves the following exception which results from NHibernate trying to truncate the Output field to 8K:

NHibernate.AssertionFailure: null id in Orchard.OutputCache.Models.CacheItemRecord entry (don't flush the Session after an exception occurs)
 2015-11-11 12:19:59 -05: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
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
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