Laurent Destailleur
|
9d63cb0156
|
Merge pull request #4452 from hregis/3.7_bug
Fix: $outputlangs is not defined (dolibarr 3.7, 3.8, 3.9)
|
2016-01-22 03:45:35 +01:00 |
|
Regis Houssin
|
535d3bc087
|
Merge remote-tracking branch 'origin/3.7' into 3.7_bug
|
2016-01-18 13:04:08 +01:00 |
|
Regis Houssin
|
6e30d5e516
|
Merge remote-tracking branch 'origin/3.7' into 3.7_bug
|
2016-01-15 13:16:40 +01:00 |
|
Regis Houssin
|
6aeb18ed75
|
Revert "Fix: for avoid division by 0"
This reverts commit c71d578931.
|
2016-01-15 13:14:55 +01:00 |
|
Regis Houssin
|
905f9d78ed
|
Fix: $outputlangs is not defined (dolibarr 3.7, 3.8, 3.9)
|
2016-01-15 13:12:19 +01:00 |
|
Laurent Destailleur
|
947f718329
|
Merge pull request #4408 from fmarcet/3.7
FIX: The third dashboard don't consider user permissions
|
2016-01-12 23:23:49 +01:00 |
|
fmarcet
|
79992b4947
|
FIX: The third dashboard don't consider user permissions
|
2016-01-12 11:34:50 +01:00 |
|
Laurent Destailleur
|
861376e461
|
Merge branch '3.7' of github.com:Dolibarr/dolibarr into 3.7
|
2016-01-10 18:49:11 +01:00 |
|
Laurent Destailleur
|
801e2bca4b
|
Fix #4239
|
2016-01-10 18:42:35 +01:00 |
|
Laurent Destailleur
|
40f0d0c9f2
|
Merge pull request #4321 from fmarcet/3.7
FIX: Email templates not compatible with Multicompany
|
2016-01-10 11:49:37 +01:00 |
|
Laurent Destailleur
|
e008922919
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
htdocs/admin/agenda_extsites.php
|
2016-01-08 14:45:53 +01:00 |
|
Laurent Destailleur
|
5414cb6f12
|
Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6
|
2016-01-08 14:43:20 +01:00 |
|
Laurent Destailleur
|
a26a6c2449
|
Fix sql injection even when code is on several lines
|
2016-01-08 14:43:04 +01:00 |
|
Laurent Destailleur
|
c2b8be9aaf
|
Merge pull request #4355 from GPCsolutions/3.6-4291
FIX #4291 Correctly filter external calendar GETPOSTs
|
2016-01-08 14:23:56 +01:00 |
|
Laurent Destailleur
|
36dc8b1ce7
|
FIX #4341
|
2016-01-08 13:57:53 +01:00 |
|
Raphaël Doursenaud
|
f2178f0369
|
FIX #4291 Correctly filter external calendar GETPOSTs
|
2016-01-08 06:42:28 +01:00 |
|
fmarcet
|
d8360a2a01
|
FIX: Email templates not compatible with Multicompany
|
2016-01-07 08:18:36 +01:00 |
|
fmarcet
|
cafe148f72
|
FIX: Email templates not compatible with Multicompany
|
2016-01-04 09:12:27 +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
|
0cad938e09
|
Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
htdocs/install/upgrade.php
|
2016-01-02 12:19:49 +01:00 |
|
Laurent Destailleur
|
b46aec8e7e
|
Fix to allow phpunit of migration process for 3.5 to 3.6
|
2016-01-02 12:18:26 +01:00 |
|
Laurent Destailleur
|
35ce670bf2
|
Fix to allow phpunit of migration process for 3.4 to 3.5
|
2016-01-02 12:18:12 +01:00 |
|
Laurent Destailleur
|
a234482d08
|
FIX #3694
|
2015-12-31 14:55:53 +01:00 |
|
Laurent Destailleur
|
c004342976
|
FIX #3694
|
2015-12-31 14:55:10 +01:00 |
|
fmarcet
|
cebb996120
|
FIX: Email templates not compatible with Multicompany
|
2015-12-29 11:22:18 +01:00 |
|
fmarcet
|
f8e156ea30
|
FIX: Email templates not compatible with Multicompany
|
2015-12-29 10:35:10 +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
|
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
|
70b73f2d51
|
Merge pull request #4306 from marcosgdf/bug-3980
FIX #3980 Search field in "product by supplier" list sends empty result 3.8 and 3.7
|
2015-12-27 17:38:33 +01:00 |
|
Marcos García de La Fuente
|
ebdaf7dfa6
|
FIX #3980 Search field in "product by supplier" list sends empty result 3.8 and 3.7
|
2015-12-27 15:12:02 +01:00 |
|
Regis Houssin
|
c65babf3b5
|
Merge remote-tracking branch 'origin/3.7' into 3.7_bug
|
2015-12-27 12:50:41 +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
|
9334cf8fd1
|
FIX #4243 sql injection
|
2015-12-19 18:03:08 +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
|
41cdb65521
|
Test to solve travis error
|
2015-12-18 21:44:18 +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
|
b47dc8a394
|
Fix to use new travis setup
|
2015-12-18 20:10:11 +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 |
|