Laurent Destailleur
|
2311912d8a
|
Merge branch 'develop' into dev_importproduct_measuringunit
|
2019-02-13 16:35:46 +01:00 |
|
Laurent Destailleur
|
69313cbf0d
|
Merge pull request #10567 from frederic34/patch-18
Update images.lib.php
|
2019-02-13 16:25:32 +01:00 |
|
Laurent Destailleur
|
903ba57e09
|
Merge pull request #10565 from frederic34/patch-2
fix doc in tax.lib.php
|
2019-02-13 16:25:12 +01:00 |
|
Laurent Destailleur
|
534eac1a54
|
Merge pull request #10566 from frederic34/patch-17
Update rssparser.class.php
|
2019-02-13 16:24:45 +01:00 |
|
Laurent Destailleur
|
ced386fdca
|
Fix phpcs
|
2019-02-13 11:32:00 +01:00 |
|
florian HENRY
|
de87321c15
|
fix travcis
|
2019-02-13 10:28:08 +01:00 |
|
florian HENRY
|
e2d13c0e1f
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
dev_importproduct_measuringunit
Conflicts:
htdocs/contact/consumption.php
htdocs/webservices/server_productorservice.php
|
2019-02-13 09:23:52 +01:00 |
|
florian HENRY
|
5c059c897d
|
fix travis (mosty for dev no conerne by my changes)
|
2019-02-13 09:21:14 +01:00 |
|
florian HENRY
|
d88475c61a
|
Merge branch 'develop' of local repository into dev_importproduct_measuringunit
|
2019-02-13 08:59:18 +01:00 |
|
Frédéric FRANCE
|
e4b73e8273
|
Update images.lib.php
|
2019-02-12 23:39:59 +01:00 |
|
Frédéric FRANCE
|
fa31f95356
|
Update rssparser.class.php
|
2019-02-12 23:31:21 +01:00 |
|
Frédéric FRANCE
|
2aae952760
|
fix doc in tax.lib.php
|
2019-02-12 23:25:26 +01:00 |
|
Laurent Destailleur
|
5fceee3048
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/install/mysql/migration/8.0.0-9.0.0.sql
|
2019-02-12 19:02:19 +01:00 |
|
Laurent Destailleur
|
affbd20cdb
|
FIX Bad link in menu manager
|
2019-02-12 18:56:32 +01:00 |
|
florian HENRY
|
eba4be2335
|
ad missing files
|
2019-02-12 17:03:47 +01:00 |
|
Laurent Destailleur
|
d134e18db6
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-02-12 17:02:37 +01:00 |
|
Laurent Destailleur
|
0d8447ad39
|
Merge branch 'develop' of https://github.com/wdammak/dolibarr into
wdammak-develop
# Conflicts:
# htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php
|
2019-02-12 16:58:55 +01:00 |
|
florian HENRY
|
5b5f96bafb
|
NEW : measuring unit dictionnary and product size/unit import
|
2019-02-12 16:58:11 +01:00 |
|
Alexandre SPANGARO
|
b99149b940
|
Move error on function dol_include_once() to LOG_WARNING
|
2019-02-12 16:34:52 +01:00 |
|
Laurent Destailleur
|
205152501e
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
.travis.yml
htdocs/public/payment/newpayment.php
|
2019-02-12 13:39:39 +01:00 |
|
Laurent Destailleur
|
e054b080a5
|
Merge branch 'develop' into GenericFunctionsFunctionCallArgumentSpacing
|
2019-02-12 13:33:39 +01:00 |
|
Laurent Destailleur
|
e8fc72ecf4
|
Merge pull request #10538 from frederic34/html5boxes
replace html align by class in boxes
|
2019-02-12 13:32:42 +01:00 |
|
Laurent Destailleur
|
b1088f556f
|
Merge pull request #10536 from grandoc/new_branch_09_02_2019
language internationalization
|
2019-02-12 13:28:56 +01:00 |
|
Laurent Destailleur
|
1c3520d040
|
Merge pull request #10552 from ATM-Nicolas/fix_default_fontawesome_signout_icon
FIX : Default sign out icon if not using Font Awesome 5
|
2019-02-12 13:12:58 +01:00 |
|
Laurent Destailleur
|
f42d07d6da
|
Merge pull request #10529 from frederic34/patch-2
desactivate button on click to avoid multiple clicks
|
2019-02-12 13:12:30 +01:00 |
|
ATM-Nicolas
|
4e35ebe52a
|
FIX : Default sign out icon if not using Font Awesome 5
|
2019-02-12 10:43:00 +01:00 |
|
Laurent Destailleur
|
a62bccaf24
|
Fix phpcs
|
2019-02-11 19:19:05 +01:00 |
|
Laurent Destailleur
|
f0e56abac7
|
NEW Module ticket is available as a stable module
|
2019-02-11 19:16:37 +01:00 |
|
Laurent Destailleur
|
27cad29e1e
|
Fix regression of right alignement
|
2019-02-11 15:06:52 +01:00 |
|
Laurent Destailleur
|
c095f802dd
|
Dolibarrize module ticket
|
2019-02-11 14:51:59 +01:00 |
|
Laurent Destailleur
|
0bd30b160a
|
Fix picto logout with fontawesome 5
|
2019-02-11 11:55:48 +01:00 |
|
Frédéric FRANCE
|
152d8ffcbf
|
Merge remote-tracking branch 'upstream/develop' into GenericFunctionsFunctionCallArgumentSpacing
|
2019-02-10 11:08:59 +01:00 |
|
Frédéric FRANCE
|
1e43f8e54a
|
PEAR FunctionCallSignature
|
2019-02-10 10:45:49 +01:00 |
|
Frédéric FRANCE
|
529354718b
|
replace html align by class in boxes
|
2019-02-09 15:24:21 +01:00 |
|
Laurent Destailleur
|
2d4ccec309
|
Fix document generation of modulebuilder
|
2019-02-09 14:12:36 +01:00 |
|
Laurent Destailleur
|
522afd8e7b
|
Fix font awesome 5
|
2019-02-09 13:11:02 +01:00 |
|
Frédéric FRANCE
|
580e5c42d2
|
GenericFunctionsFunctionCallArgumentSpacing
|
2019-02-09 12:00:49 +01:00 |
|
Philippe Grand
|
92ec149fb6
|
Update modules_fichinter.php
|
2019-02-09 11:05:52 +01:00 |
|
Philippe GRAND
|
869f59de96
|
language internationalization
|
2019-02-09 10:56:59 +01:00 |
|
Laurent Destailleur
|
5483856543
|
Fix phpcs
|
2019-02-08 23:53:40 +01:00 |
|
Laurent Destailleur
|
7625eb7cd4
|
Fix missing error management after afterPDFCreation hook.
Removed dead code
|
2019-02-08 19:54:24 +01:00 |
|
Laurent Destailleur
|
e2934a6b5f
|
Error message returned by old non "addreplace" hooks is propagated too
|
2019-02-08 19:38:52 +01:00 |
|
Laurent Destailleur
|
a916708068
|
Fix missing disable dependency
|
2019-02-08 19:01:47 +01:00 |
|
Laurent Destailleur
|
ed733fb82d
|
Fix phpcs
|
2019-02-08 13:28:10 +01:00 |
|
Laurent Destailleur
|
8760b1e592
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-02-08 12:57:50 +01:00 |
|
Laurent Destailleur
|
27da574e38
|
Fix phpcs
|
2019-02-08 12:36:33 +01:00 |
|
Laurent Destailleur
|
1611c613f5
|
Fix phpcs
|
2019-02-08 12:19:51 +01:00 |
|
Laurent Destailleur
|
ec686a8f79
|
Fix phpcs
|
2019-02-08 11:30:20 +01:00 |
|
Laurent Destailleur
|
38d4284638
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/db/pgsql.class.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/filefunc.inc.php
htdocs/imports/import.php
htdocs/supplier_proposal/card.php
|
2019-02-08 11:26:08 +01:00 |
|
Frédéric FRANCE
|
f548a0ed79
|
desactivate button on click to avoid multiple clicks
|
2019-02-08 11:01:47 +01:00 |
|