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,721 Commits 94 Branches 33 Tags
50c8a2631df19e258cb4cd6534eba7739faa11fc
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Stolt fbe5945ea6 Ignore DST in time zone conversion for time-only DateTime fields. Fixes #6731. 2016-06-05 20:45:10 +02:00
Daniel Stolt 03bac9222b Fixed Enter keyboard shortcut for layout elements that are not of type "Content". Fixes #5749. 2016-06-05 18:58:17 +02:00
Daniel Stolt 9e57d016df Fixed incorrect reference in Orchard.Resources.csproj. 2016-05-17 16:48:18 +02:00
Daniel Stolt e477328c39 Fixed admin 404 due to incorrectly named resource "jquery-colorbox.css". 2016-05-17 16:45:35 +02:00
Daniel Stolt b8e138b2d5 Corrected Persian month name. Fixes #6800. 2016-04-19 17:01:34 +02: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
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
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
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
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
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
Daniel Stolt afc637452a Fixed the Log4net config release transformation. 2016-01-31 12:22:47 +01:00
Daniel Stolt 80a9cc73b8 Untabified module manifests according to #6072. 2016-01-22 20:46:45 +01:00
Daniel Stolt abaef1d765 Reformatted one more Web.config file. 2016-01-22 20:41:30 +01:00
Daniel Stolt 16c687d8b1 Cleaned up and reformatted all Web.config files according to #6072. 2016-01-22 20:38:34 +01:00
Daniel Stolt dec68d454c Updated code base to target .NET Framework 4.5.2. Fixes #5700. 2016-01-14 01:06:32 +01:00
Daniel Stolt c59b761c3a Enabled Roslyn compilation (C# 6 syntax support) for Razor views. 
- Added Roslyn CodeDom Nuget packages to Orchard.Web and Orchard.Azure.Web.
- Added the necessary Web.config section to all modules/themes to make the VS editor recognize C# 6 syntax.
- Added a sample/proof use in BadgeOfHonor.cshtml.
 2016-01-14 00:48:22 +01:00
Daniel Stolt bfb01a31d5 Fixed compiler errors in Razor views in modules and themes. 
A handful of compiler errors would appear in most modules while having Razor views open in Visual Studio 2015. Adding a reference to System.Core in Web.config of modules fixes this.
 2016-01-14 00:09:15 +01:00
Daniel Stolt 6a565a5fd4 Brought Nuget packages also to Orchard.Azure.Web. 2016-01-13 22:14:39 +01: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
Daniel Stolt cee6539430 Fixed the things that someone always forgets. ;) 
- Fixed build warnings and cleaned up Web.config files of new modules.
- Added missing project dependencies to new modules.
- Added new modules to Azure solution.
 2015-11-24 19:35:27 +01:00
Daniel Stolt b6dc75d4f9 Merge branch '1.9.x' into dev 
# Conflicts:
#	src/Orchard.Web/Orchard.Web.csproj
 2015-11-24 19:20:05 +01:00
Daniel Stolt eb81c20f04 Set UseGlobalApplicationHostFile=True in Orchard.Web.csproj. 
This prevents VS2015 from creating a local applicationHost.config file in the solution, which in our case is excluded from source control anyway and therefore isn't used as intended.
 2015-11-24 19:14:31 +01:00
Daniel Stolt 500255c3b1 Merge pull request #6028 from mvarblow/patch-3 
Update CacheItemRecord.cs

