Laurent Destailleur
|
d7f557c7ed
|
Remove warning
|
2016-07-22 18:34:50 +02:00 |
|
Laurent Destailleur
|
bf67cf9dc2
|
Update documentation
|
2016-07-17 13:40:14 +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
|
25d9969590
|
Fix watch to use orig.tar.gz on package_ubuntu directory
|
2016-07-16 23:47:37 +02:00 |
|
Laurent Destailleur
|
653bfd5d43
|
Fix missing orig file in upload.
|
2016-07-16 22:19:26 +02:00 |
|
Laurent Destailleur
|
58caf89aab
|
Fix for debian package
|
2016-07-16 19:52:42 +02:00 |
|
Laurent Destailleur
|
8961f1077a
|
Detection of chrome to install correctly doliwamp when chrome is used
|
2016-07-09 12:19:58 +02:00 |
|
Laurent Destailleur
|
f47fc3c6ba
|
Fix for apache 2.4
|
2016-07-08 00:20:26 +02:00 |
|
Laurent Destailleur
|
964001bda2
|
Fix for apache 2.4
|
2016-07-08 00:16:22 +02:00 |
|
Laurent Destailleur
|
e55ae1476a
|
Fix innosetup install
|
2016-07-06 23:55:10 +02:00 |
|
Laurent Destailleur
|
d7bc30fc4e
|
Prepare DoliWamp 4.0
|
2016-07-06 23:18:01 +02:00 |
|
Laurent Destailleur
|
16e3a3d294
|
Fix datadir not defined
Fix can't use the cron script on cloud services since the admin user may
have different values.
|
2016-07-06 22:49:08 +02:00 |
|
Laurent Destailleur
|
061ccadd03
|
Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
htdocs/fourn/commande/list.php
htdocs/fourn/commande/orderstoinvoice.php
htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/cs/functions
htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/da/functions
htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/de/functions
htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/es/functions
htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fi/functions
htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fr/functions
htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/hu/functions
htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/it/functions
htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/nl/functions
htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/no/functions
htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pl/functions
htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/ru/functions
htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/tr/functions
htdocs/install/pgsql/functions/functions.sql
|
2016-07-06 15:11:29 +02:00 |
|
Laurent Destailleur
|
a8f06d78b1
|
Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
htdocs/install/pgsql/functions/functions.sql
|
2016-07-06 14:53:05 +02:00 |
|
Laurent Destailleur
|
8e19b235f1
|
Code comment
|
2016-07-06 11:06:49 +02:00 |
|
Laurent Destailleur
|
9249a7c736
|
Add entry to run stop/start doliwamp as admin
|
2016-07-06 11:05:23 +02:00 |
|
Laurent Destailleur
|
a2e26e6ba0
|
Upgrade apache and php for DoliWamp but not Mysql
|
2016-07-06 10:49:19 +02:00 |
|
Laurent Destailleur
|
bad758f248
|
Fix syntax error
|
2016-07-03 19:10:52 +02:00 |
|
Laurent Destailleur
|
f3eb564d5f
|
Some fix for mysql5.6.17
|
2016-07-03 15:24:01 +02:00 |
|
Laurent Destailleur
|
ce3f45c2a2
|
Debug of doliwamp for 4.0
|
2016-07-03 13:14:33 +02:00 |
|
Laurent Destailleur
|
a57a41a07d
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
|
2016-06-29 20:09:02 +02:00 |
|
Laurent Destailleur
|
383641e086
|
Test package vcredist is available
|
2016-06-29 20:08:47 +02:00 |
|
Laurent Destailleur
|
1a3bd97a55
|
Prepare 4.0 doliwamp
|
2016-06-28 02:07:39 +02:00 |
|
Laurent Destailleur
|
29fa49c99d
|
Prepare package 4.0
|
2016-06-28 01:50:27 +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 |
|
Laurent Destailleur
|
6062bad917
|
Update doc
|
2016-06-02 13:29:51 +02:00 |
|
Laurent Destailleur
|
6feabe5049
|
ChangeLog of 4.0 is ready
|
2016-06-02 13:27:18 +02:00 |
|
Laurent Destailleur
|
79291b7a77
|
Prepare 4.0
|
2016-05-31 00:35:21 +02:00 |
|
Laurent Destailleur
|
bba3dc7dcd
|
Make composer cleaner
|
2016-05-18 13:39:57 +02:00 |
|
Laurent Destailleur
|
e571741ef8
|
Add doc on composer
|
2016-05-18 12:58:50 +02:00 |
|
Laurent Destailleur
|
f7bd2d16db
|
Prepare upgrade of doliwamp
|
2016-05-04 20:48:49 +02:00 |
|
Laurent Destailleur
|
1af8ca458d
|
Better image
Conflicts:
build/exe/doliwamp/doliwamp.bmp
|
2016-05-04 20:34:25 +02:00 |
|
Laurent Destailleur
|
8b41970b2e
|
Prepare upgrade of doliwamp
|
2016-05-04 20:19:53 +02:00 |
|
Laurent Destailleur
|
174cead40d
|
Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
htdocs/commande/list.php
|
2016-04-29 15:33:57 +02:00 |
|
Laurent Destailleur
|
c539cc7151
|
Merge remote-tracking branch 'origin/3.8' into 3.9
|
2016-04-29 15:30:04 +02:00 |
|
Laurent Destailleur
|
f91a8934bd
|
Merge remote-tracking branch 'origin/3.7' into 3.8
|
2016-04-29 15:17:11 +02:00 |
|
Laurent Destailleur
|
211d217f8c
|
Merge remote-tracking branch 'origin/3.6' into 3.7
|
2016-04-29 15:13:27 +02:00 |
|
Laurent Destailleur
|
2a27fe02eb
|
Fix detection if tag already exists
|
2016-04-29 15:12:58 +02:00 |
|
Laurent Destailleur
|
a2a5fa6f4f
|
Update screenshots
|
2016-04-26 01:13:55 +02: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 |
|
Laurent Destailleur
|
c35d8d1b8e
|
Fix publish on foundation server
|
2016-03-13 12:48:08 +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
|
eb65707da8
|
Fix code to publishing packages on foundation server
|
2016-03-12 12:50:05 +01:00 |
|
Laurent Destailleur
|
bc2043cb79
|
Merge remote-tracking branch 'origin/3.9' into develop
|
2016-03-03 20:48:47 +01:00 |
|
Laurent Destailleur
|
19a9a02e6a
|
Fix script is able to manage rc versions
|
2016-03-03 01:08:15 +01:00 |
|
Laurent Destailleur
|
3a58613e45
|
Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
htdocs/accountancy/bookkeeping/listbyyear.php
htdocs/accountancy/journal/bankjournal.php
htdocs/compta/facture/list.php
htdocs/filefunc.inc.php
htdocs/fourn/facture/list.php
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
htdocs/projet/activity/index.php
|
2016-03-02 23:40:11 +01:00 |
|
Laurent Destailleur
|
45f4c45618
|
Fix lintian warnings
|
2016-02-29 10:09:21 +01:00 |
|