lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-04-05 07:33:34 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
11,778 Commits 73 Branches 31 Tags 239 MiB
dev
Commit Graph

38 Commits

Author SHA1 Message Date
Benedek Farkas
aa44765825 Merge branch '1.10.x' into 1.10.x-to-dev 2024-12-08 13:31:27 +01:00
Benedek Farkas
8425b4ad76
#8811: Update vulnerable NuGet packages and consolidate them (#8812) 
* Updating System.IdentityModel.Tokens.Jwt and its dependencies in Orchard.Azure.MediaServices

* Using System.IO.Compression instead of DotNetZip

* Upgrading Newtonsoft.Json from 12.0.3 (vulnerable) to 13.0.3

* Updating ModuleRootWebConfig.txt codegen template according to the new Newtonsoft.Json version
 2024-12-06 09:49:45 +01:00
Zoltán Lehóczky
b960866531 Merge branch '1.10.x' into dev 
# Conflicts:
#	src/Orchard.Web/Modules/Markdown/Markdown.csproj
#	src/Orchard.Web/Modules/Orchard.Projections/Handlers/FieldIndexPartHandler.cs
#	src/Orchard.Web/Modules/Orchard.Recipes/Views/Admin/Index.cshtml
#	src/Orchard.Web/Modules/Orchard.Taxonomies/Views/TermAdmin/Index.cshtml
#	src/Orchard.sln
 2020-04-07 23:03:58 +02:00
