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
10,745 Commits 94 Branches 33 Tags
be31746c4e5d843f99b1082c060050c52451eaa1
Commit Graph
10745 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Lombiq b983787d0d Media Library: Fixing NRE when renaming folder while having ManageMediaContent permission 2016-02-24 00:11:24 +01:00
Lombiq c09ffd85c4 Indexing: Fixing Migrations when upgrading from migration version 2 (1.9.2). Fixes #6382 2016-02-23 22:39:13 +01:00
Lombiq 6cd28be1a0 MediaLibrary: Fixing invalid HTML in OEmbed template 2016-02-23 22:28:41 +01:00
Gustavo Tandeciarz 4b8d11c1ed Fixes broken icons introduced into the media library by upgrading FontAwesome 2016-02-23 22:26:15 +01:00
Sébastien Ros e9e5cd7b6f Merge pull request #6453 from dcinzona/FontAwesome4 
[Fixes #6451] Broken media library font awesome icons
 2016-02-23 12:28:58 -08:00
Gustavo Tandeciarz 790a92f66b Fixes broken icons introduced into the media library by upgrading FontAwesome 2016-02-22 15:29:33 -05:00
Daniel Stolt cb06c7576c Merge pull request #6443 from dcinzona/Fixes-6411-Codegen-1.10 
[Fixes #6411]  Theme code generation produces an 'out-of-date' project
 2016-02-22 13:56:56 +01:00
Daniel Stolt c788dd61a2 Merge pull request #6437 from OrchardCMS/issue/snippets 
Improved snippets harvester.
 2016-02-22 13:56:17 +01:00
Gustavo Tandeciarz f8f02bb9ef Updated space formatting in line with #6072 2016-02-21 19:48:31 -05:00
Gustavo Tandeciarz 9666ba1292 [Fixes #6411] Theme code generation produces an 'out-of-date' project 2016-02-21 03:22:38 -05:00
Sipke Schoorstra 1e2d919b02 Improved snippets harvester. 
Fixes #6432
 2016-02-20 17:44:31 +01: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
Daniel Stolt 804161f511 Refactored and fixed issues with calendar picker. Fixes #6416 #6338 #6080. 2016-02-19 23:36:53 +01:00
Daniel Stolt 3f6fc4899e Retargeted NuGet references to targetFramework="net452". Fixes #6406. 2016-02-19 22:49:15 +01:00
Daniel Stolt 20c804163f Retargeted remaining projects to .NET Framework 4.5.2. 2016-02-19 21:05:13 +01:00
Daniel Stolt cc0593497e Corrected NuGet reference hint paths from Azure to normal solution folder. Fixes #6403. 2016-02-19 20:49:55 +01:00
Lombiq 2d9a5e04d7 Fixing that titles of Custom Forms forms were double-encoded 2016-02-19 18:18:20 +01: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
Sébastien Ros 16031ff348 Merge pull request #6335 from KexyBiscuit/patch-1 
Update "Deploy to Azure" button link
 2016-02-18 12:54:32 -08:00
Lombiq 836975f424 Removing unused code from Orchard.MediaLibrary/Views/Parts/MediaLibrary.Navigation.cshtml 2016-02-18 17:42:23 +01: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
Daniel Stolt 46571cc289 Fixed all build build warnings. 
"Found conflicts between different versions of the same dependent assembly that could not be resolved."
 2016-02-14 19:38:35 +01:00
Sebastien Ros ac6439644c Merge branch '1.9.3' into 1.10 
Conflicts:
	src/Orchard.Web/Modules/Orchard.MediaLibrary/Controllers/ClientStorageController.cs
	src/Orchard.Web/Modules/Orchard.MediaProcessing/Orchard.MediaProcessing.csproj
 2016-02-11 11:56:20 -08:00
Sebastien Ros fc0e06408a Adding permission check when updloading media from the admin 2016-02-11 11:32:51 -08:00
Sébastien Ros 1abc6fa1ae Merge pull request #6365 from neTp9c/issue/6363/LocalizationWithoutScope 
[Fixes #6363] Add empty scope for localization string without scope
 2016-02-11 11:13:49 -08:00
Sébastien Ros ff276ae961 Merge pull request #6377 from infofromca/Parts_MediaProcessing_ImageProfile 
[Fixes #6376] Adding missing ImageProfile template
 2016-02-11 11:12:32 -08:00
andy zheng d89a3330fb add the lack of file of Parts.MediaProcessing.ImageProfile.cshtml 2016-02-10 21:30:18 -05:00
Sébastien Ros 76097acf54 Merge pull request #6375 from infofromca/fixwidgets 
[Fixes #6374] Use jQueryUI resource
 2016-02-10 17:15:39 -08:00