lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 03:25:23 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity
9,410 Commits 83 Branches 32 Tags
0e1cca0fce31195b638c2ee2e0ffceaeb0168d9a
Commit Graph

9410 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sébastien Ros
74be36d8a3 Merge pull request #5763 from phillipsj/1.9.x 
Updating DynamicForms Module.txt
 2015-09-08 11:11:12 -07:00
Jamie Phillips
2bb7eb2f91 Updating DynamicForms Module.txt 
The CustomForms module name and website were listed.
 2015-09-08 13:06:04 -04:00
Sebastien Ros
c4592aa65f Selecting the layer "Default" on the widgets start screen 
Fixes a specflow bug which expect "Default" to be the default
selected layer. Appeared since layers are ordered alphabetically.
 2015-09-08 09:27:36 -07:00
Sebastien Ros
9bac35b3f1 Removing duplicated using 2015-09-08 09:12:26 -07:00
Lombiq
2a0f866f26 Fixing exception when importing Projection Elements with the default layout selected 
Fixed the export of this previously, this was remaining.
 2015-09-08 01:01:23 +02:00
Thierry Fleury
371238a882 Add parameterized tokens tests 2015-09-07 15:14:20 +02:00
Thierry Fleury
67e7d1074e Allow Text token chaining when possible. 
Correct some errors on token descriptions.
 2015-09-07 11:57:20 +02:00
Thierry Fleury
25c34d8bca Fixes #5563 : Allow token chaining on DynamicForms submissions. 2015-09-07 11:57:19 +02:00
Thierry Fleury
75f3a618f0 Enhances TaxonomyField's token chaining. 2015-09-07 11:57:18 +02:00
Thierry Fleury
9947f3973e Add new Chain method for tokens 
The new method allows working with parameterized tokens.
 2015-09-07 11:57:17 +02:00
Lombiq
a685517118 Normalizing all catch (Exception ex) lines and adding exception fatality check where applicable, fixes #3949 2015-09-07 00:17:57 +02:00
Daniel Stolt
14482162fd Marked some tests as long-running. Fixes #5702. 2015-09-06 00:31:15 +02:00
Sébastien Ros
0f757655b8 Merge pull request #5736 from Codinlab/issue/5735 
Fixes #5735 : ContentType name encoding in Lists
 2015-09-04 16:35:03 -07:00
Sebastien Ros
39fb266221 Skipping DateTime tests until the right solution is found 
c.f. #5702
 2015-09-04 15:59:24 -07:00
Sebastien Ros
9b91b1b260 Removing unnecessary resolution 2015-09-04 13:20:08 -07:00
Sebastien Ros
c2194381f8 Removing unused usings 2015-09-04 12:12:13 -07:00
Sebastien Ros
c860b89e23 Removed erroneous HttpContextBase registrations 2015-09-04 12:12:02 -07:00
Sebastien Ros
04f29ba70c Revert "Cherry picked ce630f980c7a79ae17b36598f3834c4ffd523739." 
This reverts commit aba53e122d.

Conflicts:
	src/Orchard.Web/Modules/Orchard.Layouts/Handlers/LayoutPartHandler.cs
	src/Orchard/Mvc/HttpContextAccessor.cs
	src/Orchard/Mvc/IHttpContextAccessor.cs
	src/Orchard/Mvc/MvcModule.cs
	src/Orchard/Orchard.Framework.csproj
	src/Orchard/Tasks/BackgroundService.cs
 2015-09-04 10:59:31 -07:00
Sébastien Ros
e118695ea7 Merge pull request #5738 from harmony7/4852-orchardshellevents-workcontext 
#4852: Wrap IOrchardShellEvents in a work context
 2015-09-04 10:09:36 -07:00
Thierry Fleury
894e90f485 Use new ActionLink extension method. 2015-09-04 15:08:30 +02:00
Thierry Fleury
97bb52bbdd Add LinkExtensions 
Allows using IHtmlString as linkText
 2015-09-04 15:05:25 +02:00
Sébastien Ros
f3d08d61c4 Merge pull request #5741 from mvarblow/patch-2 
Mark the npm repository as private
 2015-09-03 14:24:05 -07:00
Sébastien Ros
22697edeec Merge pull request #5742 from mvarblow/patch-3 
Suppressed warning CS0436 in Orchard.Framework
 2015-09-03 14:23:26 -07:00
