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,524 Commits 94 Branches 33 Tags
1def97d9ce1e16f3cb1fd400a7c16a0f7fc8e383
Commit Graph
10524 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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
Lombiq f0dd64d5c9 Fixing typo in an Azure Media Services template 2016-02-26 22:20:00 +01: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
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
Lombiq 836975f424 Removing unused code from Orchard.MediaLibrary/Views/Parts/MediaLibrary.Navigation.cshtml 2016-02-18 17:42:23 +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
andy zheng 2a2e3d7920 fix jq widgets for 1.10 2016-02-10 19:56:27 -05:00
Lombiq d925fd31dc Adding orphaned files to their respective csprojs. Fixes #6366 2016-02-10 23:43:47 +01:00
Daniel Stolt 202234bf0b Refreshed all Gulp-compiled resource files. 2016-02-09 23:47:56 +01:00
Daniel Stolt 36f701625c Refactored the resource manifest for jQuery UI. 2016-02-09 23:47:22 +01:00
Sébastien Ros dfaaf61f88 Merge pull request #6349 from infofromca/fix6343 
[Fixes #6343 #6231] Handle null filters in ImageProfileManager
 2016-02-09 09:00:00 -08:00
Sébastien Ros 1e0777f47f Merge pull request #6364 from neTp9c/FixFiltersForGetImageProfileUrl 
[Fixes #6343 #6231] Handle null filters in ImageProfileManager
 2016-02-09 08:59:24 -08:00
neTp9c ca2605bb50 Add empty scope for localization string without scope 2016-02-09 14:57:20 +03:00
neTp9c 66f500e2d7 Treatment null value for params argument 2016-02-09 13:50:09 +03:00
Daniel Stolt 51ad9fc792 Merge pull request #6356 from infofromca/fix6354 
#6354: delete one duplicate definition of script for jQueryUI for orchard 1.10
 2016-02-07 23:26:48 +01:00
andy zheng 4401fb1e7f delete one duplicate definition of script for jQueryUI 2016-02-07 07:42:47 -05:00
Daniel Stolt a584b27c35 Changed to manual bootstrapping of LayoutEditor Angular app. Fixes #5722. 2016-02-06 23:54:40 +01:00
Daniel Stolt 1b02c5c03c Fixed errors in jQuery resource manifest. 2016-02-06 23:53:15 +01:00
andy zheng 8278901e22 fix #6343 2016-02-05 19:37:48 -05:00
Sebastien Ros c8ab7f187f Fixing jQuery UI resources 
#6329
 2016-02-04 13:43:07 -08:00
Sebastien Ros 0c6bcb52e9 [Fixes #6329] Fixing fonts file location in Orchard.Resources 2016-02-04 13:43:06 -08:00
Sebastien Ros 57fd0f6244 [Fixes #6328] Using FontAwesome from Orchard.Resources 2016-02-04 13:43:05 -08:00
Sebastien Ros 4cabab9c6d [Fixes #6327] Removing TaskLease dependency in JobsQueue 2016-02-04 13:43:04 -08:00