lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-14 19:04:51 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
10,391 Commits 83 Branches 32 Tags
2d4c87d1d77c9d25fc55bb0fdc34a2bd99b30932
Commit Graph

10391 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sipke Schoorstra
8ee37a6de0 Merge pull request #6218 from paynecrl97/patch-3 
Use Display Name to show validation messages
 2015-12-22 22:24:24 +01:00
Lombiq
37b97eaa26 Move Mono DLL from the Orchard.Scripting.CSharp module to the root lib folder 2015-12-22 21:57:25 +01:00
Sipke Schoorstra
4418bcdc19 Fixed a bug in LayoutModelMapper. 
If the root Canvas is manually instantiated, it will not have a valid ElementDescriptor.
 2015-12-22 20:21:28 +01:00
Chris Payne
28e2e8f695 Use Display Name to show validation messages 2015-12-22 16:44:24 +00:00
Rob King
9ee7715386 Moved WindowsAzure.Diagnostics to Orchard NuGet Feed 2015-12-22 11:39:28 +00:00
Rob King
75161221ee Moved WindowsAzure.ServiceRuntime to Orchard NuGet Feed 2015-12-22 11:37:14 +00:00
Rob King
123c53243a Removed FluentPath from lib folder 2015-12-22 10:09:34 +00:00
Rob King
89f0213a78 Merge branch 'dev' of https://github.com/OrchardCMS/Orchard into replace-lib-with-nuget 
Conflicts:
	src/Orchard.Web/Core/Orchard.Core.csproj
	src/Orchard.Web/Modules/Orchard.Fields/Orchard.Fields.csproj
 2015-12-22 09:48:44 +00:00
Sipke Schoorstra
a492f89ea0 Further Layouts client-side scripting improvements. 
- Pushed the editElement function further down from Content to Element, which means even less code for custom container elements.
- Fixed a bug where client-side element editor state would not be applied after editing that element.
- Pushed down the toObject function from Content to Element, which means less code is necessary for custom container elements.
-
 2015-12-21 20:59:47 +01:00
Sipke Schoorstra
d1c0f98010 Updated Layouts to simplify custom container elements. 
These changes simplifies the requirements for implementing custom container elements by minimizing the amount of code necessary to tie things together.
 2015-12-21 19:48:59 +01:00
Thierry Fleury
c45da04455 Close #2027 : Add role rule in Orchard.Widgets module 2015-12-20 19:54:21 +01:00
Sipke Schoorstra
8eef43f20d Fixed media library picker field script. 
This fixes an issue where the code selecting the 'Save' button would match any button with the 'button.save' class.
The issue became apparent when working with Image element on a layout. The Element Editor Dialog also has a 'Save' button with the 'button save' class, en became hidden when no image was selected.
 2015-12-20 16:37:57 +01:00
Sipke Schoorstra
68c94f4534 Fixed a potential issue with new Container elements. 
Making the ContentModelMap the default mapper for all elements fixes a potential issue when a new Container element is introduced but no model map implementation exists for that container. Letting the ContentModelMap handle the mapping by default would yield best results rather than doing no mapping at all.
 2015-12-20 16:33:34 +01:00
Sipke Schoorstra
9715ee88df Removed unnecessary Html model map. 
The Html model mapping was originally needed to support inline editing of Html elements, but that capability has been removed.
 2015-12-20 16:28:36 +01:00
Lombiq
c216480ca0 Adding the ability to specify tokenized default values for content fields, fixes #5934 
And also fixing build error. *Shame!*
 2015-12-19 20:49:13 +01:00
Lombiq
2835a0db29 Creating helpers for settings based metadata scenarios to be used in migrations, fixes #4693 2015-12-19 20:01:32 +01:00
sfmskywalker
72aa82c048 Merge branch '1.9.x' into dev 
# Conflicts:
#	src/Orchard.Web/Modules/Orchard.Layouts/Scripts/LayoutDesignerHost.js
 2015-12-18 00:33:56 +01:00
Sébastien Ros
da8898e946 Merge pull request #6178 from Jwheuvel/1.9.x 
All /lib dll files are now correctly taken into account when using git
 2015-12-17 12:32:38 -08:00
