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,693 Commits 94 Branches 33 Tags
1c7ed9cb94cab240560eee227f5485bb7b5009ff
Commit Graph

9693 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Sipke Schoorstra
56032dd815 Merge branch '1.9.x' into dev 
Conflicts:
	src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj
	src/Orchard.Web/Modules/Orchard.Setup/SetupMode.cs
	src/Orchard.Web/Modules/Orchard.Taxonomies/Drivers/TaxonomyFieldDriver.cs
	src/Orchard/Mvc/HttpContextAccessor.cs
	src/Orchard/Mvc/IHttpContextAccessor.cs
	src/Orchard/Orchard.Framework.csproj
	src/Orchard/Tasks/BackgroundService.cs
 2015-06-07 00:46:14 +02:00
Sipke Schoorstra
e810d885a0 #5270: Fixed Shape type not found error. 2015-06-07 00:25:58 +02:00
Skrypt
a721352797 Work on Migrations. 
Fixing view counter to check for pattern instead of pattern name since it can be empty.
 2015-06-06 02:14:01 -04:00
Lombiq
0c7b52e1be #5355: Fixing that the selected terms in a TaxonomyField were cleared out when updating an editor group the field isn't displayed in 2015-06-06 00:34:55 +02:00
Lombiq
30411b6be5 #5348: Splitting ItemDisplayText in two (fixing the fix) 2015-06-06 00:32:29 +02:00
Skrypt
ab8162347e Fixing small bug when creating a new content type. The use culture checkbox click event whas not working because the ID can change depending on the order the parts have been added. Replaced the jQuery selector to a class instead. 2015-06-04 20:55:57 -04:00
EmeraldArcher
0b3d0d80cf Changed to Logger.Information() per request by Sebastienros 
Fixed spelling of "occurred"
 2015-06-04 14:19:12 -06:00
Sébastien Ros
6763bd8bb8 Merge pull request #5344 from gcsuk/5342 
Added logging for invalid recipe files
 2015-06-04 13:10:38 -07:00
Rob King
8f281ef9d9 Reverted unit test 2015-06-04 21:03:23 +01:00
Rob King
8421b2f7e8 Changed to log error details in addition to file name 2015-06-04 21:01:35 +01:00
Sébastien Ros
c3379489d7 #5348: Splitting ItemDisplayText in two 2015-06-04 12:51:58 -07:00
Sébastien Ros
5c5ce99083 Merge pull request #5338 from qt1/IBN-Labs/Schemabuilder.TableDbName 
Provide full table name prefix for migrations
 2015-06-04 12:32:30 -07:00
Sébastien Ros
e709593197 Merge pull request #5321 from Xeevis/1.9.x 
#5109: Email field shouldn't specify email type in design mode
 2015-06-04 12:23:18 -07:00
Sébastien Ros
1b8e00a9c6 Merge pull request #5256 from jtkech/patch-4 
#5235: Awaiting activities not cleared on saving
 2015-06-04 12:04:31 -07:00
Bertrand Le Roy
55f2fb24c2 Fix the case of protocol-less stylesheet URI. 
.NET's Uri.IsWellFormedUriString doesn't understand protocol-less URI, resulting in the stylesheet binding strategy mistaking those for local resources, and trying to find alternates. This is wasteful and can lead to subtle bugs. If the method is ever fixed, the new code will die, and everything sill continue to work as expected.
 2015-06-04 11:01:46 -07:00
Sipke Schoorstra
071733495e Fixed unit tests. 2015-06-04 11:33:53 +02:00
Skrypt
13b012d212 Fix unneeded files changes/add 2015-06-03 22:45:26 -04:00
Skrypt
202dbc3866 Adding the option to activate patterns per culture or not. Falling back to the default culture pattern(s) if not activated. 2015-06-03 22:37:29 -04:00
Sipke Schoorstra
ce630f980c #5305: Fixing the issue where httpcontext would be resolved from the wrong lifetime scope container in certain cases. 
This changeset fixes a number of issues:
- Fixes the Autofac.Core.DependencyResolutionException: A delegate registered to create instances of 'System.Web.HttpContextBase' returned null error in VS 2015.
- Fixes indexing of layout part. The issue was that elements being rendered from a background task context and an element template uses an HTML helper, that would cause an exception since HttpContext.Current would normally be null.
- Replaces the need for injecting HttpContextBase with injecting IHttpContextAccessor (actually one should never inject HttpContextBase anymore - use IHttpContextAccessor instead).
 2015-06-04 02:06:24 +02:00
Rob King
67de77fe08 Moved ToList after Where clause 2015-06-02 14:43:54 +01:00