Commit Graph
100 Commits
Author SHA1 Message Date
Daniel Stolt 9f80897b91 Corrected expected form value for Layer.Publish action. Fixes #7696. 2017-05-19 17:54:34 +02:00
Daniel Stolt e298a57b9a Changed label "Save" to "OK" in layout element editor. Fixes #7697. 2017-05-19 17:47:47 +02:00
Daniel Stolt e7e40cdfbc Corrected expected form value for Blog.Publish action. Fixes #7698. 2017-05-19 17:45:25 +02:00
Daniel Stolt 1b2df0cdeb Corrected selector in media library picker JavaScript. Fixes #7695. 2017-05-19 17:39:23 +02:00
Daniel Stolt 4b55fc8e5e Fixed botched reformatting of navigation admin view. 2017-03-09 15:40:01 +01:00
Daniel Stolt 42ff97915f Fixed broken drag and drop reordering of menu items. 2017-03-09 12:59:42 +01:00
Daniel Stolt 34a2c128d9 Fixed inconsistent layout of item edit sidebars. 2017-03-09 12:44:02 +01:00
Daniel Stolt 514e4fa0d7 Implemented resource file hash-based cache busting. (#7564) 2017-03-07 21:49:06 +01:00
Daniel Stolt 332a2676dd Improved core content editing and publishing UI. Fixes #6388. 2017-03-04 09:36:06 +01:00
Daniel Stolt 162cfd2b67 Moved edit action to draft action group. Fixes #7478. 2017-03-04 08:44:52 +01:00
Daniel Stolt 08f151af60 Replaced the word "remove" with "delete" where appropriate. 2017-03-04 08:41:54 +01:00
Daniel Stolt 0ea2f30556 Replaced markup-embedded pipe | delimiters with CSS in admin theme. 2017-03-04 08:35:55 +01:00
Daniel Stolt 0920fabf98 Merge branch 'origin/1.10.x' into dev 2017-02-14 06:46:54 +02:00
Daniel Stolt 234d5214dd Added missing SnippetDescriptor property to Snippet element shape. 2017-02-14 06:44:36 +02:00
Daniel Stolt 5c64eba92b Added missing project dependency for Orchard.Glimps. 2017-02-09 14:42:23 +01:00
Daniel Stolt d3c82c2191 Merge branch '1.10.x' into dev
# Conflicts:
#	src/Orchard.Web/Core/Orchard.Core.csproj
#	src/Orchard.Web/Modules/Orchard.Localization/Controllers/AdminController.cs
#	src/Orchard.Web/Modules/Orchard.Localization/Views/Parts/Localization.ContentTranslations.SummaryAdmin.cshtml
#	src/Orchard.Web/Modules/Orchard.Redis/OutputCache/RedisOutputCacheStorageProvider.cs
2017-02-09 14:34:21 +01:00
Daniel Stolt 100604e317 Added two new features to Gulpfile.js (see below).
- Added support for separating minified resources by folder instead of by .min suffix.
- Added support for flattening the output directory structure of glob-based asset groups.
- Fixed bug where non-minified .js output files were not EOL normalized.
2017-01-15 02:04:50 +01:00
Daniel Stolt 987c608fa2 Changed .gitignore to exclude node_modules on all levels. 2017-01-14 14:17:57 +01:00
Daniel Stolt a927cc0e1c Added Gulp asset manifest change detection for non-bundled asset groups.
When running the 'build' task, a non-bundled asset group will now be rebuilt if the asset manifest file itself is newer than any of the output files.
2017-01-13 19:11:40 +01:00
Daniel Stolt 937a8f9783 Added ability to override TypeScript options from asset manifest. 2017-01-13 19:11:39 +01:00
Daniel Stolt cccebea685 Fixed redundant double negation in Gulpfile.js. 2017-01-13 19:11:38 +01:00
Daniel Stolt 7e5bdb28e3 Updated Gulp pipeline to use latest version of TypeScript.
This also required a change to flow all .js source files through the TypeScript transpiler and let TypeScript do the concatenation/bundling where applicable. This has the added bonus of catching more errors in plain .js files as the TypeScript compiler applies its structural and semantic understanding of the JavaScript code.
2017-01-13 19:11:37 +01:00
Daniel Stolt 49e74accd3 Updated Gulp package dependencies (except TypeScript). 2017-01-13 19:11:30 +01:00
Daniel Stolt 0aee02bdd3 Fixed path to .vs folder in .gitignore. 2017-01-13 19:11:24 +01:00
Daniel Stolt 1f2923d060 [Fixes #7467] Changed gulpfile to invoke autoprefixer directly instead of through cssnano. (#7470)
Fixes #7467
2016-12-08 12:26:27 -08:00
Daniel Stolt 76944a0956 Merge remote-tracking branch 'origin/1.10.x' into dev 2016-12-06 16:00:41 +01:00
Daniel Stolt e2b6002a6f Fixed wording of "vary by cookies" option in admin UI. 2016-10-25 00:28:17 +02:00
Daniel Stolt 1166163623 Merge remote-tracking branch 'origin/dev' into dev 2016-07-03 13:08:32 +02:00
Daniel Stolt 8ff3ec0ee2 Fixed bug with missing source maps in SASS transpilation. 2016-07-03 12:59:52 +02:00
Daniel Stolt e04b12d177 Removed incorrect comments in Gulpfile.js. 2016-07-03 12:52:48 +02:00
Daniel Stolt 6a8a763f0d Merge branch '1.10.x' into dev. 2016-06-05 20:51:03 +02:00
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 14e7bb69ec Merge branch '1.10.x' into dev. 2016-05-17 16:52:55 +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 9591fdfd1f Fixed duplicate export of LayoutData. 2016-04-18 11:24:32 +02:00
Daniel Stolt ef6c7b4d3f Merge remote-tracking branch 'origin/1.10.x' into dev
# Conflicts:
#	Orchard.proj
2016-04-14 19:06:06 +02:00
Daniel Stolt 9d8272fdd5 Improved formatting of layout JSON data in exported recipe files using CDATA. Fixes #5822. 2016-03-30 19:52:33 +02:00
Daniel Stolt bbca767be2 Merge remote-tracking branch 'origin/1.10.x' into dev
# Conflicts:
#	src/Orchard.Web/Modules/Orchard.Fields/Views/EditorTemplates/Fields/Link.Edit.cshtml
#	src/Orchard.Web/Modules/Orchard.Fields/Views/EditorTemplates/Fields/Numeric.Edit.cshtml
2016-03-30 18:17:06 +02:00
Daniel Stolt c6c667d180 Removed Azure cloud service support.
Removed cloud service things from build and deployment scripts.
Removed Orchard.Azure.sln.
Removed Orchard.Azure.CloudService and Orchard.Azure.Web projects.
Removed Azure Diagnostics support.
Removed cloud service machine name provider.
Removed Azure Cache support.
Updated Orchard.Azure.Tests and moved into main solution.
Removed Orchard.Azure.Tests.sln.
2016-03-25 17:20:51 +01:00
Daniel Stolt ea7404a6ef Merge branch '1.10' 2016-02-22 13:59:36 +01: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 a2344de0a1 Merge branch '1.10' 2016-02-20 02:27:07 +01:00
Daniel Stolt da766ad7e2 Disabled unsafe css-nano transforms and rebuilt resources. 2016-02-20 01:14:14 +01:00
Daniel Stolt 6664e75570 Refactored and fixed issues with calendar picker. Fixes #6416 #6338 #6080. 2016-02-20 01:14:14 +01:00
Daniel Stolt 28425b0a53 Retargeted NuGet references to targetFramework="net452". Fixes #6406. 2016-02-20 01:13:13 +01:00
Daniel Stolt 7e35b7c80b Retargeted remaining projects to .NET Framework 4.5.2. 2016-02-20 01:13:13 +01:00
Daniel Stolt 8897947ba7 Corrected NuGet reference hint paths from Azure to normal solution folder. Fixes #6403. 2016-02-20 01:13:13 +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 873e0c8d67 Merge branch '1.10' 2016-02-14 19:41:50 +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 e4a012a4fb Removed TypeScript build tasks from Orchard.proj.
Reasons:
- The world is standardizing more and more on using Node.js with Gulp/Grunt for this kind of thing.
- It's becoming more and more adopted also in the Orchard community, along with increased use in core modules.
- This MSBuild target was added to ensure command-line build support, but Node.js with Gulp/Grunt is arguably even more command-line friendly.
- All the compiled JavaScript output is already added to source control anyway, so it's not needed to do TypeScript compilation to build or package Orchard.
- The MSBuild target only applies to TypeScript, and not to LESS, so it's not a complete solution anyway.
- Build servers now have full support for executing Gulp/Grunt tasks. VSTS Build has it, TeamCity has it, etc. No need to do this on the MSBuild level.
2016-02-14 19:04:27 +01:00
Daniel Stolt b84a248654 Refreshed and improved the Gulp pipeline (details below).
- Updated to newest version of all modules, and tested/verified.
- No longer generate source maps if asset group is neither concatenating nor transforming (LESS or TypeScript).
- Replaced "autoprefixer" and "css-minify" with the newer "css-nano".
- Added "gulp-eol" for normalization of line endings in all outputs.
- Added separate streams for minified and non-minified CSS outputs to work around bugs in source mapping that prevented asset paths containing "../" from being used.
- Added "es6-promise" polyfill for compat with older versions of Node.js.
- Increased global _maxListeners to suppress memory leak warning from gulp.watch().
2016-02-13 15:41:03 +01:00
Daniel Stolt 56dad4da2a Merge branch '1.10' into 'dev'. 2016-02-13 13:23:33 +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