Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-11 03:51:25 +01:00
Code Issues Packages Projects Releases Wiki Activity
125,218 Commits 36 Branches 190 Tags
c263fccb5f8bedd828ef2fd34b64b51fb8812c06
Commit Graph

1215 Commits

Author SHA1 Message Date
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
Frédéric FRANCE
9f3c54e5a5 definitions 2019-09-12 18:04:24 +02:00
Abbes Bahfir
4098ecfe17 Merge branch 'abb100077' of github.com:bafbes/dolibarr into abb100077 2019-09-12 11:30:14 +01:00
Abbes Bahfir
195ac8e8f6 fix : Tests for attributes exsitence in Use of posixAccount and posixGroup objectclass for users and groups in LDAP 2019-09-12 11:24:30 +01:00
stickler-ci
e5878c105a Fixing style errors. 2019-09-11 21:48:17 +00:00
Abbes Bahfir
5183a1ec7a New : Use of posixAccount and posixGroup objectclass for users and groups in LDAP 2019-09-11 22:45:52 +01:00
Laurent Destailleur
529dd05226 Replace deprecated code 2019-09-06 10:53:05 +02:00
Laurent Destailleur
fa476b4994 Properties ->libelle_incoterms were renamed into ->label_incoterms 2019-06-25 13:00:02 +02:00
Laurent Destailleur
22b91f3693 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-22 13:28:44 +02:00
Laurent Destailleur
0f808114e5 Sync transifex 
Fix CSS for Left To Right Languages
 2019-06-22 13:18:33 +02:00
Laurent Destailleur
b4e47d289b Code comment 2019-06-20 02:43:56 +02:00
Laurent Destailleur
663998bab1 Fix scrutinizer errors 2019-06-18 20:15:04 +02:00
Laurent Destailleur
525598f6aa Fix scrutinizer warnings 2019-06-18 20:01:28 +02:00
Laurent Destailleur
4b3d0ed50c Update user.class.php 2019-05-19 02:21:42 +02:00
Nicolas ZABOURI
61c17f8d0f FIX #11135 2019-05-19 02:06:37 +02:00
Regis Houssin
10da976b93 FIX try to fix phpcs error 2019-05-10 16:37:03 +02:00
Regis Houssin
9a6029b1d9 FIX disable phpcs 2019-05-10 16:12:16 +02:00