Laurent Destailleur
|
e5daa73a9e
|
Merge pull request #12444 from frederic34/doxygen_menubase
doxygen menubase class
|
2019-11-16 00:45:30 +01:00 |
|
Laurent Destailleur
|
8a5e1a5a36
|
Merge pull request #12440 from OPEN-DSI/new-api-users-get-info
NEW get user connected informations in REST API
|
2019-11-16 00:44:41 +01:00 |
|
Laurent Destailleur
|
b44354af44
|
Merge pull request #12439 from ptibogxiv/patch-278
Fix adherent type v11
|
2019-11-16 00:42:22 +01:00 |
|
Laurent Destailleur
|
d2aa4ba54e
|
Update adherent_type.class.php
|
2019-11-16 00:41:55 +01:00 |
|
Laurent Destailleur
|
f8d54561cc
|
Merge pull request #12443 from frederic34/patch-8
doxygen
|
2019-11-16 00:39:53 +01:00 |
|
Laurent Destailleur
|
81aed6a1f7
|
Merge pull request #12442 from frederic34/patch-7
doxygen
|
2019-11-16 00:39:40 +01:00 |
|
Laurent Destailleur
|
3898db3956
|
FIX #12446
|
2019-11-16 00:39:23 +01:00 |
|
Laurent Destailleur
|
1f5bea01f5
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/html.formother.class.php
htdocs/core/lib/functions.lib.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/core/modules/facture/doc/pdf_sponge.modules.php
htdocs/core/modules/propale/doc/pdf_azur.modules.php
htdocs/core/modules/propale/doc/pdf_cyan.modules.php
htdocs/fourn/class/fournisseur.product.class.php
htdocs/product/fournisseurs.php
htdocs/user/card.php
|
2019-11-14 21:30:16 +01:00 |
|
Frédéric FRANCE
|
7100328116
|
doxygen menubase class
|
2019-11-14 21:25:12 +01:00 |
|
Laurent Destailleur
|
7e52c70321
|
FIX Advisory ID: usd20190067
|
2019-11-14 21:16:18 +01:00 |
|
ptibogxiv
|
332c91aa11
|
Update adherent_type.class.php
|
2019-11-14 20:10:14 +01:00 |
|
ptibogxiv
|
fc2e0d4f95
|
Update adherent_type.class.php
|
2019-11-14 20:09:36 +01:00 |
|
stickler-ci
|
f369fa06a6
|
Fixing style errors.
|
2019-11-14 19:04:18 +00:00 |
|
ptibogxiv
|
892b61f1c2
|
Update adherent_type.class.php
|
2019-11-14 20:02:44 +01:00 |
|
Frédéric FRANCE
|
67d05cae1b
|
doxygen
|
2019-11-14 19:06:14 +01:00 |
|
Frédéric FRANCE
|
e73202c2af
|
Update user.class.php
|
2019-11-14 18:47:16 +01:00 |
|
Frédéric FRANCE
|
91eb6eb7d7
|
Update user.class.php
|
2019-11-14 18:44:18 +01:00 |
|
Frédéric FRANCE
|
1936b11db8
|
doxygen
|
2019-11-14 18:40:30 +01:00 |
|
VESSILLER
|
4ea3fe7609
|
NEW get user connected informations in REST API
|
2019-11-14 17:57:29 +01:00 |
|
Laurent Destailleur
|
8ef9728470
|
Fix permission on file
|
2019-11-14 17:28:23 +01:00 |
|
stickler-ci
|
07880dd835
|
Fixing style errors.
|
2019-11-14 16:00:08 +00:00 |
|
Laurent Destailleur
|
f7ab1498a7
|
FIX Advisory ID: usd20190053
|
2019-11-14 17:00:02 +01:00 |
|
ptibogxiv
|
fee8e33e2b
|
Update type.php
|
2019-11-14 16:58:17 +01:00 |
|
stickler-ci
|
280c0a56b6
|
Fixing style errors.
|
2019-11-14 15:37:54 +00:00 |
|
ptibogxiv
|
ae2ddb1f1e
|
Fix adherent type v11
|
2019-11-14 16:36:07 +01:00 |
|
Laurent Destailleur
|
80b3e27341
|
Fix bad name of constant
|
2019-11-14 14:23:48 +01:00 |
|
Laurent Destailleur
|
7e0ae4bf0e
|
FIX The pdf templates were using the large logo making PDF too large
|
2019-11-14 14:17:22 +01:00 |
|
Laurent Destailleur
|
4fc7b8c3b1
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/tpl/extrafields_list_search_title.tpl.php
|
2019-11-14 12:49:42 +01:00 |
|
Laurent Destailleur
|
a29adc94f3
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/comm/card.php
htdocs/langs/en_US/admin.lang
|
2019-11-14 12:48:33 +01:00 |
|
Laurent Destailleur
|
ee800189a6
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-11-14 12:45:00 +01:00 |
|
Laurent Destailleur
|
9d963a7ca6
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-11-14 12:44:32 +01:00 |
|
Laurent Destailleur
|
7d997990fa
|
Fix phpcs
|
2019-11-14 12:44:15 +01:00 |
|
Laurent Destailleur
|
0e3d90f145
|
Fix syntax error
|
2019-11-14 12:42:44 +01:00 |
|
Laurent Destailleur
|
0b947cddae
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-11-14 12:15:50 +01:00 |
|
Laurent Destailleur
|
d36bf43d2d
|
Fix php error
|
2019-11-14 12:15:16 +01:00 |
|
Laurent Destailleur
|
8db4eff108
|
Merge pull request #12437 from Dolibarr/scrutinizer-patch-8
Scrutinizer Auto-Fixes
|
2019-11-14 12:10:44 +01:00 |
|
Laurent Destailleur
|
8cf9ed282b
|
Merge pull request #12436 from Dolibarr/scrutinizer-patch-7
Scrutinizer Auto-Fixes
|
2019-11-14 12:10:30 +01:00 |
|
Scrutinizer Auto-Fixer
|
f197196719
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-14 11:09:46 +00:00 |
|
Scrutinizer Auto-Fixer
|
ddcc14dc16
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-14 11:09:15 +00:00 |
|
Laurent Destailleur
|
f5da126cff
|
Fix property not defined
|
2019-11-14 12:01:01 +01:00 |
|
Laurent Destailleur
|
411e9c87e3
|
Debug feature to set sender profiles
|
2019-11-14 11:53:28 +01:00 |
|
Laurent Destailleur
|
52787b56b2
|
Fix when limit = 0
Look and feel v11
|
2019-11-14 11:00:49 +01:00 |
|
Laurent Destailleur
|
75667833fe
|
Fix missing ->msgid
|
2019-11-14 10:01:05 +01:00 |
|
Laurent Destailleur
|
95a6d7f8f5
|
Doxyen
|
2019-11-14 09:13:15 +01:00 |
|
Laurent Destailleur
|
ea05b8192d
|
Sort file
|
2019-11-14 09:01:46 +01:00 |
|
Laurent Destailleur
|
f87c6b82c5
|
Merge pull request #12433 from erpware/develop
Updated .gitignore and remove duplicated entries
|
2019-11-14 08:59:57 +01:00 |
|
Laurent Destailleur
|
dba640b281
|
Update .gitignore
|
2019-11-14 08:58:42 +01:00 |
|
Laurent Destailleur
|
523b5e74a6
|
Merge pull request #12431 from frederic34/patch-6
Update conf.class.php
|
2019-11-14 08:54:06 +01:00 |
|
Laurent Destailleur
|
56f2463a15
|
Merge branch 'develop' into patch-6
|
2019-11-14 08:53:53 +01:00 |
|
Laurent Destailleur
|
6b1d7f5382
|
Merge pull request #12432 from frederic34/patch-7
FIX #12385
|
2019-11-14 08:51:23 +01:00 |
|