lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-26 03:40:56 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
10,976 Commits 84 Branches 32 Tags
f89dfbf715359b4cee2c75a57a4c23c16618dab2
Commit Graph

10976 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Sébastien Ros
72c9f0063b Merge pull request #6433 from rtpHarry/fix-5708 
[Fixes #5708] Display mandatory checkbox as required
 2016-02-19 15:50:52 -08:00
Matthew Harris
a8d4b18f72 fixes #5708 - change ui layer to display Mandatory checkbox as required 2016-02-19 22:44:52 +00: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
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
Matthew Harris
1907e57902 fixes #5706 - standardize order on Properties, Validation, Bindings 2016-02-19 02:27:23 +00:00
Matthew Harris
a806ac7487 fix display glitch in admin packaging/gallery/modules 2016-02-19 01:56:33 +00:00
Sébastien Ros
47072f91ae Merge pull request #6425 from rtpHarry/widget-ruleengine-typo 
Fix typo in Orchard.Widgets.RuleEngine.cs
 2016-02-18 17:50:45 -08:00
Matthew Harris
bbe4110053 fix typo in typo fix 2016-02-19 01:43:55 +00:00
Matthew Harris
5dfda7c0a8 convert modules admin page to use css flexbox 2016-02-19 01:36:28 +00:00
Matthew Harris
89a5953ea3 fix wrong permission check and incorrect use of taxonomies phrase 2016-02-19 00:45:54 +00:00
Matthew Harris
c61666bfdc fix typo in Orchard.Widgets.RuleEngine.cs 2016-02-19 00:32:40 +00:00
Sébastien Ros
2749f2fa21 Merge pull request #6424 from rtpHarry/fix-taxonomy-permission 
fixes #6423 - wrong permission checked for delete
 2016-02-18 16:30:53 -08:00
Matthew Harris
fe5c8ba233 fixes #6423 - wrong permission checked for delete 2016-02-19 00:27:53 +00:00
Sébastien Ros
290f8e4594 Merge pull request #6420 from rtpHarry/fix-6400 
fixes #6400 - improve notifier messages for terms admin
 2016-02-18 16:05:49 -08:00
Matthew Harris
5811598dff fixes 6400 - improve notifier messages for terms admin 2016-02-18 22:01:52 +00:00
Matthew Harris
2a01771a37 fixes #6272 update wording for comparisons 2016-02-18 21:44:57 +00: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
a1531da11b Merge pull request #6301 from Codinlab/fixes/5593 
Fixes #5593 : Allow disabling HtmlEncode on DynamicForms
 2016-02-18 12:55:31 -08:00
Sébastien Ros
16031ff348 Merge pull request #6335 from KexyBiscuit/patch-1 
Update "Deploy to Azure" button link
 2016-02-18 12:54:32 -08: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
Lombiq
836975f424 Removing unused code from Orchard.MediaLibrary/Views/Parts/MediaLibrary.Navigation.cshtml 2016-02-18 17:42:23 +01:00
Lombiq
49022cd1b5 To the previous: also caring about the case when ShapePart was dynamically added to the content type/item, see #6360 2016-02-18 16:32:16 +01:00
Lombiq
4cc48a380d You can't create two Template content items with the same name (title) any more, fixes #6360 2016-02-17 21:05:14 +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
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