Sébastien Ros
bb8348626b
Using Markdig (#8299) 
Removes usage of regular expressions to convert markdown.
 2019-12-12 12:07:44 -08:00
chanond-w
afff2f986e Fix import export of identically named fields (#7912) 2017-12-21 12:25:41 -08:00
Sebastien Ros
b91d001010 Updating CREDITS 
#6257
 2016-01-14 16:06:59 -08:00
Lombiq
5406b17601 Converting all files stored as CRLF in git to be stored as LF 
LF is the git default and all new files are stored as such. Old files from the hg to git conversion however were moved over as CRLF.
 2015-12-13 22:21:02 +01:00
Sebastien Ros
d25eb61fe7 Merge branch '1.8.2-int' into 1.9-int 
Conflicts:
	src/Orchard.Profile/Tests/Profiling.feature.cs
	src/Orchard.Web/Modules/Orchard.jQuery/Scripts/jquery-ui-timepicker-addon.js
 2015-04-28 11:44:09 -07:00
Sebastien Ros
8b9c25a0a0 Updating version and license 2015-04-28 11:07:04 -07:00
Sebastien Ros
4a481ed5ab Adding experimental support for Redis output cache 2014-05-12 15:27:58 -07:00
Sebastien Ros
dd1842bb13 Updating OSS credits 2014-05-02 09:23:29 -07:00
Sebastien Ros
275b7db309 Post processing config files in build script 2013-09-12 16:11:49 -07:00
Sebastien Ros
ace100d40f Merge branch 'master' into 1.x 2013-08-05 16:07:14 -07:00
Bertrand Le Roy
1bf4658657 Moving the tip. 
--HG--
branch : 1.x
 2013-08-01 11:53:50 -07:00
Sebastien Ros
53936d20f8 #19913: Adding a shim for browsers which don't support console.log 
Work Item: 19913
 2013-07-18 10:49:22 -07:00
Sebastien Ros
6a48cf5f0e Updating Credits.txt 
--HG--
branch : 1.x
 2013-07-15 15:42:50 -07:00
Sebastien Ros
dfbcc7c00e Using FontAwesome in Media Library 
--HG--
branch : 1.x
 2013-05-11 13:09:20 -07:00
Sebastien Ros
4f77fab77a Adding Orchard.Scripting.CSharp 
--HG--
branch : 1.x
 2013-02-27 15:46:23 -08:00
Sebastien Ros
b9b030fff1 Refactoring anti-spam feature in comments 
--HG--
branch : 1.x
extra : rebase_source : c24f16db4b03f676c261aa7a959f85ac2ac0a09c
 2012-11-01 17:14:46 -07:00
Sebastien Ros
cd7fb75f65 Replacing SharpZipLib by DtoNetZip 
--HG--
branch : 1.x
 2012-09-05 18:47:59 -07:00
Sebastien Ros
b1b921c2a2 Updating licensing terms for MySql Connectors 
--HG--
branch : 1.x
 2012-09-05 15:47:09 -07:00
bertrandleroy
e73c847b3f Added ScrollTo to credits 
--HG--
branch : 1.x
 2011-03-31 14:30:57 -07:00
bradmi
8677996235 Updated CREDITS.txt w/ license clarification for SharpZipLib. 
--HG--
branch : 1.x
 2011-03-29 22:26:56 -07:00
bertrandleroy
e6384ffca7 Adding CodeMirror to credits 
--HG--
branch : dev
 2011-03-09 15:24:31 -08:00
bertrandleroy
50acdb284c Using fwlink as per team´s suggestion for MVC 3 license. 
--HG--
branch : 1.x
 2011-01-12 15:35:24 -08:00
bertrandleroy
829609c34c Final MVC Eula link 
--HG--
branch : 1.x
 2011-01-12 15:28:06 -08:00
bertrandleroy
20318d40a7 Changed the license URL for MVC to point at the EULA as we´re not redistributing source code. 
--HG--
branch : 1.x
 2011-01-12 14:51:37 -08:00
bertrandleroy
b82e3320b3 More credits.txt fixes. 
--HG--
branch : 1.x
 2011-01-12 12:03:37 -08:00
Renaud Paquay
4f09893445 Updating credits.txt file 
--HG--
branch : 1.x
 2011-01-12 11:22:06 -08:00
Sebastien Ros
cf2432acb5 Removing NuGet project from solution 
Added Nuget as an external lib
Updated CREDITS.txt

--HG--
branch : dev
 2010-11-11 15:03:57 -08:00
Nathan Heskew
62ddb9498a Adding html5shim to the core shapes (document template) 
--HG--
branch : dev
 2010-10-11 11:45:22 -07:00
Bertrand Le Roy
2efcb8d6da Updated credits.txt with new dependencies. 
--HG--
branch : dev
 2010-06-09 16:53:40 -07:00
skewed
5a8ac65dae 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. 
--HG--
extra : convert_revision : svn%3A5ff7c347-ad56-4c35-b696-ccb81de16e03/trunk%4046045
 2010-01-28 06:53:58 +00:00
BertrandLeRoy
91b0af0591 Updated CREDITS.txt. 
--HG--
extra : convert_revision : svn%3A5ff7c347-ad56-4c35-b696-ccb81de16e03/trunk%4046001
 2010-01-27 02:07:55 +00:00
skewed
c7cd71afbe - Grabbing (and changing reference to) the latest in jQuery 
- Copying YUI CSS being used in themes to /lib/yui and adding credits

--HG--
extra : convert_revision : svn%3A5ff7c347-ad56-4c35-b696-ccb81de16e03/trunk%4045997
 2010-01-26 22:13:28 +00:00
skewed
f3babd8751 jQuery 1.3.2 -> jQuery 1.4 and updated credits 
--HG--
extra : convert_revision : svn%3A5ff7c347-ad56-4c35-b696-ccb81de16e03/trunk%4045425
 2010-01-14 22:02:37 +00:00
skewed
f9be656e6c Last of the yui related markup cleanup 
--HG--
extra : convert_revision : svn%3A5ff7c347-ad56-4c35-b696-ccb81de16e03/trunk%4043781
 2009-12-11 08:29:52 +00:00
BertrandLeRoy
3b1e44f306 Copying LICENSE.txt and CREDITS.txt to trunk. 
--HG--
extra : convert_revision : svn%3A5ff7c347-ad56-4c35-b696-ccb81de16e03/trunk%4043599
 2009-12-09 17:36:32 +00:00