Fixed database output cache module when using SQL Server database. This resolves the following exception which results from NHibernate trying to truncate the Output field to 8K: NHibernate.AssertionFailure: null id in Orchard.OutputCache.Models.CacheItemRecord entry (don't flush the Session after an exception occurs)
 2015-11-11 18:36:18 +01:00
Daniel Stolt d0f8fcdcf7 Changed FormsAuthenticationService to remember that authenticated user is non-item throughout the request. 
Fixes #5997
 2015-11-10 09:19:38 +01:00
Daniel Stolt 40156e5be1 Merge pull request #5872 from OrchardCMS/issue/5848/importexport 
Refactored Import process.
 2015-10-12 21:39:21 +02:00
Daniel Stolt f8409d5ce5 Updated the Gulp pipeline. 
NOTE: You need to run "npm update" from the solution folder to download the updated version of the dependencies for the updated Gulpfile to work properly.
 2015-10-09 22:41:21 +02:00
Daniel Stolt 9219609ce6 Updated jQuery type definitions in Orchard.Azure.MediaServices. 2015-10-04 19:34:47 +02:00
Daniel Stolt f95c5b5430 Cleaned up after merge of Azure upgrade from 1.9.x. 2015-10-04 18:05:46 +02:00
Daniel Stolt df216b6a18 Merge from Orchard/dev. 2015-10-04 01:57:19 +02:00
Daniel Stolt 42914c7896 Fixed a column resizing issue. 2015-10-03 19:32:50 +02:00
Daniel Stolt bd96bf9895 Enabled focusing (and thereby pasting into) non-sealed templated containers. 2015-10-03 19:26:13 +02:00
Daniel Stolt b5d4cf01b5 Moved CopySqlCeBinaries earlier in the build process of Orchard.Web.csproj. 
This fixes an issue where, if Orchard.Web has not previously been built, the SQL CE binaries will not be included when doing a Web Deploy publish of Orchard.Web.
 2015-09-30 20:59:32 +02:00
Daniel Stolt 7d4ed4416d Updated to latest version of MSBuild community tasks. 
This makes it possible to execute Orchard.proj to build and package on a build server that doesn't have .NET Framework 3.5 installed.
 2015-09-30 19:29:12 +02:00
Daniel Stolt e0fe699049 Corrected build action of Placement.info in Orchard.Dashboards. 2015-09-30 19:12:01 +02:00
Daniel Stolt 7278c0286f Fixed a potential exception in Gulpfile when asset group output doesn't exist. 2015-09-19 22:20:29 +02:00
Daniel Stolt 52e7fd12b1 Fixed incorrect export condition in LinkFieldDriver. 2015-09-18 02:50:11 +02:00
Daniel Stolt 1edf94756c Changed field drivers to not export empty elements. 
This results in much cleaner recipes.
 2015-09-18 02:42:40 +02:00
Daniel Stolt b011594be6 Improved asset manifest file change handling in Gulpfile.js. 
Code now only restarts watchers for the asset groups in the changed asset manifest file, rather than *all* asset groups. The "build" task now forces rebuild of a given asset group if its asset manifest file is newer than its concatenated output. Refactored and cleaned up the code.
 2015-09-16 16:56:51 +02:00
Daniel Stolt 49c772bf25 Removed redundant thread synchronization code from modules which now use distributed locks. 2015-09-06 21:41:30 +02:00
Daniel Stolt 86b9f35454 Refactored distributed locks. 2015-09-06 21:40:45 +02:00
Daniel Stolt 1da2d7e3e9 Added process ID to machine name. 2015-09-06 17:34:14 +02:00
Daniel Stolt 27f146d6a4 Fixed compiler warning. 2015-09-06 15:51:55 +02:00
Daniel Stolt 324709400f Cleaned up naming, formatting and comments in distributed locks. 2015-09-06 15:51:26 +02:00
Daniel Stolt 14482162fd Marked some tests as long-running. Fixes #5702. 2015-09-06 00:31:15 +02:00
Daniel Stolt a8db54d994 Added missing PDF file. 2015-08-25 16:24:29 +02:00
Daniel Stolt d6f3bfd419 Updated to Newtonsoft.Json 7.0 and Azure SDK 2.7. 2015-08-25 16:17:32 +02:00
Daniel Stolt ff6cb5688d Removed incorrect unique constraints and added missing ones. 2015-08-21 23:43:33 +01:00
Daniel Stolt 2a9d931e39 Shortened unique constraint names for compatibility with MySQL. 
MySQL has a maximum identifier length of 64 chars for constraints and indexes.
 2015-08-20 12:38:58 +01:00
Daniel Stolt aa7f9dd1cd Added unique constraints to core settings tables. 2015-08-20 12:38:57 +01:00
Daniel Stolt aae53c3909 Added unique constraints to data migration records. 2015-08-20 12:38:57 +01:00
Daniel Stolt 90b3c1e7f6 Added unique constraints to ContentItemVersionRecord table. 2015-08-20 12:38:56 +01:00
Daniel Stolt 1c7ed9cb94 Added support for unique constraints to SchemaBuilder. 2015-08-20 12:38:55 +01:00
Daniel Stolt 6b4a497e2d Merge pull request #5659 from planetClaire/5658 
Show Default layer by default in Widgets admin
 2015-08-19 14:03:38 +01:00
Daniel Stolt 1b55f42754 Merge branch '1.9.x' into dev 2015-08-17 00:26:33 +01:00
Daniel Stolt f19b57c1e6 Fixed one remaining unit datetime localization unit test on Windows 10. 2015-08-17 00:25:34 +01:00
Daniel Stolt 9429ad6e63 Merge branch '1.9.x' into dev 2015-08-17 00:03:59 +01:00
Daniel Stolt 7533cd8879 Improved DateTime localization and unit tests on Windows 10. 
Added support for era names to date formatting/parsing framework. Added handling of cultures with missing AM/PM designators. Fixes failing unit tests on Windows 10. Fixes #5595.
 2015-08-17 00:01:32 +01:00
Daniel Stolt 75609bf2ce Excluded private locator URLs from JSON serialization in Azure Media Services. Fixes #4686. 2015-08-16 20:13:33 +01:00
Daniel Stolt 6228f4e8fb Merge branch '1.9.x' into dev 2015-08-16 18:02:29 +01:00
Daniel Stolt 4b44827f2a Added skeleton Assets.json to codegen theme template. 2015-08-16 17:50:47 +01:00
Daniel Stolt a04195ee0e Added a simple skeleton Assets.json to codegen module template. Fixes #5606. 2015-08-16 17:38:16 +01:00
Daniel Stolt 3183df5b4a Recreated folder to resolve git case inconsistency. 2015-08-16 16:27:09 +01:00
Daniel Stolt dfa1ada978 Deleted folder to resolve git case inconsistency. 2015-08-16 16:25:58 +01:00
Daniel Stolt a6a6cb2d90 Merge branch '1.9.x' into dev 2015-08-16 16:19:59 +01:00
Daniel Stolt b2c131f516 Refactored watch task in Gulpfile.js. 2015-08-16 16:15:46 +01:00
Daniel Stolt 359d25c1f2 Merge branch 'patch-5' of https://github.com/dcinzona/Orchard into 1.9.x 2015-08-16 14:43:36 +01:00
Daniel Stolt c508584e63 Merge branch '1.9.x' into dev 2015-08-14 11:57:38 +01:00
Daniel Stolt f2bf75328e Merge pull request #5642 from paynecrl97/5520/tenantAwareConfig 
#5520 AppConfigurationAccessor is now tenant aware.

Fixes #5520.
 2015-08-14 11:43:09 +01:00
Daniel Stolt df25fbad8f Reverted my own stupidity. 
(i.e. injecting the actual dependency instead of a WorkContextAccessor to resolve it.)
 2015-08-03 16:44:58 +01:00
Daniel Stolt 43922eaf20 Extended recipe execution logging. 2015-08-03 15:01:33 +01:00
Daniel Stolt eec888ff71 Made order of field and part elements in export XML predictable. 2015-07-30 20:32:37 +01:00
Daniel Stolt faa216147d Merge pull request #5575 from Codinlab/issue/5519 
Fixes #5519 : DynamicForms client validation issue
 2015-07-29 16:59:40 +01:00
Daniel Stolt dedded7422 Changed distributed shell restart to only apply to the correct tenant. 2015-07-28 16:35:51 +01:00
Daniel Stolt f708362313 Made execution ID an ambient context property in recipe logging. 2015-07-28 13:33:07 +01:00
Daniel Stolt 0dd8686a6f Added "recipes result" command to print result of a recipe execution. 
This helps in automation scenarios where you need to programmatically find out whether setup succeeded or not. Also clarified "setup" command output and added execution ID to the message and cleaned up code in RecipeCommands.
 2015-07-27 21:03:04 +01:00
Daniel Stolt f023f66d63 Merged branch '1.9.x' into dev. 2015-07-26 01:28:38 +01:00
Daniel Stolt 6da6c5c214 #5450: Implemented generalized Gulp automation. 
Fixes #5446.
 2015-07-26 01:14:14 +01:00
Daniel Stolt 34be0b302f #5564: Fixed potential NRE when tenant RequestUrlHost is empty. 
Fixes #5564.
 2015-07-24 16:40:47 +01:00
Daniel Stolt 33da5617b7 Added a /Force option to the tenant reset command. 2015-07-23 11:41:55 +01:00
Daniel Stolt 7411013b45 Fixed a localization unit test that was failing on some cultures. 2015-07-21 22:11:54 +01:00
Daniel Stolt 83cae5f0a0 #5536: Removed dependency on IContentManager from FormsAuthenticationService. 
FormsAuthenticationService now uses IMembershipService instead. Also introduced a NullMembershipService implementation in Orchard.Framework, used only for dependency resolution during setup. Fixes #5536.
 2015-07-18 22:05:39 +01:00
Daniel Stolt a9eb00c8fa #4253: Made Azure Blob Storage container names configurable. 
Fixes #4253
 2015-07-17 13:23:21 +01:00
Daniel Stolt 3d3d6205b6 #5516: Changed DefaultDateLocalizationServices.ConvertFromLocalizedDateString() to return DateTimeKind.Utc and added unit test to verify. 
Fixes #5516
 2015-07-16 22:00:20 +01:00
Daniel Stolt 1471ab8cd5 Fixed handling of multiple URL hosts in multi tenancy UI. 2015-07-16 12:29:29 +01:00
Daniel Stolt fe5b591b21 Fixed potential NRE in TenantCommand. 2015-07-16 12:16:42 +01:00
Daniel Stolt c07bd4b2b2 Merge branch 'dev' of https://github.com/OrchardCMS/Orchard.git 2015-07-15 22:33:40 +01:00
Daniel Stolt 551ffb1252 Fixed failing unit tests. 2015-07-15 22:33:24 +01:00
Daniel Stolt 60c546dd7c Fixed XML docs for ITenantService. 2015-07-15 21:57:56 +01:00
Daniel Stolt bcd3eb1e2e Cleaned up tenant management commands code. Added validation of the DataProvider parameter. 2015-07-15 13:09:33 +01:00
Daniel Stolt ed0fc158e0 Added full command line support for tenant management operations. 2015-07-15 12:18:11 +01:00
Daniel Stolt 4581642425 Checking in CSS files that somebody forgot to include. 2015-07-15 12:17:49 +01:00
Daniel Stolt 9e49568d38 "Improved" log formatting even more. 2015-07-15 11:19:12 +01:00
Daniel Stolt dbe7697803 Cleaned up migration file in Orchard.Recipes. 2015-07-14 21:00:55 +01:00