lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-04-05 21:01:35 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
10,587 Commits 73 Branches 31 Tags 239 MiB
e30c86d0a5
Commit Graph

10587 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jtkech
e30c86d0a5 Update TermAdminController.cs 2016-03-17 23:50:08 +01:00
jtkech
559985b29c Update DefaultOrchardHost.cs 2016-03-17 23:47:28 +01:00
Sebastien Ros
d39485abf2 Merge branch '1.9.x' into 1.10.x 
Conflicts:
	src/Orchard.Specs/MultiTenancy.feature
	src/Orchard.Web/Config/HostComponents.config
	src/Orchard.Web/Modules/Orchard.Taxonomies/Controllers/TermAdminController.cs
	src/Orchard/Environment/DefaultOrchardHost.cs
	src/Rebracer.xml
 2016-03-17 10:18:46 -07:00
Sebastien Ros
6dcbbc2d93 Merge branch '1.10' 2016-03-17 09:53:07 -07:00
Sebastien Ros
c4dd5a9e18 Updating Rebracer settings 2016-03-16 16:34:45 -07:00
Sebastien Ros
9a2c08d31e Fixing tenant load retry logic 2016-03-16 16:34:32 -07:00
Lombiq
ea45c4f825 Autoroute: fixing T-string syntax in AutoroutePartHandler and updating its text 2016-03-15 19:02:51 +01:00
Benedek Farkas
b4c782a4ad Merge remote-tracking branch 'origin/1.9.3' into 1.10 2016-03-15 18:47:52 +01:00
Lombiq
36df2fe1a1 TheAdmin: updating description in Theme.txt 2016-03-15 18:46:17 +01:00
Sébastien Ros
dd326127ce Merge pull request #6582 from infofromca/typo 
Fixed a typo in DefaultOrchardShell.cs
 2016-03-14 15:32:35 -07:00
andy zheng
82c9baad18 fixed a typo in defaultorchardShell 2016-03-14 18:06:10 -04:00
Benedek Farkas
35ab4117ef Merge remote-tracking branch 'origin/1.9.3' into 1.10 2016-03-14 20:33:24 +01:00
Benedek Farkas
0d9d8d6b2a Merge pull request #6573 from RoyalVeterinaryCollege/6572 
Issue #6572: Add only existing terms for the field.
 2016-03-14 20:32:49 +01:00
