Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
81,180 Commits 36 Branches 189 Tags
0a125f73b5ae8ef858ec3a901b2f68045ddbb16c
Commit Graph

731 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Laurent Destailleur
cea2c3a9f4 Look and feel v11 2019-11-01 23:58:14 +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
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
ptibogxiv
7c8efc741e Update user.class.php 2019-10-25 17:20:09 +02:00
Frédéric FRANCE
f4540dddb8 Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-17 20:24:04 +02:00
Frédéric FRANCE
e75f7d448c Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
Frédéric FRANCE
d1d9b1ed85 Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-15 09:39:57 +02:00
Frédéric FRANCE
0ae1e8c2a9 Update api_users.class.php 2019-10-13 06:17:57 +02:00
Frédéric FRANCE
d9ba09bec1 Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-12 19:02:24 +02:00
Laurent Destailleur
51383ce6af FIX Reset of password can use email like the login. 2019-10-11 18:42:07 +02:00
Frédéric FRANCE
03bbfc6ad9 Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-10 23:24:50 +02:00
Laurent Destailleur
aebae5ff83 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/margins.lang
	htdocs/user/class/user.class.php
 2019-10-10 10:37:17 +02:00
Frédéric FRANCE
b78187c1eb Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-08 00:07:27 +02:00
Laurent Destailleur
839929f764 FIX #12026 2019-10-07 14:16:47 +02:00
Laurent Destailleur
0bd545e1ca Merge pull request #12026 from oscim/patch-6 
Fix error in triggers process
 2019-10-07 14:14:36 +02:00
Frédéric FRANCE
98023353fe Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-03 17:21:31 +02:00
oscim
d368bc1b6a Update user.class.php 
actually the create_from_member method does not require this change
 2019-10-03 15:58:40 +02:00
Laurent Destailleur
b60ee4c18c css 2019-10-03 09:58:49 +02:00
oscim
9f2ac7cae3 Fix error in triggers process 
If methode create_from_contact is called; In process this method containt call create methode, but trigger by action USER_CREATE is called twice. 
the call to the create method should not trigger triggers

same for the create_from_members method
 2019-10-03 09:47:06 +02:00
Frédéric FRANCE
aca9d92db8 Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-01 22:03:33 +02:00
Frédéric FRANCE
2ac908ffcf work on migration script 2019-10-01 19:59:49 +02:00
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
Frédéric FRANCE
cea3669ffa Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-09-28 00:35:14 +02:00
Laurent Destailleur
6858dce344 Rename table for categorie of warehouses 2019-09-27 13:28:28 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Frédéric FRANCE
6444c7378f Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-09-14 16:40:23 +02:00
Laurent Destailleur
d380ef1812 Update usergroup.class.php 2019-09-14 16:37:07 +02:00
Frédéric FRANCE
e4a0de245a work on user 2019-09-12 18:41:26 +02:00
Frédéric FRANCE
34f928556d work on user 2019-09-12 18:32:47 +02:00
Frédéric FRANCE
62922884fe specimens 2019-09-12 18:12:28 +02:00