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
9,505 Commits 73 Branches 31 Tags 239 MiB
3b7a54f10d
Commit Graph

9505 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
andy zheng
026acc4aa9 fixed one of URL prefix and Host should be required 2016-02-28 13:30:11 -05: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
Sébastien Ros
72c9f0063b Merge pull request #6433 from rtpHarry/fix-5708 
[Fixes #5708] Display mandatory checkbox as required
 2016-02-19 15:50:52 -08:00
Matthew Harris
a8d4b18f72 fixes #5708 - change ui layer to display Mandatory checkbox as required 2016-02-19 22:44:52 +00:00
Matthew Harris
1907e57902 fixes #5706 - standardize order on Properties, Validation, Bindings 2016-02-19 02:27:23 +00:00
Matthew Harris
a806ac7487 fix display glitch in admin packaging/gallery/modules 2016-02-19 01:56:33 +00:00
Sébastien Ros
47072f91ae Merge pull request #6425 from rtpHarry/widget-ruleengine-typo 
Fix typo in Orchard.Widgets.RuleEngine.cs
 2016-02-18 17:50:45 -08:00
Matthew Harris
bbe4110053 fix typo in typo fix 2016-02-19 01:43:55 +00:00
Matthew Harris
5dfda7c0a8 convert modules admin page to use css flexbox 2016-02-19 01:36:28 +00:00
Matthew Harris
89a5953ea3 fix wrong permission check and incorrect use of taxonomies phrase 2016-02-19 00:45:54 +00:00
Matthew Harris
c61666bfdc fix typo in Orchard.Widgets.RuleEngine.cs 2016-02-19 00:32:40 +00:00
Sébastien Ros
2749f2fa21 Merge pull request #6424 from rtpHarry/fix-taxonomy-permission 
fixes #6423 - wrong permission checked for delete
 2016-02-18 16:30:53 -08:00
Matthew Harris
fe5c8ba233 fixes #6423 - wrong permission checked for delete 2016-02-19 00:27:53 +00:00
Sébastien Ros
290f8e4594 Merge pull request #6420 from rtpHarry/fix-6400 
fixes #6400 - improve notifier messages for terms admin
 2016-02-18 16:05:49 -08:00
Matthew Harris
5811598dff fixes 6400 - improve notifier messages for terms admin 2016-02-18 22:01:52 +00:00
Matthew Harris
2a01771a37 fixes #6272 update wording for comparisons 2016-02-18 21:44:57 +00:00
Sébastien Ros
a1531da11b Merge pull request #6301 from Codinlab/fixes/5593 
Fixes #5593 : Allow disabling HtmlEncode on DynamicForms
 2016-02-18 12:55:31 -08:00
Lombiq
49022cd1b5 To the previous: also caring about the case when ShapePart was dynamically added to the content type/item, see #6360 2016-02-18 16:32:16 +01:00
Lombiq
4cc48a380d You can't create two Template content items with the same name (title) any more, fixes #6360 2016-02-17 21:05:14 +01:00
Piotr Szmyd
52668d1beb [Fixes #6322] Supporting multiple scopes/contexts in .po file entries. 2016-01-31 18:22:33 +01:00
Thierry Fleury
f3971484b8 Fixes #5593 : Dynamic Forms: In form settings HtmlEncode option is always checked 2016-01-23 10:32:22 +01:00
Sébastien Ros
899379e94a Merge pull request #6290 from armanforghani/patch-1 
Updated feed URL for Orchard gallery.
 2016-01-21 14:28:21 -08:00
armanforghani
9da248871f Updated feed URL for Orchard gallery. 
Fixes #6289
 2016-01-22 01:35:43 +03:30
Sébastien Ros
128376b662 Merge pull request #6296 from hannan-azam/1.9.x 
[Fixes #5689] Remove Alias when Item is Destroyed
 2016-01-21 12:03:37 -08:00
Hannan Azam
ceed1a04d6 [Fixes #5689] Remove Alias when Item is Destroyed 2016-01-21 20:31:13 +05:00
Piotr Szmyd
7057740787 Fixing issue with fetching a theme and rendering shapes from a background thread. 2016-01-16 00:13:24 +01:00
Sebastien Ros
eb7574df0b [Fixes #6248] Prevent users from renaming their root folder 2016-01-15 08:55:32 -08:00
Sebastien Ros
f17f2c3a93 [Fixes #6279] Adding confirmation for deleting taxonomies 2016-01-14 17:52:07 -08:00
Sébastien Ros
40db1e2a84 Merge pull request #6236 from jtkech/patch-3 
[Fixes #6192] Using Lazy IWorkContextStateProvider
 2016-01-14 12:15:24 -08:00
Sébastien Ros
eb6f2f2752 Merge pull request #6249 from OrchardCMS/issue/infoset-nullable-enums 
Added handling of nullable enums.
 2016-01-14 12:14:16 -08:00
Sebastien Ros
e907334b6c Fixing object dumper unit tests 2016-01-13 15:31:03 -08:00
Sebastien Ros
a55ba9f06b [Fixes #5951] Fixing NRE when exporting media items 2016-01-13 13:06:39 -08:00
Sebastien Ros
112f13bf39 [Fixes #5969] Listing unlistable types in Contents/List 2016-01-13 13:03:46 -08:00
Daniel Stolt
011d80cdb8 Merge pull request #6270 from armanforghani/patch-1 
Made strings localizable in LayoutEditor.cshtml.
 2016-01-11 18:10:05 +01:00
armanforghani
ee54d4237f Update LayoutEditor.cshtml. 
Wrapped strings in T delegate.
Fixes #6269
 2016-01-11 16:03:35 +03:30
Sébastien Ros
2d42c74395 Merge pull request #6207 from Codinlab/features/2027 
[Fixes #2027] Add role rule  in Orchard.Widgets module
 2016-01-07 12:35:31 -08:00
Sébastien Ros
7578daa510 Merge pull request #6131 from sebastienros/sebros/cachemonitor 
Improving monitors usage for output cache
 2016-01-07 12:14:52 -08:00