Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-06 00:53:00 +01:00
Code Issues Packages Projects Releases Wiki Activity
122,559 Commits 37 Branches 191 Tags
e65c85dc44f7ddbb9d2931be2d01eaed85b51a99
Commit Graph

306 Commits

Author SHA1 Message Date
Laurent Destailleur
ff4e61e70a Fix doc debian 2016-11-10 18:45:28 +01:00
Laurent Destailleur
3fbba59f69 Better management of status of events 2016-10-30 13:12:35 +01:00
Laurent Destailleur
7d182c286c Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/step1.php
	htdocs/projet/tasks/time.php
 2016-10-26 10:40:03 +02:00
Laurent Destailleur
abc471575a Fix sql error 2016-10-22 17:00:19 +02:00
Laurent Destailleur
629af89986 FIX Solve backup when using mysqldump that return warning 2016-10-22 16:18:28 +02:00
Laurent Destailleur
11609eab71 Update doc 2016-10-22 15:03:13 +02:00
Laurent Destailleur
6965e987f0 Keep fpdi embedded 2016-10-22 14:35:45 +02:00
Laurent Destailleur
9fe6959598 Merge pull request #5588 from GPCsolutions/develop-4608 
FIX #4608 [Debian] Don't hard depend on mysql-server
 2016-09-02 18:57:29 +02:00
Laurent Destailleur
0e3ec5df38 Merge branch 'remove-mysql-driver' of 
https://github.com/marcosgdf/dolibarr into marcosgdf-remove-mysql-driver

Conflicts:
	htdocs/core/db/mysql.class.php
 2016-08-05 13:12:43 +02:00
Raphaël Doursenaud
33251fc97e FIX #4608 [Debian] Don't hard depend on mysql-server 
Allows using a separate MySQL server and switching to MariaDB.
 2016-08-05 12:08:41 +02:00
Laurent Destailleur
3265b7028d Merge remote-tracking branch 'origin/4.0' into develop 2016-07-25 19:53:28 +02:00
Laurent Destailleur
d7f557c7ed Remove warning 2016-07-22 18:34:50 +02:00
Laurent Destailleur
af09528738 NEW Add substitution key __DATE_YMD__, __DATE_DUE_YMD__, __AMOUNT__ and 
__AMOUNT_WO_TAX__ into emails templates.
 2016-07-21 20:45:30 +02:00
Laurent Destailleur
1914b98375 Merge remote-tracking branch 'origin/3.9' into 4.0 2016-07-17 12:52:20 +02:00
Laurent Destailleur
9b47d7e05d Keep only us file 2016-07-17 12:46:09 +02:00
Laurent Destailleur
d345153c5e Update doc 2016-07-17 00:08:34 +02:00
Laurent Destailleur
25d9969590 Fix watch to use orig.tar.gz on package_ubuntu directory 2016-07-16 23:47:37 +02:00
Laurent Destailleur
e2a03d18dd Merge remote-tracking branch 'origin/4.0' into develop 2016-07-16 19:58:36 +02:00
Laurent Destailleur
a9b1693e09 Update doc 2016-07-16 19:55:54 +02:00
Laurent Destailleur
58caf89aab Fix for debian package 2016-07-16 19:52:42 +02:00
Laurent Destailleur
f9190b0940 Update doc 2016-06-08 18:32:42 +02:00
Laurent Destailleur
e5aa79364a Update cache example 2016-06-08 18:21:05 +02:00
Marcos García de La Fuente
257d9b2f8d NEW #4772 Removed support for Mysql deprecated driver. Please use Mysqli instead 2016-04-17 15:39:46 +02:00
Laurent Destailleur
45f4c45618 Fix lintian warnings 2016-02-29 10:09:21 +01:00
Laurent Destailleur
1a4413dbc3 Update how to 2016-02-23 19:51:52 +01:00
Laurent Destailleur
798a40f6c0 Update changelog 2016-02-23 13:02:53 +01:00
Laurent Destailleur
5ea9c6dd83 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/core/class/html.formprojet.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/accountancy.lang
 2016-02-09 14:40:25 +01:00
Laurent Destailleur
4c859999e8 Fix first install on debian. 2016-02-06 17:19:57 +01:00
Laurent Destailleur
ebd9a97bab Prepare 3.9 2016-02-06 15:55:05 +01:00
Laurent Destailleur
806d3642d8 FIX Bad filter on opportunities 
Conflicts:
	htdocs/core/class/html.formprojet.class.php
 2016-02-06 15:09:57 +01:00
Laurent Destailleur
3828fe7026 FIX Bad filter on opportunities 2016-02-06 15:06:37 +01:00
Laurent Destailleur
de1c6cce63 Update doc 2016-02-01 10:42:53 +01:00
Laurent Destailleur
c54ebfebb5 Merge remote-tracking branch 'origin/3.9' into develop 2016-01-31 21:28:14 +01:00
Laurent Destailleur
605c36de65 Merge remote-tracking branch 'origin/3.8' into 3.9 2016-01-31 21:27:46 +01:00
Laurent Destailleur
b93170b345 Merge remote-tracking branch 'origin/3.7' into 3.8 2016-01-31 21:27:20 +01:00
Laurent Destailleur
0076512d5b Merge remote-tracking branch 'origin/3.6' into 3.7 2016-01-31 21:26:52 +01:00
Laurent Destailleur
1b23ede857 Merge remote-tracking branch 'origin/3.5' into 3.6 2016-01-31 21:26:28 +01:00
Laurent Destailleur
b11fe5f4c7 Update debian doc 2016-01-31 20:46:27 +01:00
Laurent Destailleur
d9e089256e Fix path to copyrighted files 2016-01-31 16:16:46 +01:00
Laurent Destailleur
06754068ff Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	build/debian/changelog
	build/makepack-dolibarr.pl
	build/makepack-howto.txt
	htdocs/filefunc.inc.php
 2015-12-27 19:02:19 +01:00
Laurent Destailleur
96bc2023f3 Prepare package 3.6.6 2015-12-27 18:56:15 +01:00
Laurent Destailleur
3b595f0247 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/accountancy/customer/list.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/core/lib/date.lib.php
	htdocs/core/lib/report.lib.php
	htdocs/langs/en_US/accountancy.lang
 2015-12-13 16:23:33 +01:00
Laurent Destailleur
a462cd232d Merge remote-tracking branch 'origin/3.7' into 3.8 2015-12-13 16:09:09 +01:00
Laurent Destailleur
4a88c9ea9f Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/product/class/product.class.php
 2015-12-13 15:53:57 +01:00
Raphaël Doursenaud
4e9b339439 [Qual] Removed PHP closing tag 2015-12-09 13:28:45 +01:00
Raphaël Doursenaud
c0862762a5 Fix #3930 Removed executable bit 
These files doesn't contain executable code and may pose a security
threat.
 2015-12-09 13:28:36 +01:00
Laurent Destailleur
ffeae34f51 Update doc 2015-11-22 18:41:35 +01:00
Laurent Destailleur
f49fab8a7e Rename some files in english and increase fields size. 2015-11-09 16:48:30 +01:00
Laurent Destailleur
350345ecca Prepare 3.6.5 2015-11-08 15:18:26 +01:00
Laurent Destailleur
68d4a9fc63 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/societe/list.php
 2015-10-04 20:57:00 +02:00