lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
10,524 Commits 94 Branches 33 Tags
1def97d9ce1e16f3cb1fd400a7c16a0f7fc8e383
Commit Graph

5762 Commits

Author SHA1 Message Date
Alexey Ryazhskikh
c46c4dba24 #6091: ImageProfileManager.GetImageProfileUrl can take multiple customFilters at a time. 2015-11-27 20:24:36 +03:00
Benedek Farkas
c0cc167a87 Merge branch '1.9.x' into dev 2015-11-25 15:44:26 +01:00
Sipke Schoorstra
f7ba32a0c2 Merge pull request #6054 from OrchardCMS/feature/configurable-snippets 
Added support for configurable snippet elements.
 2015-11-24 23:20:01 +01:00
Sipke Schoorstra
37550593d4 Added support for reusing the same field in a single snippet file. 2015-11-24 23:19:06 +01:00
Lombiq
b9091a7889 Removing unnecessary if when creating shape alternates 2015-11-24 21:00:34 +01:00
Lombiq
53317d97c5 Revert "Fixing that TinyMCE is encoding special chars" 
This reverts commit 188fabe233.
 2015-11-24 20:54:41 +01:00
Daniel Stolt
cee6539430 Fixed the things that someone always forgets. ;) 
- Fixed build warnings and cleaned up Web.config files of new modules.
- Added missing project dependencies to new modules.
- Added new modules to Azure solution.
 2015-11-24 19:35:27 +01:00
Daniel Stolt
b6dc75d4f9 Merge branch '1.9.x' into dev 
# Conflicts:
#	src/Orchard.Web/Orchard.Web.csproj
 2015-11-24 19:20:05 +01:00
Lombiq
1c4c64b812 Fixing that widgets with name containing dash can't have named alternates #3379 2015-11-24 17:17:12 +01:00
Lombiq
c5fb96ca4f Fixing that Workflows activities are not measured in relative coordinates 2015-11-24 14:23:20 +01:00
Lombiq
188fabe233 Fixing that TinyMCE is encoding special chars 2015-11-24 14:13:41 +01:00
Sipke Schoorstra
7b47356152 Merge pull request #6062 from OrchardCMS/feature/resources 
Orchard.Resources - Consolidate third-party client-side resources into dedicated module
 2015-11-24 01:45:40 +01:00
Sipke Schoorstra
a09c2045c5 Consolidated separate features into a single one. 2015-11-24 01:44:49 +01:00
Marek Dzikiewicz
715d557f32 Fix handling braces in tokens 
This brings Tokenizer changes from changeset
423fec90b3
 2015-11-22 18:34:27 +01:00
Sipke Schoorstra
3da3ab8a49 Added Uri. 2015-11-21 15:49:23 +01:00
Sipke Schoorstra
1271539b0a Added BlockUI and Moment. 2015-11-21 15:42:03 +01:00
Sipke Schoorstra
599624c3b0 Added History and Knockout and updated MediaLibrary. 2015-11-21 15:09:56 +01:00
Sipke Schoorstra
ddddb7407f Added Bootstrap and FontAwesome. 2015-11-21 14:21:29 +01:00
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
mkinawy
4db088fb9c fixes #5978 by moving the select button to the top of the media picker window and hides the save button untill some image is selected 2015-11-20 21:08:10 +02:00
Sipke Schoorstra
8258bb3589 Moved AngularJS and Underscore to Resources. 2015-11-20 18:36:25 +01:00
Sipke Schoorstra
febdc19e81 Created initial version of Orchard.Resources module. 
- Migrated all jQuery usages from Orchard.jQuery to Orchard.Resources.
- Deprecated Orchard.jQuery.
 2015-11-20 00:21:39 +01:00
Marek Dzikiewicz
b3bf80395a Fix TextTokens - Format and TrimEnd 
This fixes the Format and TrimEnd tokens and adds unit tests for
all TextTokens.
 2015-11-19 23:01:50 +01: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
e5bb771be1 Renamed WithDisplayName to DisplayedAs and removed test view from TheThemeMachine. 2015-11-19 17:56:42 +01:00
Sipke Schoorstra
f7e3f48df1 Added support for configurable snippet elements. 2015-11-19 17:39:52 +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
Zhi Sun
8965750dab Fixed typo in IndexingCommands.cs 
Fixes issue #6000
 2015-11-16 20:19:06 -08: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
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
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
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
9572ef9ad3 Removing unnecessary Web.config file from the unused "Orchard.Dashboards" module folder, #6010 
Fixes #6010
 2015-11-03 21:25:51 +01:00