浏览代码

Merge branch 'adodbtimeupdate' of github.com:GPCsolutions/dolibarr into
GPCsolutions-adodbtimeupdate

Conflicts:
COPYRIGHT

Laurent Destailleur 11 年之前
父节点
当前提交
61e1500d12
共有 2 个文件被更改,包括 529 次插入176 次删除
  1. 10 2
      COPYRIGHT
  2. 519 174
      htdocs/includes/adodbtime/adodb-time.inc.php

+ 10 - 2
COPYRIGHT

@@ -12,7 +12,7 @@ Dolibarr uses some external libraries released under different licenses. This is
 Component             Version       License                     GPL Compatible  Usage
 -------------------------------------------------------------------------------------
 PHP libraries:
-AdoDb-Date            0.21          Modified BSD License        Yes             Date convertion (not into rpm package)
+AdoDb-Date            0.32          Modified BSD License        Yes             Date convertion (not into rpm package)
 CKEditor              4.3.3         LGPL-2.1+                   Yes             Editor WYSIWYG
 FPDI                  1.4.2         Apache Software License 2.0 Yes             PDF templates management
 FPDF_TPL              1.2           Apache Software License 2.0 Yes             PDF templates management
@@ -20,7 +20,7 @@ GeoIP                 1.4           LGPL-2.1+                   Yes
 NuSoap                0.9.5         LGPL 2.1+                   Yes             Library to develop SOAP Web services (not into rpm and deb package)
 odtPHP                1.0.1         GPL-2+  b                   Yes             Library to build/edit ODT files
 PHPExcel              1.7.6         LGPL-2.1+                   Yes             Read/Write XLS files, read ODS files
-PHPPrintIPP           0.83          GPL-2+                      Yes             Library to send print IPP requests
+PHPPrintIPP           1.3           GPL-2+                      Yes             Library to send print IPP requests
 TCPDF                 6.0.021       LGPL-3+                     Yes             PDF generation
 
 JS libraries:
@@ -53,7 +53,15 @@ Copyright
 ---------
 
 Copyright (C) 2014
+- Laurent Destailleur <eldy@users.sourceforge.net>
+- Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
+- Jean-François Ferry <jfefe@aternatik.fr>
 - Marcos García <marcosgdf@gmail.com>
+- Philippe Grand <philippe.grand@atoo-net.com>
+- Florian Henry <florian.henry@open-concept.pro>
+- Regis Houssin <regis.houssin@capnetworks.com>
+- Maxime Kohlhaas <mko@atm-consulting.fr>
+- Juanjo Menent <jmenent@2byte.es>
 - Alexandre Spangaro <alexandre.spangaro@gmail.com>
 
 Copyright (C) 2013

文件差异内容过多而无法显示
+ 519 - 174
htdocs/includes/adodbtime/adodb-time.inc.php


部分文件因为文件数量过多而无法显示