Laurent Destailleur
|
fec5f4e20b
|
Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
htdocs/compta/facture/class/facture.class.php
|
2015-12-21 12:40:32 +01:00 |
|
Laurent Destailleur
|
0a515ca8c0
|
Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
htdocs/compta/facture/class/facture.class.php
|
2015-12-21 12:38:23 +01:00 |
|
Laurent Destailleur
|
932c3f9172
|
Fix init of situation_percent
|
2015-12-21 12:37:58 +01:00 |
|
Laurent Destailleur
|
7e03aaee23
|
Merge remote-tracking branch 'origin/3.7' into 3.8
|
2015-12-21 12:25:47 +01:00 |
|
Laurent Destailleur
|
96b6f0d8fb
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
composer.json
htdocs/product/ajax/products.php
htdocs/product/class/product.class.php
|
2015-12-21 12:24:24 +01:00 |
|
Laurent Destailleur
|
67462a81a8
|
Fix link to issues and dependencies
|
2015-12-21 12:22:31 +01:00 |
|
Laurent Destailleur
|
b0b5e95c7f
|
Backport travis change
|
2015-12-21 03:04:01 +01:00 |
|
Laurent Destailleur
|
b179a193dd
|
Fix param for username is $username and not $login
|
2015-12-21 03:01:37 +01:00 |
|
Laurent Destailleur
|
a2ae9b9cfc
|
Fix forget password page must have a different title then login page
Fix Missing translations
|
2015-12-21 00:47:44 +01:00 |
|
Laurent Destailleur
|
2f8fc05cdb
|
Fix: QRcode must not be random
|
2015-12-20 21:28:05 +01:00 |
|
Laurent Destailleur
|
f243b5230f
|
Fix search filter disappear and clean filter button not visible.
|
2015-12-20 20:24:12 +01:00 |
|
Laurent Destailleur
|
fa277ef634
|
Fix duplicate translation
|
2015-12-20 20:11:29 +01:00 |
|
Laurent Destailleur
|
f0802eb36b
|
FIX #4245 PHP 7
|
2015-12-19 19:48:36 +01:00 |
|
Laurent Destailleur
|
1c1d176715
|
Fix statistics was reporting bad value
|
2015-12-19 19:39:42 +01:00 |
|
Laurent Destailleur
|
065b7b6683
|
Fix ba alignement
|
2015-12-19 19:12:21 +01:00 |
|
Laurent Destailleur
|
73f1596027
|
More complete upgrade process from command line
|
2015-12-19 18:54:33 +01:00 |
|
Laurent Destailleur
|
55e90c5676
|
Try to restore lost file
|
2015-12-19 18:35:17 +01:00 |
|
Laurent Destailleur
|
f5c5dfd37f
|
FIX #4185
|
2015-12-19 18:26:15 +01:00 |
|
Laurent Destailleur
|
3517b64031
|
FIX #4228 PHP7 error
|
2015-12-19 18:18:24 +01:00 |
|
Laurent Destailleur
|
9334cf8fd1
|
FIX #4243 sql injection
|
2015-12-19 18:03:08 +01:00 |
|
Laurent Destailleur
|
ba9796a438
|
Merge pull request #4082 from atm-maxime/fix_situation_percent
Fix : situation percent should be 100 by default
|
2015-12-19 17:49:04 +01:00 |
|
Laurent Destailleur
|
3b2a921378
|
Fix a serial is required for stock change
|
2015-12-19 14:05:38 +01:00 |
|
Laurent Destailleur
|
d7e9c92144
|
Fix bad link on category
Fix cancel button on categories
Css enhancement.
|
2015-12-19 13:55:27 +01:00 |
|
Laurent Destailleur
|
50e496712e
|
missing css style
|
2015-12-19 03:47:02 +01:00 |
|
Laurent Destailleur
|
bef971cacf
|
Fix ergonomy. Adding a new entry is done from left menu.
|
2015-12-19 03:43:45 +01:00 |
|
Laurent Destailleur
|
b1051c7396
|
Fix picto
|
2015-12-19 03:30:35 +01:00 |
|
Laurent Destailleur
|
a4edd90320
|
Debug the cron module
|
2015-12-19 03:27:55 +01:00 |
|
Laurent Destailleur
|
a973c91c24
|
Fix pagination on cron jobs
Fix perf when too much lines
|
2015-12-19 02:39:44 +01:00 |
|
Laurent Destailleur
|
bd91f327b8
|
Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
.travis.yml
htdocs/filefunc.inc.php
|
2015-12-19 01:38:22 +01:00 |
|
Laurent Destailleur
|
298396a57e
|
Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
test/phpunit/AllTests.php
|
2015-12-19 01:27:19 +01:00 |
|
Laurent Destailleur
|
6ed87f43de
|
Fix indent
|
2015-12-19 01:15:08 +01:00 |
|
Laurent Destailleur
|
b1b2038d71
|
Merge remote-tracking branch 'origin/3.6' into 3.7
|
2015-12-19 01:11:01 +01:00 |
|
Laurent Destailleur
|
0df45f10c1
|
Fix travis
|
2015-12-19 01:09:42 +01:00 |
|
Laurent Destailleur
|
a136e90749
|
Fix travis
|
2015-12-19 01:06:11 +01:00 |
|
Laurent Destailleur
|
f5fa557ef7
|
Fix perm
|
2015-12-19 00:36:00 +01:00 |
|
Laurent Destailleur
|
f25a9030eb
|
Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
.travis.yml
htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php
htdocs/core/modules/commande/doc/pdf_proforma.modules.php
htdocs/includes/adodbtime/adodb-time.inc.php
htdocs/langs/en_US/accountancy.lang
|
2015-12-18 22:12:03 +01:00 |
|
Laurent Destailleur
|
41cdb65521
|
Test to solve travis error
|
2015-12-18 21:44:18 +01:00 |
|
Laurent Destailleur
|
dd3f5a32d3
|
Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
.travis.yml
composer.json
htdocs/accountancy/admin/card.php
|
2015-12-18 21:20:12 +01:00 |
|
Laurent Destailleur
|
ebf68ecbe0
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
.travis.yml
htdocs/contrat/class/contrat.class.php
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
htdocs/core/modules/project/pdf/pdf_baleine.modules.php
|
2015-12-18 21:03:57 +01:00 |
|
Laurent Destailleur
|
c1c0fa88c2
|
Fix for new travis setup
|
2015-12-18 20:56:27 +01:00 |
|
Laurent Destailleur
|
05ea9afa02
|
Fix to manage de_CH thousand separator
|
2015-12-18 20:53:04 +01:00 |
|
Laurent Destailleur
|
b47dc8a394
|
Fix to use new travis setup
|
2015-12-18 20:10:11 +01:00 |
|
Laurent Destailleur
|
116bdf47a3
|
Debug travis
|
2015-12-18 20:02:28 +01:00 |
|
Laurent Destailleur
|
61df71cc64
|
Fix travis
|
2015-12-18 19:57:09 +01:00 |
|
Laurent Destailleur
|
11042fe499
|
Restore data missin help debug
|
2015-12-18 19:54:54 +01:00 |
|
Laurent Destailleur
|
064fad136e
|
Try to solve travis pb
|
2015-12-18 19:28:17 +01:00 |
|
Laurent Destailleur
|
0dc4130a17
|
Add debug
|
2015-12-18 18:59:20 +01:00 |
|
Laurent Destailleur
|
056ab63680
|
Try to fix travis error using new setup
|
2015-12-18 18:46:35 +01:00 |
|
Laurent Destailleur
|
480111c6b1
|
Try to fix travis error using new setup
|
2015-12-18 18:31:51 +01:00 |
|
Laurent Destailleur
|
5c8731b197
|
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
|
2015-12-18 18:29:51 +01:00 |
|