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 2 Packages Projects Releases Wiki Activity
9,391 Commits 94 Branches 33 Tags
c07bd4b2b2d9facc2d3ca009f135316a0ce9efa2
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Daniel Stolt 6c48766f54 Merge branch 'dev' 2015-07-14 19:51:02 +01:00
Daniel Stolt 012c15c18c Merged from 1.9.x. 2015-07-14 19:49:05 +01:00
Daniel Stolt b6d0fa3dd2 Implemented tenant reset action. 2015-07-14 17:43:40 +01:00
Daniel Stolt bfe2c296ec Added IRecipeResultAccessor for programmatically obtaining result of recipe execution. 2015-07-11 23:22:18 +01:00
Daniel Stolt 3036396ae6 Merge from dev. 2015-07-11 20:59:35 +01:00
Daniel Stolt 6fe3cf8538 Deleted unused element from layout editor. 2015-07-11 17:03:45 +01:00
Daniel Stolt db6c25aba2 Added keyboard shortcut reference to layout editor. 2015-07-11 16:58:49 +01:00
Daniel Stolt 27da7125b8 Improved log formatting. 2015-07-10 16:11:50 +01:00
Daniel Stolt 863761d30a Improved logging in recipe components. 2015-07-09 22:34:21 +01:00
Daniel Stolt ad4a702f7c Adding the Reports feature back. 2015-07-09 21:49:02 +01:00
Daniel Stolt 95eecd30b9 Added logging to replace removed recipe journals. 2015-07-09 16:54:13 +01:00
Daniel Stolt a431bb0cb0 Removed recipe journals. 2015-07-09 14:09:29 +01:00
Daniel Stolt 2c10b0df98 Added Log4net configuration for recipes logging. Added logging to replace the removed reports logging. 2015-07-09 12:31:37 +01:00
Daniel Stolt e054a833af Removed Orchard.Reports. 2015-07-09 11:43:04 +01:00
Daniel Stolt 723c177fe3 Fixed merge artifacts. 2015-06-22 21:12:43 +03:00
Daniel Stolt 45aeb7b467 Merged 1.9.x into dev. 2015-06-20 23:30:49 +03:00
Daniel Stolt 220c1b591a Restored reset of markup content styling in layout editor. 2015-06-20 20:38:42 +03:00
Daniel Stolt b06a4ecb73 #5403 Improved native clipboard support in layout editor. 2015-06-20 19:35:11 +03:00
Daniel Stolt 764db254da Made layout editor toolbox separately scrollable while in sticky mode. 2015-06-20 16:42:53 +03:00
Daniel Stolt 83429f4000 Restoring commit: Render fieldset as a fieldset in the editor canvas (by Bertrand Le Roy). 2015-06-11 16:11:30 +03:00
Daniel Stolt c8590fd934 Added missing NPM dependency in Orchard.Layouts. 2015-06-10 23:06:41 +03:00
Daniel Stolt e8de82b611 Added Gulp build to Orchard.DynamicForms. 2015-06-10 20:43:59 +03:00
Daniel Stolt c1eff70f4a Refactored client-side asset build automation to fix watch triggering. 2015-06-10 16:26:51 +03:00
Daniel Stolt 5d40be8390 Removing an MSBuild property that was not supposed to be committed. 2015-06-09 21:31:27 +03:00
Daniel Stolt 452b8cfeac Added sticky positioning to layout editor toolbox. 2015-06-09 19:38:44 +03:00
Daniel Stolt d86a5ec8c5 Replaced Web Essentials with Gulp for Orchard.Layouts. 
Starting with VS2015, Web Essentials will no longer perform tasks such as bundling, minification and LESS compilation. Developers are expected to use either Grunt or Gulp for front-end build automation. In order to enable working with the codebase in VS2015 going forward, this change is therefore necessary.
 2015-06-09 14:09:03 +03:00
