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
9,310 Commits 94 Branches 33 Tags
504f484b19e4cd2cf6142b298ce8ee06f69888ab
Commit Graph

9310 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sipke Schoorstra
9466d91438 #5379: Improved LayoutPartDriver to safely handle recursive layout rendering. 
This prevents a SO exception when you for example have a Projection element that renders content including the content item rendering that Projection element.
 2015-06-12 13:28:53 +03:00
Skrypt
6e3d00b2d9 Optimization to support null values on culture instead of needing to set it to an empty string --> cleaner 2015-06-12 01:54:42 -04:00
Skrypt
8beec81217 Reverting changes in Migration. 
Adding String.IsNullOrEmpty instead of == ""
Fixed migration code to use ContentDefinitionManager only
Fixed return numbers on migration
using DefaultJsonConverter service in AutorouteSettings.cs
 2015-06-11 23:53:41 -04:00
Bertrand Le Roy
e3a9758331 Add a break element that renders the hr tag. 2015-06-11 20:47:37 -07:00
Bertrand Le Roy
564eeacf04 Merge branch '1.9.x' of https://github.com/OrchardCMS/Orchard into 1.9.x 2015-06-11 10:03:57 -07:00
Kegan Maher
d782d83db7 ensure that a version arg was given 2015-06-11 08:48:48 -07:00
Daniel Stolt
83429f4000 Restoring commit: Render fieldset as a fieldset in the editor canvas (by Bertrand Le Roy). 2015-06-11 16:11:30 +03:00
Sipke Schoorstra
20fe55a458 Merge branch '1.9.x' into dev 
Conflicts:
	src/Orchard.Web/Modules/Orchard.DynamicForms/Orchard.DynamicForms.csproj
	src/Orchard.Web/Modules/Orchard.DynamicForms/Scripts/Forms.js
	src/Orchard.Web/Modules/Orchard.DynamicForms/Scripts/Forms.min.js
	src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj
	src/Orchard.Web/Modules/Orchard.Layouts/Scripts/LayoutEditor.min.js
	src/Orchard.Web/Modules/Orchard.Layouts/Scripts/Models.min.js
	src/Orchard.Web/Modules/Orchard.Layouts/Styles/LayoutEditor.css
	src/Orchard.Web/Modules/Orchard.Layouts/Styles/LayoutEditor.css.bundle
	src/Orchard.Web/Modules/Orchard.Layouts/Styles/LayoutEditor.min.css
	src/Orchard.Web/Modules/Orchard.Layouts/Styles/LayoutEditor/Editor.css
	src/Orchard.Web/Modules/Orchard.Layouts/Styles/LayoutEditor/Editor.min.css
	src/Orchard.Web/Modules/Orchard.Layouts/Styles/LayoutEditor/Popup.css
	src/Orchard.Web/Modules/Orchard.Layouts/Styles/LayoutEditor/Popup.min.css
	src/Orchard.Web/Modules/Orchard.Layouts/Views/LayoutEditor.Template.Toolbox.cshtml
	src/Orchard/Tasks/BackgroundService.cs
 2015-06-10 23:58:18 +03:00
Bertrand Le Roy
47a0a87dc0 Render fieldset as a fieldset in the editor canvas. 2015-06-10 13:10:59 -07:00
Daniel Stolt
c8590fd934 Added missing NPM dependency in Orchard.Layouts. 2015-06-10 23:06:41 +03:00
Kegan Maher
298f30e628 adding 'export file' command for use in Orchard.exe for #4937 2015-06-10 13:02:41 -07:00
Sipke Schoorstra
1ee4664c50 Removed two more non-existing files. 2015-06-10 22:36:34 +03:00
Daniel Stolt
e8de82b611 Added Gulp build to Orchard.DynamicForms. 2015-06-10 20:43:59 +03:00
Bertrand Le Roy
c16de7f20a Fix flashing popup when adding a fieldset to the layout canvas. 2015-06-10 10:26:47 -07:00
Daniel Stolt
c1eff70f4a Refactored client-side asset build automation to fix watch triggering. 2015-06-10 16:26:51 +03:00
Rob King
92bde1ac71 Merge pull request #2 from gcsuk/ImprovedRecipeJournal 
Replaced string.format with Localizable T
 2015-06-10 12:24:32 +01:00
Rob King
7e149c4bc1 Replaced string.format with Localizable T 2015-06-10 10:07:04 +01:00
Sipke Schoorstra
9fbaed9123 Removed non-existing files from Orchard.Layouts.csproj. 2015-06-10 11:04:17 +03:00
Bertrand Le Roy
ef3ca907c7 Remove editor completely when adding a fieldset to the layout editor. 2015-06-09 13:48:58 -07:00
Bertrand Le Roy
7a1983b47f Add a fieldset element 2015-06-09 13:08:57 -07:00
Sipke Schoorstra
230d1b5d5d Fixed missing view file issue. 2015-06-09 21:54:48 +03:00
Daniel Stolt
5d40be8390 Removing an MSBuild property that was not supposed to be committed. 2015-06-09 21:31:27 +03:00
Daniel Stolt
452b8cfeac Added sticky positioning to layout editor toolbox. 2015-06-09 19:38:44 +03:00
Rob King
d78afaeb51 Merge pull request #1 from gcsuk/ImprovedRecipeJournal 
Improved Recipe Journal Logging Detail
 2015-06-09 16:09:53 +01:00
