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
10,561 Commits 94 Branches 33 Tags
e8af37de95775f5fc0be937a65b7d0542cd2400a
Commit Graph
10561 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Sébastien Ros e8af37de95 Merge pull request #6469 from dcinzona/activities-css 
[Fixes #6467] Adding missing user activity css stub
 2016-02-25 12:29:03 -08:00
gustavo.tandeciarz@nflplayers.com a1d2ba8f51 Adding missing user activity css stub 2016-02-24 13:42:59 -05:00
Sébastien Ros 614bf779f7 Merge pull request #6456 from ryanmagoon/dev 
[Fixes #6330] Using website url for core modules
 2016-02-23 14:47:29 -08:00
Sébastien Ros 1d0a8cfc78 Merge pull request #6441 from dcinzona/patch-2 
[Fixes #6440] Last Login and Created Date
 2016-02-23 12:41:34 -08:00
Ryan Magoon e887411f16 fix for #6330 
Changed extension manifests to use “orchardproject.net” as the Website
 2016-02-23 13:44:59 -05: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
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
Gustavo Tandeciarz 4ba75cc9db [Fixes #6440] Last Login and Created Date 
Fixes issue #6440.  Only display last login or created date for users when there is a value to display
 2016-02-20 15:06:56 -05:00
Sipke Schoorstra 1e2d919b02 Improved snippets harvester. 
Fixes #6432
 2016-02-20 17:44:31 +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
Sipke Schoorstra 6b57db5b89 Merge pull request #6431 from dcinzona/patch-1 
[Fixes #6430] Removes Imageset for Orchard.Alias UI
 2016-02-19 15:57:06 +01:00
Gustavo Tandeciarz a0b66bc3b5 [Fixes #6430] Removes Imageset for Orchard.Alias UI 
This removes the broken file reference generated by the Orchard.Alias UI feature.
 2016-02-19 08:16:29 -05:00
Sipke Schoorstra a1e5102fa9 Minor blueprints cleanup. 2016-02-19 13:56:02 +01:00
Sipke Schoorstra cc470d6e83 Merge pull request #6138 from neTp9c/issue/6137 
Import and Export of element blueprints don't invoke events for their base elements.
 2016-02-19 13:43:37 +01:00
Sipke Schoorstra b0ce589f94 Reverted 42e71fe9fa 
Unfortunately this is breaking the setup. For some reason, when executed in a regular HTTP context,  CallContext  "loses" its data at the end of the request, causing recipe execution to fail. Until we understand why this is and how to best deal with it, I am reverting this file so that it at least works.
 2016-02-19 12:54:45 +01:00
Sipke Schoorstra 5096ffc59d Merge pull request #6251 from OrchardCMS/feature/dynamicforms-defaultfieldvalues 
Feature/dynamicforms defaultfieldvalues
 2016-02-18 22:07:10 +01:00
Sipke Schoorstra d7b2d35270 Merge branch 'dev' into feature/dynamicforms-defaultfieldvalues 
# Conflicts:
#	lib/mono/Mono.CSharp.dll
#	src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Orchard.Scripting.CSharp.csproj
 2016-02-18 22:07:03 +01:00
Sébastien Ros 2f6f020d5d Merge pull request #6340 from jtkech/patch-6 
#6304: Prevents client cache from being disabled when public caching
 2016-02-18 12:51:43 -08:00
Sébastien Ros 90958c9a83 Merge pull request #6341 from jtkech/patch-7 
#6320: Provides a default baseUrl when not set or empty
 2016-02-18 12:48:22 -08:00
Sébastien Ros 42e71fe9fa Merge pull request #6342 from jtkech/patch-8 
#6321: Always use CallContext Logical Data in ContextState.cs
 2016-02-18 12:47:42 -08:00
Sébastien Ros c39a1ec8a5 Merge pull request #6346 from rtpHarry/patch-6 
[Fixes #6344] Remove unused place tag
 2016-02-18 12:45:30 -08:00
Sébastien Ros 6f9e46aef3 Merge pull request #6370 from jtkech/patch-10 
New IsBackgroundHttpContext() extension helper.
 2016-02-18 12:39:08 -08: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
jtkech 1858a1eaf5 Merge branch 'dev' into patch-8 
Conflicts:
	src/Orchard/Environment/State/ContextState.cs
 2016-02-14 04:07:19 +01:00
jtkech 3f11bf1903 Merge branch 'dev' into patch-7 
Conflicts:
	src/Orchard/Mvc/MvcModule.cs
 2016-02-14 03:50:22 +01:00
jtkech d151573cce Merge pull request #5 from OrchardCMS/dev 
Sync from Orchard dev
 2016-02-14 03:30:53 +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
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