Daniel Stolt d9208bcc14 #5295: Fixed clipboard operations in layout element property popups. 2015-06-09 02:08:58 +03:00
Daniel Stolt d3ccd743e9 Added a missing MVC dependency assembly. 
For people with MVC 4 installed on their local box, this DLL was in the GAC so this was not an issue. However, with only VS2015 installed and no pre-nuget version of MVC, this causes a YSOD.
 2015-06-09 00:24:19 +03:00
Daniel Stolt b2b6ea4bc2 Removed orphaned reference in Orchard.Layouts. 2015-06-08 23:49:39 +03:00
Daniel Stolt 9491a5750b Added support for era names to date formatting/parsing framework (fixes failing unit tests on Windows 10). 2015-05-07 16:44:41 +02:00
Daniel Stolt 635abd7456 Fixed unit tests not being discovered due to CopyLocal=false on core references. 
Having CopyLocal=false on references to Orchard.Core and Orchard.Framework in unit test projects prevented VS from discovering unit tests (at least when using the NUnit Test Adapter for Visual Studio). This change resets CopyLocal=true for these references in all unit test projects.
 2015-05-07 14:16:56 +02:00
Daniel Stolt 12a95c0335 Fixed missing assembly binding redirects for Azure Storage. 2015-05-02 22:48:23 +02:00
Daniel Stolt 920819544a Merge branch 'feature/outputcache' into 1.9-int 2015-04-10 23:04:47 +02:00
Daniel Stolt 8b1f00e31c Disabled ASP.NET OutputCacheModule in Web.config. 2015-04-10 22:35:47 +02:00
Daniel Stolt 8fbc1e41f3 Improved debug log message for ignored child actions. 2015-03-22 14:44:40 +01:00
Daniel Stolt c80c961513 #20879: Fixed handling of child actions in OutputCache and SecureSocketsLayer. 
Work Item: 20879
 2015-03-22 14:41:02 +01:00
Daniel Stolt fac9080326 Removed JetBrains attributes from code base and removed suppression of CS0436 compiler warning. 2015-03-21 15:38:35 +01:00
Daniel Stolt bdc64df4eb #21277: Fixed possible cache key collisions in output cache. 
The cache keys of action method parameters are now prefixed with "PARAM:" to avoid collisions with built-in keys such as "theme". Similar to the "HEADER:" prefixing done for headers.

Work Item: 21277
 2015-03-21 14:32:23 +01:00
Daniel Stolt ca6eee88db Made output cache lock management more robust. 2015-03-19 21:15:25 +01:00
Daniel Stolt adf8ba85da Changed output cache storage from string to byte[] to fix encoding issues with binary content. 2015-03-19 21:03:00 +01:00
Daniel Stolt fbf39acac6 Added preservation of original response encoding. 2015-03-19 12:53:02 +01:00
Daniel Stolt 017a101069 Deferred insertion of CaptureStream to improve memory performance. 2015-03-19 12:46:50 +01:00
Daniel Stolt c9cfb8639c #20881: Changed capture mechanism in Orchard.OutputCache to support any result type. 
Instead of using a custom writer for the Response.Output property, the OutputCacheFilter now uses a specialized Stream class for the Response.Filter property, which captures anything written to it. This seems to work with any type of result, including FileContentResult.

Work Item: 20881
 2015-03-18 23:10:36 +01:00
Daniel Stolt 0d2afe3206 Added a post-build binding to TypeScript gulp task for Task Runner Explorer. 2015-03-18 12:54:10 +01:00
Daniel Stolt 2d4c1c817d #21249: Removed build dependency on TypeScript. 
Instead added a gulpfile to enable compilation of TypeScript files when needed.

Work Item: 21249
 2015-03-18 12:34:29 +01:00
Daniel Stolt 0f7d385350 Made casing of Web.config file names consistent. 2015-03-04 02:33:18 +01:00
Daniel Stolt 78901ba095 Suppressed warning CS0436 in Orchard.Framework. 2015-03-04 02:26:54 +01:00
Daniel Stolt 8e81de333f Removed more source map files and disabled source map generation for TypeScript. 2015-03-04 02:22:19 +01:00
Daniel Stolt 1a8ebf2548 Fixed version conflict build warnings and cleaned up all Web.config files. 2015-03-04 02:06:09 +01:00
Daniel Stolt d32accb089 #21213: Improved layout popup keyboard handling. 
Work Item: 21213