Rob King
a0279f2d9c Improved recipe logging to give a trail of executed tasks 2015-06-09 15:59:44 +01:00
Lombiq
81dade1ab4 When a content type gets modified, its items will get re-indexed by a JobsQueue job instead of a custom queue-like implementation. Fixes #4729. 
Since this adds a new dependency to Orchard.Indexing it requires #3132 to be fixed.
 2015-06-09 14:16:16 +02:00
Lombiq
8a7a300414 Fixing that a JobsQueue job re-queuing itself caused a DB deadlock. 
JobsQueueProcessor is a singleton, so every IDependency it gets injected should be wrapped into Work<T>.
 2015-06-09 14:13:01 +02:00
Daniel Stolt
d86a5ec8c5 Replaced Web Essentials with Gulp for Orchard.Layouts. 
Starting with VS2015, Web Essentials will no longer perform tasks such as bundling, minification and LESS compilation. Developers are expected to use either Grunt or Gulp for front-end build automation. In order to enable working with the codebase in VS2015 going forward, this change is therefore necessary.
 2015-06-09 14:09:03 +03:00
Sipke Schoorstra
711948fd64 Implemented import/export for VectorImage element. 2015-06-09 13:57:22 +03:00
Sipke Schoorstra
c4dacc1f62 Fixed that VectorImage would not render in TinyMCE. 2015-06-09 13:37:04 +03:00
Sipke Schoorstra
6a2b6d81f4 Formatted placement file. 2015-06-09 13:30:58 +03:00
Sipke Schoorstra
d6154078dc Fixed VectorImage placement. 2015-06-09 13:30:32 +03:00
Daniel Stolt
d9208bcc14 #5295: Fixed clipboard operations in layout element property popups. 2015-06-09 02:08:58 +03:00
Sipke Schoorstra
88679bd7ca Corrected bad merge. 2015-06-09 01:33:46 +03:00
Sipke Schoorstra
e03df31e50 Fixed unit tests. 2015-06-09 01:23:06 +03:00
Sipke Schoorstra
aba53e122d Cherry picked ce630f980c. 2015-06-09 01:22:41 +03:00
Sipke Schoorstra
c9887f4d39 Cherry picked 1e83068b8c. 2015-06-09 01:17:37 +03:00
Sipke Schoorstra
f0cd135993 Cherry picked 9bf6ac5718. 2015-06-09 01:14:49 +03:00
Lombiq
31a325a810 Implementing alternating row colours for content type and part editors too, fixes #2665 2015-06-09 00:09:54 +02:00
Daniel Stolt
d3ccd743e9 Added a missing MVC dependency assembly. 
For people with MVC 4 installed on their local box, this DLL was in the GAC so this was not an issue. However, with only VS2015 installed and no pre-nuget version of MVC, this causes a YSOD.
 2015-06-09 00:24:19 +03:00
Sipke Schoorstra
0b309677f8 #5367: Implemented import/export for the Projection Element. 2015-06-09 00:04:59 +03:00
Daniel Stolt
b2b6ea4bc2 Removed orphaned reference in Orchard.Layouts. 2015-06-08 23:49:39 +03:00
paynecrl97
bde7d900c0 adds summary tags 2015-06-08 15:24:41 +01:00
paynecrl97
550b778b8b minor whitespace fix 2015-06-08 15:07:02 +01:00
paynecrl97
9893eb7430 Braces tidy up 2015-06-08 10:50:10 +01:00
paynecrl97
ffcccf7ae1 Adds ILayerEvaluationService and implementation. 
The default implementation of this service is merely an abstraction of the logic that already existed in `WidgetFilter`
 2015-06-08 10:47:16 +01:00
Skrypt
23f3f29a47 Creating Patterns and Default Patterns for each culture installed when attaching an AutoroutePart to a Content Type. 
Related to issue #5195
 2015-06-07 21:12:11 -04:00
Skrypt
60ce2d777c Adding fix when we create a new Content Type and that we don't save any Pattern. We should save default patterns to each culture when we assign an AutoroutePart to a content type. 2015-06-07 18:34:42 -04:00
Skrypt
f8ab1c509e Adding migration of AutorouteSettings.DefaultPatternIndex to AutorouteSettings.DefaultPatternDefinitions 2015-06-07 18:14:12 -04:00
oldrev
fb717b0e2e Add PostgreSQL RDBMS support 2015-06-07 09:39:49 +08:00