mvarblow
e0fc576f9e Suppressed warning CS0436 in Orchard.Framework 
Daniel changed the Orchaard.Framework project to ignore the JetBrains.Annotations conflicts for debug builds several months back. See http://orchard.codeplex.com/workitem/21056 and 78901ba . However, the problem still exists for release builds. This pull request applies the same fix (ignoring the warning) to release builds.
 2015-09-03 16:07:06 -04:00
mvarblow
ef9e5de8f4 Mark the npm repository as private 
'npm install' was generating several warnings about missing properties in package.json. Marking the repository as private clears up the warnings.
 2015-09-03 16:03:39 -04:00
harmony7@pex2.jp
5878611817 Wrap IOrchardShellEvents in a work context. 2015-09-03 22:19:21 +09:00
Thierry Fleury
2b61e3368d Fixes #5737 : ChangeListView throws NRE on unpublished Lists 2015-09-03 11:01:18 +02:00
Thierry Fleury
f5772334e1 Fixes #5735 : ContentType name encoding in Lists 2015-09-03 10:05:02 +02:00
Lombiq
fcc4a944bb Fixing that Projection Elements with the Default Layout selected weren't exported 2015-08-30 22:29:12 +02:00
Sebastien Ros
a0d61c67b8 Refactoring Import methods 2015-08-28 17:06:34 -07:00
Lombiq
42ff708da8 #5664: Lucene should page operations with the highest possible page size 2015-08-28 23:38:30 +02:00
Sebastien Ros
b52a846c5f #5664: Lucene should page operations 
Fixes #5664
 2015-08-27 15:31:39 -07:00
Sébastien Ros
9a8b64393e Merge pull request #5671 from RoyalVeterinaryCollege/4352 
#4352: orphaned awaitingactivities

Fixes #4352
 2015-08-27 12:39:24 -07:00
Jeff
bd1f14eeb0 Fix Issue #4352: Added prompt on workflow save to give choice of stopping running workflows. 2015-08-27 10:59:50 +01:00
Sebastien Ros
4b59569013 #5490 Fixing HttpRequestBase DependenciesShouldBeUpgradedFirst 
Fixes #5490
 2015-08-26 17:19:04 -07:00
Sébastien Ros
a603c7e07a Merge pull request #5678 from jchenga/issues/5618 
#5618 taxonomy in autoroute needs to be saved twice

Fixes #5618
 2015-08-26 16:48:13 -07:00
Sebastien Ros
96f6cb36fd Reverting session factory changes 2015-08-26 16:40:02 -07:00
Sébastien Ros
3d63c6d333 Merge pull request #5544 from yw80/patch-2 
Remove the blank line at the bottom of every page after the default theme rendering.
 2015-08-26 16:11:35 -07:00
Sébastien Ros
4cdb081c9d Merge pull request #5543 from yw80/patch-1 
Correct CSS class name of MediaLibraryPickerField field
 2015-08-26 16:05:16 -07:00
Sébastien Ros
9ed6b4261d Merge pull request #5542 from jtkech/patch-2 
##5369: Allows simple properties null checking on a dynamic ContentItem or ContentPart

Fixes #5369
 2015-08-26 16:04:09 -07:00
Sébastien Ros
a0e78f2eb0 Merge pull request #5571 from jersiovic/patch-6 
Fixed #5140 Recipe from Migrations didn't work
 2015-08-26 15:59:03 -07:00
Sébastien Ros
af4e41a717 Merge pull request #5667 from qt1/IBN-Labs/ItemEditLink_htmlAttributes 
Support htmlAttributes in ItemEditLink

Fixes #5666
 2015-08-26 15:54:13 -07:00
Sebastien Ros
7f91e787de Adding debug log when content item is imported 2015-08-26 14:44:56 -07:00
Sebastien Ros
6810cf473f Updating indexing tasks when content is imported or restored 2015-08-26 14:44:50 -07:00
Sebastien Ros
79a0ae86e8 Create index command should not delete existing index 2015-08-26 14:44:40 -07:00
Sebastien Ros
4cec35daf8 Disposing the session when a transaction is rolled back 2015-08-26 14:44:32 -07:00
Sebastien Ros
8d4cb98d59 Adding missing content handler Restore events 2015-08-26 14:44:25 -07:00
Sebastien Ros
e6424e2589 Removing empty folder 2015-08-26 14:44:15 -07:00
Sebastien Ros
dcc7783f12 Adding storage filter events for Import/Export 2015-08-26 09:47:39 -07:00
Sebastien Ros
d35ebe04e7 Adding User identity resolver 
To improve import step for Users
 2015-08-26 09:47:26 -07:00