lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-04-05 20:33:11 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
8609b167e8
Orchard/lib
History
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
..
fluentpath Converting all files stored as CRLF in git to be stored as LF 2015-12-13 22:21:02 +01:00
historyjs Updating Credits.txt 2013-07-15 15:42:50 -07:00
html5shim Converting all files stored as CRLF in git to be stored as LF 2015-12-13 22:21:02 +01:00
jquery - Grabbing (and changing reference to) the latest in jQuery 2010-01-26 22:13:28 +00:00
jquery-utils Converting all files stored as CRLF in git to be stored as LF 2015-12-13 22:21:02 +01:00
jquery.ui Adding date and time pickers to page and blog post create/edit for scheduled publishing input. There's a fair bit of duplication in here between post and page possibly making more clear another candidate for consolidation. 2010-01-28 06:53:58 +00:00
msbuild Merge branch 'refs/heads/1.9.x' into dev 2015-12-13 23:46:19 +01:00
msdeploy Converting all files stored as CRLF in git to be stored as LF 2015-12-13 22:21:02 +01:00
mstranslittools Adding Transliteration Lib 2014-08-25 12:06:40 +01:00
nhibernate.linq Converting all files stored as CRLF in git to be stored as LF 2015-12-13 22:21:02 +01:00
nuget Converting all files stored as CRLF in git to be stored as LF 2015-12-13 22:21:02 +01:00
sqlce Converting all files stored as CRLF in git to be stored as LF 2015-12-13 22:21:02 +01:00
typescript Enable TypeScript files to be built with a simple "build typescript" and without taking a dependency on Node.js 2015-03-20 20:14:37 -07:00
wcat Converting all files stored as CRLF in git to be stored as LF 2015-12-13 22:21:02 +01:00
windowsazure Merge branch 'refs/heads/1.9.x' into dev 2015-12-13 23:46:19 +01:00