Laurent Destailleur
|
5a6bdf9b5d
|
experiment
|
2020-11-28 03:56:40 +01:00 |
|
Laurent Destailleur
|
9147c85d9f
|
Fix size of roboto font
|
2020-11-28 03:35:32 +01:00 |
|
Laurent Destailleur
|
c85b349c93
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-11-28 03:32:41 +01:00 |
|
Laurent Destailleur
|
e4128bad80
|
Fix management of Robot font
|
2020-11-28 03:32:25 +01:00 |
|
Laurent Destailleur
|
fcf59180eb
|
Merge pull request #15541 from b92/patch-2
Use email model option to joint file for subscription
|
2020-11-28 02:27:07 +01:00 |
|
Laurent Destailleur
|
aa21af27db
|
Update subscription.php
|
2020-11-28 02:24:25 +01:00 |
|
Laurent Destailleur
|
be39e50214
|
Merge pull request #15567 from andreubisquerra/develop
Improve free entries printing in TakePOS
|
2020-11-28 02:19:14 +01:00 |
|
Laurent Destailleur
|
f7c4ad646f
|
Merge pull request #15561 from frederic34/addecmcard
doxygen
|
2020-11-28 02:14:34 +01:00 |
|
Laurent Destailleur
|
df461d319e
|
Fix warning
|
2020-11-28 02:12:07 +01:00 |
|
Laurent Destailleur
|
7e6af6a54f
|
FIX translation not loaded for error message of numbering modules
|
2020-11-28 02:09:27 +01:00 |
|
Laurent Destailleur
|
7c4599a5c5
|
Look and feel v13
|
2020-11-28 01:15:23 +01:00 |
|
Laurent Destailleur
|
1685b5396c
|
Fix warning
|
2020-11-28 00:59:07 +01:00 |
|
andreubisquerra
|
c9c2869eec
|
Fix travis
|
2020-11-27 19:45:40 +01:00 |
|
andreubisquerra
|
c3bc662675
|
Improve free entries printing in TakePOS
Improve free entries printing with Receipt Printer module in TakePOS
|
2020-11-27 19:24:27 +01:00 |
|
Laurent Destailleur
|
4119174ef1
|
Include sql injection tests into PHPUnit
|
2020-11-27 16:52:52 +01:00 |
|
Laurent Destailleur
|
657749375f
|
Avoid error
|
2020-11-27 16:47:13 +01:00 |
|
Laurent Destailleur
|
73790a0958
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/expedition/card.php
|
2020-11-27 16:21:32 +01:00 |
|
Laurent Destailleur
|
c6b2ee57ca
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
.travis.yml
|
2020-11-27 16:19:44 +01:00 |
|
Laurent Destailleur
|
5ed2bbb204
|
Fix error message
|
2020-11-27 16:13:27 +01:00 |
|
Laurent Destailleur
|
574919de52
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
.travis.yml
htdocs/accountancy/bookkeeping/balance.php
htdocs/adherents/class/subscription.class.php
htdocs/compta/bank/categ.php
htdocs/compta/facture/class/facture.class.php
htdocs/core/boxes/box_task.php
htdocs/core/class/commondocgenerator.class.php
htdocs/core/class/interfaces.class.php
htdocs/core/lib/project.lib.php
htdocs/core/modules/modCategorie.class.php
htdocs/expensereport/class/expensereport.class.php
htdocs/fichinter/class/fichinterrec.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/install/repair.php
htdocs/main.inc.php
htdocs/product/price.php
htdocs/projet/tasks/time.php
htdocs/reception/card.php
|
2020-11-27 15:45:12 +01:00 |
|
Laurent Destailleur
|
4a5cdd0092
|
Several fixes in export and repair tool
|
2020-11-27 15:27:35 +01:00 |
|
Laurent Destailleur
|
9ce6d87b83
|
Clean code
|
2020-11-27 15:04:58 +01:00 |
|
Laurent Destailleur
|
ac3c129735
|
Clean code
|
2020-11-27 14:24:15 +01:00 |
|
Frédéric FRANCE
|
b9bac939e6
|
doxygen
|
2020-11-27 09:11:30 +01:00 |
|
Laurent Destailleur
|
7ebab06111
|
css
|
2020-11-27 01:32:21 +01:00 |
|
Laurent Destailleur
|
7bf12c8720
|
Fix name into popup of member in list of subscriptions
|
2020-11-27 01:22:13 +01:00 |
|
Laurent Destailleur
|
47a5037155
|
Fix dolGetFirstLastname() for 4 and 5
|
2020-11-27 01:18:01 +01:00 |
|
Laurent Destailleur
|
0834e4801e
|
Merge pull request #15554 from frederic34/mailing
doxygen
|
2020-11-27 01:01:52 +01:00 |
|
Laurent Destailleur
|
01176e2422
|
Merge pull request #15553 from frederic34/adminmenu
remove warnings
|
2020-11-27 01:00:21 +01:00 |
|
Laurent Destailleur
|
2cf005d22c
|
Removed warning
|
2020-11-27 00:39:49 +01:00 |
|
Laurent Destailleur
|
250b42f60a
|
Fix phpcs
|
2020-11-27 00:37:36 +01:00 |
|
Laurent Destailleur
|
26f07992a9
|
Reduce travis load for v11
|
2020-11-27 00:27:52 +01:00 |
|
Frédéric FRANCE
|
fa6d02fb3f
|
doxygen
|
2020-11-27 00:25:45 +01:00 |
|
Frédéric FRANCE
|
bb09c84417
|
doxygen
|
2020-11-27 00:23:03 +01:00 |
|
Laurent Destailleur
|
6de24e0c2e
|
Reduce travis load for v12
|
2020-11-27 00:19:45 +01:00 |
|
Frédéric FRANCE
|
446997d0ba
|
doxygen
|
2020-11-27 00:15:07 +01:00 |
|
Frédéric FRANCE
|
12dce9cd75
|
avoid large screen for code
|
2020-11-26 23:53:10 +01:00 |
|
Laurent Destailleur
|
97f6efb079
|
Fix avoid to trigger sql injection detection
|
2020-11-26 23:50:00 +01:00 |
|
Frédéric FRANCE
|
f03930e55e
|
doxygen
|
2020-11-26 23:49:42 +01:00 |
|
Laurent Destailleur
|
b6640da281
|
Fix javascript obfuscating with HTML comments
|
2020-11-26 23:37:35 +01:00 |
|
Laurent Destailleur
|
19339bb0ea
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/mails_templates.php
|
2020-11-26 23:09:31 +01:00 |
|
Laurent Destailleur
|
4da4499569
|
FIX Param joinfiles not sanitized
Conflicts:
htdocs/admin/mails_templates.php
|
2020-11-26 23:07:52 +01:00 |
|
Laurent Destailleur
|
4114201da9
|
FIX Param joinfiles not sanitized
|
2020-11-26 23:05:49 +01:00 |
|
Laurent Destailleur
|
61c0c7f0a6
|
Fix GETPOST second param
|
2020-11-26 22:59:05 +01:00 |
|
Laurent Destailleur
|
b3b511a6d4
|
FIX #15546
|
2020-11-26 22:44:11 +01:00 |
|
Laurent Destailleur
|
5d9098795f
|
Fix labels in combo
|
2020-11-26 19:17:09 +01:00 |
|
Laurent Destailleur
|
084b2411df
|
Merge pull request #15550 from OPEN-DSI/new-supplier-product-list-with-stock
NEW show stock in supplier product select list
|
2020-11-26 18:56:04 +01:00 |
|
Laurent Destailleur
|
b92064ba2f
|
Merge pull request #15549 from Thatoo/patch-1
Update sync_members_types_dolibarr2ldap.php
|
2020-11-26 18:53:33 +01:00 |
|
Laurent Destailleur
|
82da0d01f1
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/html.formorder.class.php
htdocs/fourn/commande/list.php
|
2020-11-26 18:52:00 +01:00 |
|
Laurent Destailleur
|
9aa657bc35
|
Debug v13
|
2020-11-26 18:48:51 +01:00 |
|