Fixed space key issue when popup input field has focus. Also added ESC as a keyboard shortcut to close the popup. Also set focus to the first input when popup is opened.
 2015-02-24 12:47:57 +01:00
Daniel Stolt caa50ad440 Updated TypeScript to version 1.4. 
Download from here: https://visualstudiogallery.msdn.microsoft.com/2d42d8dc-e085-45eb-a30b-3f7d50d55304
 2015-02-23 15:23:15 +01:00
Daniel Stolt cc4fe86d83 Fixed JS language service errors in Orchard.Layouts. 2015-02-20 12:53:17 +01:00
Daniel Stolt 8911365242 Removed some residual JS source map references. 2015-02-20 12:46:18 +01:00
Daniel Stolt 4b11d08ccd Merged 'feature/layouteditor' into 1.x. 2015-02-19 22:14:55 +01:00
Daniel Stolt d5c3a0e59f Fixed an error while publishing via MSBuild (outside of VS). 
When running the Publish target using MSBuild (rather than VS) the error MSB3030 occurs because the manifest file Orchard.exe.manifest cannot be found. This fixes that error, making it possible to automate publishing outside VS, for example using PowerShell.
 2015-02-19 19:03:16 +01:00
Daniel Stolt 2515f943f6 Moved xmldiffpatch dependency to root lib folder. 2015-02-11 23:55:54 +01:00
Daniel Stolt da6aa02672 Updated osFamily to 4 in cloud service project to make it compatible with .NET Framework 4.5.1. 2015-02-11 23:38:52 +01:00
Daniel Stolt d8a80558e9 Removed faulty reference from solution file. 2015-02-11 23:37:12 +01:00
Daniel Stolt 0986784d72 Revert "Made private members protected in OutputCacheFilter." 
This reverts commit 0ba6b1d788.
 2015-02-11 15:58:14 +01:00
Daniel Stolt 0ba6b1d788 Made private members protected in OutputCacheFilter. 2015-02-10 12:37:09 +01:00
Daniel Stolt 7ea43cb89f Improved logging of unhandled API exceptions. 2015-02-10 12:35:10 +01:00
Daniel Stolt 3d5b26ebd0 Fixed another incorrect exception logging in Orchard.Redis. 2015-02-09 18:01:33 +01:00
Daniel Stolt a446ebdb3e Made xmldiffpatch reference private in Orchard.AuditTrail. 2015-02-07 15:58:23 +01:00
Daniel Stolt 8406a08bf6 Fixed a weird bug in Markdown that caused <h1> elements to be nested in <p> elements. 2015-02-04 16:27:17 +01:00
Daniel Stolt 99072faf14 Fixed LINQ exception in Orchard.MessageBus. 2015-02-04 15:49:13 +01:00
Daniel Stolt dd2fb47cdb Fixed exception logging in Orchard.MessageBus. 2015-02-04 15:48:27 +01:00
Daniel Stolt 73bc34a93e Disabled generation of source map files. 2015-01-30 01:26:35 +01:00
Daniel Stolt 53dbd4954d Removed all (existing and missing) JS source map files. 2015-01-30 01:24:24 +01:00
Daniel Stolt 4dab32dea2 Updated jQuery UI in Orchard.jQuery from 1.9.2 to 1.11.2. 2015-01-27 14:11:34 +01:00
Daniel Stolt b359dc9f29 Clarified feature names and descriptions in Orchard.Localization. 2014-12-31 13:27:52 +01:00
Daniel Stolt bcb720f659 Changed incorrect Arabic letters to correct Farsi counterparts. 2014-12-30 20:03:48 +01:00
Daniel Stolt 6340e504bc Various improvements to OutputCache module. 
- Added synchronization of multiple concurrent content regeneration on cache miss.
- Added support for grace time, configurable per route.
- Refactored and cleaned up code and comments througout the module.
- Made many members "protected virtual" on OutputCacheFilter for easier substitution.
- Made various usability improvements in admin UI.
- Added support for "vary by authentication state".
 2014-12-04 19:41:05 +08:00
