Laurent Destailleur
|
2c6672d17a
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/tpl/login.tpl.php
|
2017-01-12 11:32:51 +01:00 |
|
Laurent Destailleur
|
c42b48636a
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
Conflicts:
htdocs/commande/class/api_commande.class.php
htdocs/core/class/CMailFile.class.php
htdocs/societe/class/api_contact.class.php
|
2017-01-12 11:06:24 +01:00 |
|
Laurent Destailleur
|
762dd8030e
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
|
2017-01-12 10:59:41 +01:00 |
|
Laurent Destailleur
|
7476a3c8ae
|
Fix error during migration
|
2017-01-12 10:59:27 +01:00 |
|
Laurent Destailleur
|
e802ff3385
|
Fix POO declaration
|
2017-01-12 10:57:15 +01:00 |
|
Laurent Destailleur
|
5e71ff816f
|
Increase limit for better backward compatibility without loosing minimum
security.
|
2017-01-12 10:51:31 +01:00 |
|
Laurent Destailleur
|
351c416ed8
|
Merge pull request #6265 from hregis/4.0_bug
Fix: avoid errors if constants values not exists
|
2017-01-12 10:49:23 +01:00 |
|
Laurent Destailleur
|
721534d676
|
Merge pull request #6264 from atm-florian/5.0
fix : warehouse creation failed with mysql 5.7 (string 'NULL' instead of "NULL")
|
2017-01-12 10:39:13 +01:00 |
|
Laurent Destailleur
|
f408c886b6
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0
|
2017-01-12 10:16:32 +01:00 |
|
Laurent Destailleur
|
3d8c5b377b
|
Fix string not translated
|
2017-01-12 10:16:19 +01:00 |
|
Laurent Destailleur
|
29a8c8105e
|
Merge pull request #6258 from aljawaid/patch-1
Fix: User-friendly Tooltip
|
2017-01-12 10:12:51 +01:00 |
|
Laurent Destailleur
|
46e330f749
|
Merge pull request #6256 from aspangaro/5.0-23
Fix : Bank - Presentation, no titlefield in a list
|
2017-01-12 10:09:38 +01:00 |
|
Laurent Destailleur
|
7a8a95c815
|
Merge pull request #6249 from KiteAtao/4.0
Fix #6247 #6248 Contact and Commands REST WebServices failed
|
2017-01-12 10:08:32 +01:00 |
|
Laurent Destailleur
|
4ea78d20f0
|
Merge pull request #6251 from aspangaro/5.0-22
Fix : Bank - Missing language file
|
2017-01-12 10:06:42 +01:00 |
|
Laurent Destailleur
|
14fb01da11
|
Merge pull request #6250 from gnovaro/patch-6
Bug: Fix missing ,
|
2017-01-12 10:06:01 +01:00 |
|
Laurent Destailleur
|
749f8cf252
|
Fix translation
|
2017-01-12 00:15:00 +01:00 |
|
Laurent Destailleur
|
94f14f529b
|
Fix pb with double quote
|
2017-01-11 22:02:08 +01:00 |
|
Regis Houssin
|
5898d27609
|
Fix: avoid errors if constants values not exists
|
2017-01-11 16:47:17 +01:00 |
|
Laurent Destailleur
|
5553be4aa9
|
Fix code comment
|
2017-01-11 16:08:04 +01:00 |
|
florian HENRY
|
2c2bb366bd
|
fix : warehouse creation failed with mysql 5.7 (string 'NULL' instead of
"NULL")
|
2017-01-11 09:19:07 +01:00 |
|
Laurent Destailleur
|
cb7cd3baaf
|
Use mariadb as default to be debian compliant with
https://wiki.debian.org/Teams/MySQL/virtual-mysql-server
|
2017-01-10 10:23:50 +01:00 |
|
Laurent Destailleur
|
1559c45a61
|
FIX link for not found photo when using gravatar. Must use external url
|
2017-01-10 09:24:55 +01:00 |
|
Laurent Destailleur
|
70e6c2d41f
|
Fix bad count of nb of contacts in statistics
|
2017-01-10 00:42:28 +01:00 |
|
Laurent Destailleur
|
5c233a41b3
|
NEW Add hook "formatNotificationMessage"
|
2017-01-09 23:55:53 +01:00 |
|
Laurent Destailleur
|
93ab224614
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-01-09 23:33:36 +01:00 |
|
Laurent Destailleur
|
c4ff1f983c
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-01-09 23:32:36 +01:00 |
|
Laurent Destailleur
|
decbda3e23
|
Fix inversion application name - company name
|
2017-01-09 23:26:31 +01:00 |
|
Laurent Destailleur
|
a9354e5f27
|
Fix generic text must be set before specific for notification
|
2017-01-09 21:07:54 +01:00 |
|
IJ
|
635abe58be
|
User-friendly tooltip
|
2017-01-09 10:14:11 +00:00 |
|
Laurent Destailleur
|
8ab0ad3b72
|
Fix css
|
2017-01-09 10:36:24 +01:00 |
|
Laurent Destailleur
|
c9cce66d98
|
Merge remote-tracking branch 'origin/5.0' into develop
|
2017-01-09 10:25:05 +01:00 |
|
Laurent Destailleur
|
52666ea971
|
Merge remote-tracking branch 'origin/5.0' into develop
|
2017-01-09 10:22:20 +01:00 |
|
Laurent Destailleur
|
fd008f88b1
|
Add github tools
|
2017-01-09 10:21:59 +01:00 |
|
Laurent Destailleur
|
03aa8343fd
|
Fix css
|
2017-01-09 10:21:35 +01:00 |
|
Laurent Destailleur
|
62a668d899
|
Fix https link
|
2017-01-09 10:02:17 +01:00 |
|
aspangaro
|
a583fd7a3b
|
Fix : Bank - Presentation, no titlefield in a list
|
2017-01-08 20:52:42 +01:00 |
|
Laurent Destailleur
|
dba777c57b
|
Fix missing field alias
|
2017-01-08 12:10:07 +01:00 |
|
Laurent Destailleur
|
1856b5cfb8
|
Fix filter on status for third parties
|
2017-01-08 11:50:43 +01:00 |
|
Laurent Destailleur
|
913df73ed9
|
Fix css
|
2017-01-08 11:31:39 +01:00 |
|
Laurent Destailleur
|
41832a0c26
|
Fix neutral color on login (no theme yet selected)
|
2017-01-08 11:20:29 +01:00 |
|
aspangaro
|
dc605c915a
|
Fix : Bank - Missing language file
|
2017-01-08 07:46:30 +01:00 |
|
Gustavo Novaro
|
3e77fed815
|
Fix missing ,
|
2017-01-08 01:59:04 -03:00 |
|
Laurent Destailleur
|
8e615a83e5
|
Better tooltip
|
2017-01-08 01:07:28 +01:00 |
|
Laurent Destailleur
|
76a53dfb7d
|
FIX Accept spaces around the | criteria
|
2017-01-08 01:01:34 +01:00 |
|
Laurent Destailleur
|
785b2d46b3
|
FIX Accept spaces around the | criteria
|
2017-01-08 01:00:47 +01:00 |
|
Laurent Destailleur
|
2c1477ecea
|
Revert "FIX Accept spaces around the | criteria"
This reverts commit 37d158f159.
|
2017-01-07 21:50:14 +01:00 |
|
KiteAtao
|
5c76229cdf
|
Fix Commands Api for REST WebServices
|
2017-01-07 21:46:49 +01:00 |
|
Laurent Destailleur
|
163ee094ec
|
Revert "FIX Accept spaces around the | criteria"
This reverts commit df9121d6fa.
|
2017-01-07 21:46:26 +01:00 |
|
KiteAtao
|
3bb1756a13
|
Fix Contact Api for REST WebServices
|
2017-01-07 21:37:45 +01:00 |
|
Laurent Destailleur
|
37d158f159
|
FIX Accept spaces around the | criteria
|
2017-01-07 21:34:12 +01:00 |
|