Benedek Farkas
4a0230d88c Merge remote-tracking branch 'origin/1.9.3' into 1.10 2016-03-14 19:17:54 +01:00
Lombiq
356e8230ab Taxonomies: fixing that the term admin index page should sort terms. Fixes #6548 2016-03-14 19:17:03 +01:00
Sebastien Ros
3ea1b100d6 Excluding PDBs from deployment packages 2016-03-14 10:54:59 -07:00
Sebastien Ros
d4c03997f6 [Fixes #6577] Exclude nuget packages from artifacts 2016-03-14 10:24:11 -07:00
Sébastien Ros
2273d38a7f Merge pull request #6568 from OrchardCMS/sebros/etag 
Adding correct ETag support
 2016-03-11 10:46:38 -08:00
Sebastien Ros
181db18355 Adding correct ETag support 2016-03-11 10:45:57 -08:00
Sébastien Ros
32bf5ed6c8 Merge pull request #6569 from jtkech/patch-6 
[Fixes #6544] NRE with containable part & Orchard.Lists
 2016-03-11 09:28:55 -08:00
Jeff
244cb6c6f4 Issue #6572: Add only existing terms for the field. 2016-03-11 11:49:31 +00:00
jtkech
af7da7963e Update List.cshtml 2016-03-10 23:28:08 +01:00
jtkech
3b7a54f10d Update Shapes.cs 2016-03-10 23:26:25 +01:00
Sébastien Ros
5e6a1549ad Merge pull request #6567 from jtkech/patch-5 
Fixing multi-tenancy functional tests
 2016-03-10 14:06:10 -08:00
jtkech
447728df03 Update MultiTenancy.feature 2016-03-10 22:47:51 +01:00
jtkech
30f163bd39 Update MultiTenancy.feature.cs 2016-03-10 22:46:19 +01:00
Sébastien Ros
78bab529d2 Merge pull request #6566 from carlwoodhouse/1.9.x 
[Fixes #6523] Output cache route config
 2016-03-10 13:00:34 -08:00
Carl Woodhouse
31ed21b061 Output cache route config fixes #6523 2016-03-10 20:31:55 +00:00
Sebastien Ros
712ff2f487 Retrying on tenant startup 
Conflicts:
	src/Orchard.Web/Config/HostComponents.config
	src/Orchard/Environment/DefaultOrchardHost.cs
 2016-03-09 15:39:57 -08:00
Sebastien Ros
aae9f6270e [Fixes #6526] Unwrap TargetInvocationException when executing a ShapeAttributeBinding 2016-03-09 15:37:44 -08:00
Lombiq
cbd2ae71e1 Media Library: Removing the forced reinitialization of Recent on page load. Fixes #6490 2016-03-09 18:39:46 +01:00
Sébastien Ros
7fb4740e29 Merge pull request #6554 from jtkech/patch-20 
Fixing TextField default values
 2016-03-08 17:22:34 -08:00
jtkech
cf5ada1d4b Update TextFieldDriver.cs 2016-03-09 01:49:13 +01:00
jtkech
4664416472 Update TextFieldDriver.cs 2016-03-09 01:47:33 +01:00
Sebastien Ros
1def97d9ce [Fixes #6397] Allowing the default tenant settings to be edited 2016-03-08 14:47:46 -08:00
Sébastien Ros
2b12a43385 Merge pull request #6520 from infofromca/fieldduplicated 
[Fixes #6497] 1.10 Field names duplicated in dropdown list,
 2016-03-08 09:39:28 -08:00
andy zheng
a92ef7c4de Fixes 2 little issues in dev around the TextField default values 2016-03-06 21:58:38 -05:00
Sébastien Ros
26e2fe9977 Merge pull request #6419 from rtpHarry/fix-6272 
[Fixes #6272] Improve wording for comparisons
 2016-03-03 12:41:25 -08:00
Sébastien Ros
b1c606becc Merge pull request #6426 from rtpHarry/terms-mentions-taxonomies 
Fix wrong permission check and incorrect use of taxonomies phrase
 2016-03-03 12:37:27 -08:00
Sébastien Ros
8b8cf0b7e6 Merge pull request #6427 from rtpHarry/module-list-flexbox 
[Fixes #5907] Convert modules admin page to use css flexbox
 2016-03-03 12:36:36 -08:00
Sébastien Ros
7effab96a0 Merge pull request #6429 from rtpHarry/fix-5706 
[Fixes #5706] Force order on Properties, Validation, Bindings
 2016-03-03 12:33:38 -08:00
Sébastien Ros
1b8bcb8a4e Merge pull request #6500 from infofromca/tenantPrefixHost 
[Fixes #6495] Ensure a host or a url is defined for new tenants
 2016-03-03 12:26:53 -08:00
Sébastien Ros
a91b06f1b5 Merge pull request #6528 from dcinzona/razor-view-engine 
[Fixes #6514] Update RazorViewEngineProvider.cs
 2016-03-03 12:12:34 -08:00
Sipke Schoorstra
3690968646 Fixed Dynamic Forms Bindings issue. Fixes #6470 
ModelBinding failed due to the "null" key being specified. Instead, the type name of the model should be specified as the key (which happens by default when no key is specified). Not sure how this worked before, since this code has been there from the beginning, and file histories don;t show an obvious change. Perhaps due to the upgrade to newer ASP.NET MVC?
 2016-03-02 23:51:22 +01:00
Lombiq
6c93bf4d69 Merge remote-tracking branch 'origin/1.9.3' into 1.10 
Conflicts:
	src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/Parts/MediaLibrary.Navigation.cshtml
 2016-03-01 22:02:06 +01:00
Gustavo Tandeciarz
328c818ce5 Update RazorViewEngineProvider.cs 2016-03-01 15:10:35 -05:00
andy zheng
026acc4aa9 fixed one of URL prefix and Host should be required 2016-02-28 13:30:11 -05:00
Lombiq
f0dd64d5c9 Fixing typo in an Azure Media Services template 2016-02-26 22:20:00 +01:00
Sébastien Ros
ad6a2b96e5 Merge pull request #6428 from rtpHarry/fix-packaging-display-glitch 
Fixing display glitch in admin packaging/gallery/modules
 2016-02-25 13:06:44 -08:00
Lombiq
e32455ff28 Media Library: Fixing that recent items were not displayed for users with ManageOwnMedia permission. Fixes #6446 2016-02-24 00:36:57 +01:00