Sébastien Ros
2853197117 Merge pull request #6183 from mvarblow/issue-1978 
[Fixes #1978] Extending MarshalByRef object lease
 2015-12-17 12:32:04 -08:00
Sébastien Ros
9bba785d42 Merge pull request #5966 from jtkech/patch-2 
Experimental work on HttpContext, WorkContext and async code in background tasks
 2015-12-17 12:28:44 -08:00
Sébastien Ros
8a065d496d Merge pull request #6194 from jtkech/patch-6 
[Fixes #6193] TokenFilters Cohabitation
 2015-12-17 12:18:40 -08:00
Sébastien Ros
cc1ceec277 Merge pull request #6195 from jtkech/patch-7 
Reverting query hints on layers
 2015-12-17 12:16:10 -08:00
jtkech
981c1cb056 Update HttpContextAccessor.cs 2015-12-17 07:08:12 +01:00
jtkech
3e9259ab68 Update DefaultLayerEvaluationService.cs 2015-12-17 03:22:26 +01:00
jtkech
36c5f1070f Update Tokenizer.cs 2015-12-17 00:23:12 +01:00
Thierry Fleury
ea5ce6c865 Fixes 6189 : TextAreaElement throwing on null ProcessedValue 2015-12-16 18:33:43 +01:00
Rob King
6a2b56e714 Moved NuGet.Core to Orchard NuGet Feed 2015-12-16 16:45:28 +00:00
Piotr Szmyd
83900802b7 #6188: Using correct key when removing Redis cache entry. 2015-12-16 17:05:28 +01:00
PaulDevenney
52de937a21 Fixed bad assumption about HttpContext 
HttpContext is not available when running at console
 2015-12-16 14:46:30 +00:00
Rob King
78ffff1785 Moved FluentPath to Orchard NuGet Feed 2015-12-16 12:28:31 +00:00
Rob King
74adc571aa Moved MSTranslitTools to Orchard NuGet Feed. 2015-12-16 10:35:30 +00:00
Sipke Schoorstra
e72e6fcb1f Fixed layout editor javascript issue. 
As per the comments in https://github.com/OrchardCMS/Orchard/pull/6159, the issue was that the layout designer host has a dependency on the layout editor object, but the former would be created before the latter.
This changeset moves the initialization code together in order to control the order in which what object is created first.
 2015-12-15 22:35:29 +01:00
Matt Varblow
4362b00da1 Fixed indentation 2015-12-15 16:09:24 -05:00
Matt Varblow
67dd5abc31 Fixes #1978: Long-running Orchard commands crashed the command line due to expired leases on remote proxies for MarshalByRef parameters passed in cross-AppDomain calls. 2015-12-15 16:07:34 -05:00
Rob King
93417d41b5 Removed redundant MSBuild lib folder 2015-12-15 20:41:32 +00:00
Rob King
dc63b7ce74 Removed redundant lib folders (no NuGet replacements) 2015-12-15 20:11:48 +00:00
Sébastien Ros
765f8f74a5 Merge pull request #6180 from wharri220/patch-2 
Prevent terms creationg when taxonomy doesn't exist
 2015-12-15 10:46:36 -08:00
Sebastien Ros
117dd09f8c Improving monitors usage for output cache 2015-12-15 10:36:06 -08:00
Westley Harris
4fb1c18a72 Update TaxonomyField.cshtml 
Re-submit of #6160. Fixed a bug in the taxonomy field editor template that allows you to click on "create some terms" for a non-existent taxonomy. This situation occurs when you assign a taxonomy field to a content type but do not specify a taxonomy.
 2015-12-15 07:34:32 -05:00
Rob King
74d8cf8e9a Line endings resolution 2015-12-15 11:55:23 +00:00
Jwheuvel
b1b34e444a All /lib dll files are now correctly taken into account when using git 
Changed the .gitignore so all /lib dependencies are included correctly.
 2015-12-15 09:34:57 +01:00
jtkech
5f65c5101d Merge branch 'dev' into patch-2 
Conflicts:
	src/Orchard.Tests/Environment/DefaultWorkContextAccessorTests.cs
	src/Orchard.Tests/Environment/ShellBuilders/DefaultShellContextFactoryTests.cs
	src/Orchard.Tests/Tasks/SweepGeneratorTests.cs
	src/Orchard/Environment/WorkContextAccessor.cs
	src/Orchard/Mvc/MvcModule.cs
 2015-12-15 06:12:42 +01:00
jtkech
9a091b7c01 Merge pull request #4 from OrchardCMS/dev 
Sync dev
 2015-12-15 05:29:21 +01:00
neTp9c
f6be2834ff Merge remote-tracking branch 'refs/remotes/origin/1.9.x' into issue/6107 
# Conflicts:

#	src/Orchard.Web/Modules/Orchard.ContentPermissions/Drivers/ContentPermissionsPartDriver.cs
 2015-12-14 20:50:22 +03:00
neTp9c
ed1a3b0c6c Merge remote-tracking branch 'refs/remotes/OrchardCMS/1.9.x' into 1.9.x 2015-12-14 20:23:28 +03:00
Thierry Fleury
19faeecc9a Fixes #6113 : Anchor custom link on homepage produces bad href 2015-12-14 17:49:07 +01:00
Zoltán Lehóczky
5bc2ddcabf Merge remote-tracking branch 'o/dev' into use-nuget-instead-of-lib-folder 
Conflicts:
	lib/mysql/COPYING
	lib/mysql/README
 2015-12-14 17:14:36 +01:00
Zoltán Lehóczky
8609b167e8 Merge branch 'dev' into use-nuget-instead-of-lib-folder 
Conflicts:
	lib/aspnetmvc/System.Web.Helpers.xml
	lib/aspnetmvc/System.Web.Mvc.xml
	lib/aspnetmvc/System.Web.Razor.xml
	lib/aspnetmvc/System.Web.WebPages.Deployment.xml
	lib/aspnetmvc/System.Web.WebPages.Razor.xml
	lib/aspnetmvc/System.Web.WebPages.xml
	lib/aspnetwebapi/System.Net.Http.Formatting.xml
	lib/aspnetwebapi/System.Web.Http.WebHost.xml
	lib/aspnetwebapi/System.Web.Http.xml
	lib/autofac/Autofac.Configuration.xml
	lib/autofac/Autofac.XML
	lib/autofac/License.txt
	lib/dlr/LICENSE.APACHE.html
	lib/dlr/LICENSE.CPL.txt
	lib/dlr/LICENSE.Ruby.txt
	lib/dlr/README.txt
	lib/dotnetzip/Ionic.Zip.xml
	lib/dotnetzip/License.txt
	lib/htmlagilitypack/HtmlAgilityPack.XML
	lib/imageresizer/license.txt
	lib/log4net/log4net.xml
	lib/lucene.net/Lucene.Net.xml
	lib/moq/Moq.xml
	lib/newtonsoft.json/Newtonsoft.Json.xml
	lib/newtonsoft.json/license.txt
	lib/nhibernate/Iesi.Collections.xml
	lib/nunit/NUnitFitTests.html
	lib/nunit/NUnitTests.config
	lib/nunit/NUnitTests.nunit
	lib/nunit/agent.conf
	lib/nunit/agent.log.conf
	lib/nunit/clr.bat
	lib/nunit/launcher.log.conf
	lib/nunit/license.txt
	lib/nunit/nunit-agent.exe.config
	lib/nunit/nunit-console-x86.exe.config
	lib/nunit/nunit-console.exe.config
	lib/nunit/nunit-x86.exe.config
	lib/nunit/nunit.exe.config
	lib/nunit/pnunit-agent.exe.config
	lib/nunit/pnunit-launcher.exe.config
	lib/nunit/runFile.exe.config
	lib/nunit/runpnunit.bat
	lib/nunit/test.conf
	lib/specflow/LICENSE.txt
	lib/specflow/TechTalk.SpecFlow.targets
	lib/specflow/TechTalk.SpecFlow.tasks
	lib/specflow/changelog.txt
	lib/windowsazure/Microsoft.ApplicationServer.Caching.AzureCommon.xml
	lib/windowsazure/Microsoft.ApplicationServer.Caching.Client.xml
	lib/windowsazure/Microsoft.ApplicationServer.Caching.Core.xml
	src/Orchard.Core.Tests/Orchard.Core.Tests.csproj
	src/Orchard.Profile/Orchard.Profile.csproj
	src/Orchard.Specs/App.Config
	src/Orchard.Specs/Orchard.Specs.csproj
	src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj
	src/Orchard.Tests/Orchard.Framework.Tests.csproj
	src/Orchard.Web.Tests/Orchard.Web.Tests.csproj
	src/Orchard.Web/Core/Orchard.Core.csproj
	src/Orchard.Web/Modules/Lucene/Lucene.csproj
	src/Orchard.Web/Modules/Markdown/Markdown.csproj
	src/Orchard.Web/Modules/Orchard.Alias/Orchard.Alias.csproj
	src/Orchard.Web/Modules/Orchard.AntiSpam/Orchard.AntiSpam.csproj
	src/Orchard.Web/Modules/Orchard.ArchiveLater/Orchard.ArchiveLater.csproj
	src/Orchard.Web/Modules/Orchard.Autoroute/Orchard.Autoroute.csproj
	src/Orchard.Web/Modules/Orchard.Azure/Orchard.Azure.csproj
	src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj
	src/Orchard.Web/Modules/Orchard.CodeGeneration/Orchard.CodeGeneration.csproj
	src/Orchard.Web/Modules/Orchard.Comments/Orchard.Comments.csproj
	src/Orchard.Web/Modules/Orchard.ContentPermissions/Orchard.ContentPermissions.csproj
	src/Orchard.Web/Modules/Orchard.ContentPicker/Orchard.ContentPicker.csproj
	src/Orchard.Web/Modules/Orchard.ContentTypes/Orchard.ContentTypes.csproj
	src/Orchard.Web/Modules/Orchard.CustomForms/Orchard.CustomForms.csproj
	src/Orchard.Web/Modules/Orchard.DesignerTools/Orchard.DesignerTools.csproj
	src/Orchard.Web/Modules/Orchard.Email/Orchard.Email.csproj
	src/Orchard.Web/Modules/Orchard.Fields/Orchard.Fields.csproj
	src/Orchard.Web/Modules/Orchard.Forms/Orchard.Forms.csproj
	src/Orchard.Web/Modules/Orchard.ImageEditor/Orchard.ImageEditor.csproj
	src/Orchard.Web/Modules/Orchard.ImportExport/Orchard.ImportExport.csproj
	src/Orchard.Web/Modules/Orchard.Indexing/Orchard.Indexing.csproj
	src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj
	src/Orchard.Web/Modules/Orchard.Lists/Orchard.Lists.csproj
	src/Orchard.Web/Modules/Orchard.Localization/Orchard.Localization.csproj
	src/Orchard.Web/Modules/Orchard.Media/Orchard.Media.csproj
	src/Orchard.Web/Modules/Orchard.MediaPicker/Orchard.MediaPicker.csproj
	src/Orchard.Web/Modules/Orchard.MediaProcessing/Orchard.MediaProcessing.csproj
	src/Orchard.Web/Modules/Orchard.Migrations/Orchard.Migrations.csproj
	src/Orchard.Web/Modules/Orchard.Modules/Orchard.Modules.csproj
	src/Orchard.Web/Modules/Orchard.MultiTenancy/Orchard.MultiTenancy.csproj
	src/Orchard.Web/Modules/Orchard.OutputCache/Orchard.OutputCache.csproj
	src/Orchard.Web/Modules/Orchard.Packaging/Orchard.Packaging.csproj
	src/Orchard.Web/Modules/Orchard.Projections/Orchard.Projections.csproj
	src/Orchard.Web/Modules/Orchard.Projections/Tests/Orchard.Projections.Tests.csproj
	src/Orchard.Web/Modules/Orchard.Recipes/Orchard.Recipes.csproj
	src/Orchard.Web/Modules/Orchard.Roles/Orchard.Roles.csproj
	src/Orchard.Web/Modules/Orchard.Rules/Orchard.Rules.csproj
	src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Orchard.Scripting.CSharp.csproj
	src/Orchard.Web/Modules/Orchard.Scripting.Dlr/Orchard.Scripting.Dlr.csproj
	src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj
	src/Orchard.Web/Modules/Orchard.Setup/Orchard.Setup.csproj
	src/Orchard.Web/Modules/Orchard.Tags/Orchard.Tags.csproj
	src/Orchard.Web/Modules/Orchard.TaskLease/Orchard.TaskLease.csproj
	src/Orchard.Web/Modules/Orchard.Themes/Orchard.Themes.csproj
	src/Orchard.Web/Modules/Orchard.Tokens/Orchard.Tokens.csproj
	src/Orchard.Web/Modules/Orchard.Tokens/Tests/Orchard.Tokens.Tests.csproj
	src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj
	src/Orchard.Web/Modules/Orchard.Warmup/Orchard.Warmup.csproj
	src/Orchard.Web/Modules/Orchard.Widgets/Orchard.Widgets.csproj
	src/Orchard.Web/Modules/Orchard.jQuery/Orchard.jQuery.csproj
	src/Orchard.Web/Modules/SysCache/SysCache.csproj
	src/Orchard.Web/Modules/Upgrade/Upgrade.csproj
	src/Orchard.Web/Orchard.Web.csproj
	src/Orchard.sln
	src/Tools/Orchard.Tests/Orchard.Tests.csproj
 2015-12-14 16:51:32 +01:00
Lombiq
70ff08f4b7 Merge branch '1.9.x' into dev 2015-12-14 16:41:17 +01:00
Lombiq
6e3c8cbb9e Fixing line endings in further two extension-less text files 2015-12-14 01:42:32 +01:00