Laurent Destailleur
|
5d7a1f1265
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/contact/card.php
htdocs/core/class/extrafields.class.php
htdocs/langs/en_US/stocks.lang
|
2019-11-19 19:02:14 +01:00 |
|
florian HENRY
|
010219bf09
|
fix title pasge linked files user
|
2019-11-18 19:47:34 +01:00 |
|
Scrutinizer Auto-Fixer
|
1648fc142e
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-16 22:24:29 +00:00 |
|
Laurent Destailleur
|
e7276f9044
|
Fix scrutinizer error
|
2019-11-16 23:22:28 +01:00 |
|
Laurent Destailleur
|
2689f7515c
|
Fix pb with colspan and extrafields.
Fix remove empty id
|
2019-11-16 14:38:05 +01:00 |
|
Laurent Destailleur
|
07be51c2fc
|
Merge pull request #12447 from hregis/develop_mc
FIX better look compatibility with Multicompany
|
2019-11-16 00:49:37 +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
|
81aed6a1f7
|
Merge pull request #12442 from frederic34/patch-7
doxygen
|
2019-11-16 00:39:40 +01:00 |
|
Regis Houssin
|
bb8a4e9efc
|
FIX better look compatibility with Multicompany
|
2019-11-15 09:02:21 +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
|
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
|
f7ab1498a7
|
FIX Advisory ID: usd20190053
|
2019-11-14 17:00:02 +01: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
|
171b94fc5c
|
Merge pull request #12429 from Dolibarr/scrutinizer-patch-5
Scrutinizer Auto-Fixes
|
2019-11-14 08:50:24 +01:00 |
|
Scrutinizer Auto-Fixer
|
b40ecc3933
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-13 18:37:08 +00:00 |
|
Scrutinizer Auto-Fixer
|
ac40dd8bbe
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-13 18:35:39 +00:00 |
|
Scrutinizer Auto-Fixer
|
df664e790b
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-11 23:15:34 +00:00 |
|
Scrutinizer Auto-Fixer
|
2ecfe41810
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-08 09:53:31 +00:00 |
|
Scrutinizer Auto-Fixer
|
0b406172fd
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-07 11:59:59 +00:00 |
|
Frédéric FRANCE
|
35751a80ab
|
100% centpercent
|
2019-11-05 21:24:41 +01:00 |
|
Laurent Destailleur
|
94bd0f71d9
|
Fix pb with permission
|
2019-11-05 19:41:30 +01:00 |
|
Laurent Destailleur
|
1aef1c60dd
|
Merge pull request #11867 from frederic34/socialnetworks
NEW add socialnetworks dictionary
|
2019-11-04 21:10:22 +01:00 |
|
Laurent Destailleur
|
aeb2361d2d
|
Merge pull request #12324 from frederic34/patch-13
replace societe_id by socid
|
2019-11-04 20:57:43 +01:00 |
|
Frédéric FRANCE
|
88ad997eec
|
Update home.php
|
2019-11-04 20:29:33 +01:00 |
|
Frédéric FRANCE
|
f6aa9bf220
|
Update hierarchy.php
|
2019-11-04 20:28:10 +01:00 |
|
Frédéric FRANCE
|
d59b0a33f3
|
Fix external/internal status in user tooltip list
|
2019-11-04 20:16:34 +01:00 |
|
Laurent Destailleur
|
ec8bd6327d
|
Fix css
|
2019-11-04 18:53:46 +01:00 |
|
Frédéric FRANCE
|
872f58f261
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-11-03 21:48:24 +01:00 |
|
Laurent Destailleur
|
13c42913d9
|
Trans
|
2019-11-02 15:20:35 +01:00 |
|
Laurent Destailleur
|
e087ac434d
|
Merge pull request #12283 from frederic34/socid
replace deprecated user->societe_id by user->socid
|
2019-11-02 13:34:21 +01:00 |
|
Laurent Destailleur
|
58ffb73627
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-11-02 12:59:49 +01:00 |
|
Laurent Destailleur
|
45c77b4560
|
Renaming some libelle into label
|
2019-11-02 12:59:38 +01:00 |
|
Laurent Destailleur
|
25e64b0610
|
Merge branch 'develop' into socid
|
2019-11-02 12:01:06 +01:00 |
|
Laurent Destailleur
|
68691ddd8a
|
Merge pull request #12265 from grandoc/new_branch_30_10_2019
add comment
|
2019-11-02 11:49:28 +01:00 |
|
Laurent Destailleur
|
f9031cdbfd
|
Clean code
|
2019-11-02 11:36:48 +01:00 |
|
Frédéric FRANCE
|
77d4ca81dc
|
Merge remote-tracking branch 'upstream/develop' into socid
|
2019-11-02 09:14:15 +01:00 |
|
Laurent Destailleur
|
cea2c3a9f4
|
Look and feel v11
|
2019-11-01 23:58:14 +01:00 |
|
Frédéric FRANCE
|
dbed10a701
|
Merge remote-tracking branch 'upstream/develop' into socid
|
2019-11-01 21:39:20 +01:00 |
|
Laurent Destailleur
|
e3b5be7475
|
All properties 'libstatut', 'labelstatut', 'labelstatus' were renamed
into 'labelStatus'.
All properties 'labelstatusshort' and 'labelstatut_short' were renamed
into 'labelStatusShort'.
|
2019-11-01 12:52:03 +01:00 |
|
Laurent Destailleur
|
68a4ddceed
|
Look and feel v11
|
2019-10-31 23:29:17 +01:00 |
|
Frédéric FRANCE
|
e93aaa2a75
|
replace deprecated user->societe_id by user->socid
|
2019-10-31 20:46:31 +01:00 |
|
Frédéric FRANCE
|
f7747ed00a
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-30 20:06:43 +01:00 |
|
Philippe GRAND
|
1a0723c1cd
|
add some comment
|
2019-10-30 10:13:57 +01:00 |
|
Laurent Destailleur
|
488edec3a8
|
Merge pull request #12226 from ptibogxiv/patch-271
NEW add office phone & job on user tooltips
|
2019-10-30 03:11:28 +01:00 |
|
Frédéric FRANCE
|
16f58f1eee
|
clean indent
|
2019-10-27 10:38:52 +01:00 |
|
ptibogxiv
|
6f52ae80fe
|
Update user.class.php
|
2019-10-26 15:01:40 +02:00 |
|
ptibogxiv
|
49f5e54a8b
|
Update user.class.php
|
2019-10-25 18:10:04 +02:00 |
|