lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-26 20:16:15 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
11,010 Commits 84 Branches 32 Tags
c679547a39e5c913ae157a160d70cd9c7eacd8c7
Commit Graph

11010 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Lombiq
f3afc4110a Removing empty folders in several project files 2016-02-10 22:45:25 +01:00
Lombiq
5e17db3afd Removing unnecessary file copied to the Users module (see UserResolverSelector.cs) 2016-02-10 22:44:27 +01:00
Lombiq
e823738265 Removing residual files accidentally brought back during merge in Orchard.Indexing 2016-02-10 22:42:53 +01:00
Lombiq
d6035f6bb0 Removing residual file IdentifyDependenciesContext.cs from Orchard.ContentManagement.Handlers 2016-02-10 21:55:55 +01:00
jtkech
9e28fbe2a5 Update HttpContextBaseExtensions.cs 2016-02-10 05:10:40 +01:00