Laurent Destailleur
|
5bfc65676c
|
Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
ChangeLog
htdocs/commande/class/commande.class.php
htdocs/filefunc.inc.php
htdocs/theme/eldy/style.css.php
|
2016-04-22 21:02:20 +02:00 |
|
Laurent Destailleur
|
f96f8eac85
|
Merge remote-tracking branch 'origin/3.8' into 3.9
|
2016-04-22 20:09:51 +02:00 |
|
Laurent Destailleur
|
980f3d522f
|
Prepare 3.9.1
|
2016-04-22 20:09:42 +02:00 |
|
Laurent Destailleur
|
25810ddfc8
|
Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
htdocs/compta/localtax/quadri_detail.php
htdocs/core/lib/tax.lib.php
|
2016-04-22 20:08:33 +02:00 |
|
Laurent Destailleur
|
68e96b98c5
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
ChangeLog
htdocs/filefunc.inc.php
|
2016-04-22 20:02:34 +02:00 |
|
Laurent Destailleur
|
7f5670cb26
|
Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
ChangeLog
|
2016-04-22 19:49:27 +02:00 |
|
Laurent Destailleur
|
0ef1be9364
|
Prepare 3.9.1
|
2016-04-22 18:07:34 +02:00 |
|
Laurent Destailleur
|
c2de7adb32
|
Minor PHPCS fixes
|
2016-04-21 03:18:42 +02:00 |
|
Laurent Destailleur
|
f8b39ab50e
|
Fix errors reported by scrutinizer
|
2016-04-09 19:04:23 +02:00 |
|
Laurent Destailleur
|
a43a0a3f4c
|
Debug module loan and disable non working features
|
2016-04-06 11:21:55 +02:00 |
|
Laurent Destailleur
|
85cd0038f5
|
Merge remote-tracking branch 'origin/3.9' into develop
|
2016-03-25 16:10:10 +01:00 |
|
Laurent Destailleur
|
91caea5707
|
Code was corrupted with very bad commits. I restore files manually.
|
2016-03-25 15:53:44 +01:00 |
|
Regis Houssin
|
b38e75c404
|
Merge branch '3.8_fix_merge' into 3.9_fix_merge
|
2016-03-23 14:03:35 +01:00 |
|
Regis Houssin
|
20d785ad28
|
Merge remote-tracking branch 'origin/3.7' into 3.8_fix_merge
Conflicts:
htdocs/filefunc.inc.php
|
2016-03-23 13:40:05 +01:00 |
|
Marcos García
|
d15da596d8
|
Update ChangeLog
|
2016-03-21 22:24:46 +01:00 |
|
Marcos García de La Fuente
|
bfbcf7a64c
|
Unintended changes
|
2016-03-21 21:57:00 +01:00 |
|
Marcos García de La Fuente
|
d9dab762ad
|
Added changes to the changelog
|
2016-03-21 21:55:57 +01:00 |
|
Marcos García de La Fuente
|
89bd173c2f
|
NEW Rename Form::select_date to Form::selectDate and Form::form_date to Form::formDate
|
2016-03-21 21:51:29 +01:00 |
|
Laurent Destailleur
|
2b1f57f01e
|
Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
dev/initdata/savedemo.sh
htdocs/filefunc.inc.php
htdocs/user/card.php
|
2016-03-18 11:54:14 +01:00 |
|
philippe grand
|
d434cee3fa
|
[Qual] Typo
|
2016-03-17 09:40:05 +01:00 |
|
Laurent Destailleur
|
543f5cef63
|
Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
dev/initdata/initdemo.sh
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/purchasesjournal.php
htdocs/commande/card.php
htdocs/compta/facture.php
|
2016-03-13 01:31:12 +01:00 |
|
Laurent Destailleur
|
e0809fc750
|
Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
ChangeLog
build/makepack-dolibarr.pl
htdocs/compta/facture.php
htdocs/product/document.php
|
2016-03-12 18:40:50 +01:00 |
|
Laurent Destailleur
|
731d1cfe41
|
Update changelog for 3.8.4
|
2016-03-12 12:07:11 +01:00 |
|
Laurent Destailleur
|
444fce0bd9
|
Prepare 3.7.4
|
2016-03-11 18:34:05 +01:00 |
|
Laurent Destailleur
|
e669dac398
|
Prepare 3.6.7
|
2016-03-11 18:28:39 +01:00 |
|
Laurent Destailleur
|
a45ffeecca
|
Missing changelog
|
2016-03-11 18:21:57 +01:00 |
|
Laurent Destailleur
|
cbd102fa45
|
Merge and rename method into camel format
|
2016-03-04 16:28:38 +01:00 |
|
Laurent Destailleur
|
adb66eddf1
|
Fix generation of rpm packages
|
2016-02-06 18:15:54 +01:00 |
|
Laurent Destailleur
|
d85f7be1f5
|
FIX #4423
|
2016-02-03 02:06:12 +01:00 |
|
Laurent Destailleur
|
3dafe76f5e
|
Complete changelog
|
2016-01-08 14:51:20 +01:00 |
|
Laurent Destailleur
|
0f7fd47a44
|
Clean changelog
|
2016-01-02 13:05:10 +01:00 |
|
Laurent Destailleur
|
0314b3b5b1
|
Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
ChangeLog
|
2016-01-02 12:27:08 +01:00 |
|
Laurent Destailleur
|
8f0a004a58
|
Merge remote-tracking branch 'origin/3.7' into 3.8
|
2016-01-02 12:24:20 +01:00 |
|
Laurent Destailleur
|
e4640ca4c3
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
htdocs/install/upgrade.php
|
2016-01-02 12:22:00 +01:00 |
|
Laurent Destailleur
|
a2e93056f7
|
Prepare 3.8.3
|
2015-12-27 23:42:09 +01:00 |
|
Laurent Destailleur
|
f13df0f952
|
Prepare 3.7.3
|
2015-12-27 20:17:46 +01:00 |
|
Laurent Destailleur
|
a2c8208541
|
Prepare 3.6.5
|
2015-12-27 19:17:05 +01:00 |
|
Laurent Destailleur
|
c64eac5e72
|
Fix doc and mysql min version
|
2015-12-27 17:05:56 +01:00 |
|
Laurent Destailleur
|
065b7b6683
|
Fix ba alignement
|
2015-12-19 19:12:21 +01:00 |
|
Laurent Destailleur
|
e470869afe
|
Prepare 3.9
|
2015-12-06 14:35:36 +01:00 |
|
Laurent Destailleur
|
d9533e9001
|
Prepare 3.9
|
2015-12-06 14:27:52 +01:00 |
|
Laurent Destailleur
|
0279e99b0a
|
Update warning for mysql 5.5.4* bug
|
2015-12-06 12:04:34 +01:00 |
|
Laurent Destailleur
|
ab177b43af
|
Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
ChangeLog
htdocs/.gitignore
htdocs/comm/mailing/card.php
htdocs/commande/list.php
htdocs/compta/facture.php
htdocs/expedition/class/expedition.class.php
|
2015-11-13 12:35:10 +01:00 |
|
Laurent Destailleur
|
93be4305c4
|
Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
build/makepack-dolibarr.pl
htdocs/accountancy/customer/card.php
htdocs/accountancy/customer/list.php
htdocs/accountancy/supplier/card.php
htdocs/accountancy/supplier/list.php
htdocs/commande/card.php
htdocs/commande/class/commande.class.php
htdocs/fichinter/card.php
htdocs/societe/rib.php
|
2015-11-13 12:18:46 +01:00 |
|
Laurent Destailleur
|
eac80d7db4
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
ChangeLog
build/debian/changelog
htdocs/commande/fiche.php
htdocs/compta/facture.php
|
2015-11-13 11:43:29 +01:00 |
|
Laurent Destailleur
|
722a133b31
|
FIX Add a protection to not make release if ChangeLog was not generated.
Prepare package 3.6.5
Conflicts:
ChangeLog
Conflicts:
ChangeLog
|
2015-11-08 15:09:57 +01:00 |
|
Laurent Destailleur
|
9b8bb114cd
|
FIX Add a protection to not make release if ChangeLog was not generated.
Prepare package 3.7.2
Conflicts:
ChangeLog
|
2015-11-08 14:55:12 +01:00 |
|
Laurent Destailleur
|
c639e82062
|
FIX Add a protection to not make release if ChangeLog was not generated.
Conflicts:
ChangeLog
|
2015-11-08 14:45:56 +01:00 |
|
Laurent Destailleur
|
6b98c50510
|
FIX Add a protection to not make release if ChangeLog was not generated.
|
2015-11-08 12:16:30 +01:00 |
|
Laurent Destailleur
|
972c364c37
|
FIX Add a protection to not make release if ChangeLog was not generated.
Prepare package 3.8.2
|
2015-11-08 12:12:28 +01:00 |
|