Daniel Stolt 004caf387f Added missing projects to Orchard.Azure.sln. Retargeted Orchard.Azure.Web.csproj to .NET Framework 4.5.1. 2014-11-17 02:46:39 +01:00
Daniel Stolt 4a18247588 Moved IMachineNameProvider into Orchard.Framework. 2014-11-17 02:30:25 +01:00
Daniel Stolt 9855914af2 Removed IDependency from AzureBlobShellSettingsManager and AzureMachineNameProvider to prevent them from being registered as part of the default feature of the Orchard.Azure module. IShellSettingsManager and IMachineNameProvider implementations should always be registered using Host.config. 2014-11-17 00:01:44 +01:00
Daniel Stolt ffe6a733ea Various TinyMCE improvements: 
- Removed png image for toolbar buttons in mediapicker and medialibrary plugins and replaced with vector icon to harmonize with other toolbar buttons.
- Fixed styling of menu items and enabled menu bar and status bar.
- Improved toolbar button ordering.
- Enabled more features.
- Added styling of pre and code elements in editor.
- Cleaned up JavaScript formatting.
 2014-11-16 19:46:32 +01:00
Daniel Stolt 005ec51115 Prevented IIS site from being started for Orchard.Azure.MediaServices when running from VS. 2014-10-26 16:29:23 +01:00
Daniel Stolt 5965f02b02 Added support for custom encoding presets to Orchard.Azure.MediaServices. 2014-09-08 19:07:23 +02:00
Daniel Stolt 6bdf4a0348 Adding missing display of client IP address on inline audit trail, and removing conditional display of historically logged client IP addresses. Improving some UI language. 2014-08-20 01:53:11 +02:00
Daniel Stolt 4b0c05c73d Fixed bug i CalendarsPicker localization logic where the picker would always use the configured culture formats rather than the IDateTimeFormatProvider abstraction. 2014-08-20 01:20:48 +02:00
Daniel Stolt 4ebc946282 Merge branch '1.x' of https://git01.codeplex.com/orchard 2014-08-16 01:01:09 +02:00
Daniel Stolt 2f4ab2e272 Ädded remaining customized date/time formats for Persian calendar, and extracted them into a separate class. 2014-08-16 01:00:43 +02:00
Daniel Stolt 2e334baa37 Fixed a DST-related time zone conversion bug and added 3 unit tests to verify. 2014-08-08 02:43:10 +02:00
Daniel Stolt 6cc6ffc252 Merge branch '1.x' into feature/datelocalization 2014-08-07 04:46:01 +02:00
Daniel Stolt 56141a7549 Fixed another rounding bug with fraction formatting of millisecond, and added unit tests to cover this once and for all. 2014-08-07 04:44:47 +02:00
Daniel Stolt 58efe9c5b2 Fixed a bug with fraction formatting of millisecond component. 2014-08-07 03:46:45 +02:00
Daniel Stolt af587e4cab Added correct formatting and parsing of milliseconds using the fraction specifiers, and updated unit tests to cover it. 2014-08-07 02:46:47 +02:00
Daniel Stolt 060b17a0d0 Added unit tests for calendar conversion. 2014-08-07 01:31:09 +02:00
Daniel Stolt 9b9251016c Removed TODO item. 2014-08-06 01:23:32 +02:00
Daniel Stolt 9bcd8bec68 Added specific month name overrides for the combination of the fa-IR culture and the Persian calendar. 2014-08-06 01:22:03 +02:00
Daniel Stolt e2bc40305c Made time zone conversion more rubust. 2014-08-04 02:41:33 +02:00
Daniel Stolt ef5ccaadfe Added 15 unit tests to cover time zone conversion, and fixed a bug that the new tests revealed. 2014-08-04 01:57:37 +02:00