Laurent Destailleur
d3ece31969
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/user/class/api_users.class.php
2021-05-17 19:29:03 +02:00
Laurent Destailleur
df2297bca3
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/user/class/api_users.class.php
2021-05-17 19:21:58 +02:00
Laurent Destailleur
a865f49d72
Fix phpcs
2021-05-17 19:19:26 +02:00
Laurent Destailleur
c54e010126
Fix perms on API user
2021-05-17 16:16:45 +02:00
stickler-ci
a3aba28c95
Fixing style errors.
2021-05-17 10:06:41 +00:00
Dorian Vabre
547f1dd370
Fix: user rest api rights
2021-05-17 11:54:53 +02:00
Laurent Destailleur
2f2ba933f8
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/core/tpl/admin_extrafields_view.tpl.php
htdocs/user/class/usergroup.class.php
2021-05-17 07:33:28 +02:00
Laurent Destailleur
5a15dbf545
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/user/class/usergroup.class.php
2021-05-17 07:29:19 +02:00
piernov
1cbe0e3f2d
Fix: properly set gid for Group LDAP synchro
...
Even if the gidNumber field was set in the configuration, a gid different from the Dolibarr's one was generated and stored into LDAP.
Now the gidNumber is properly set to Dolibarr's gid if gidNumber field is set in the LDAP module configuration.
2021-05-15 18:01:34 +02:00
Laurent Destailleur
8410f4a9c9
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/admin/mails_templates.php
htdocs/societe/consumption.php
htdocs/user/class/user.class.php
2021-05-06 16:57:49 +02:00
Laurent Destailleur
f6f4968af6
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/societe/consumption.php
2021-05-06 16:52:36 +02:00
Marc de Lima Lucio
139ae3db00
FIX: pgsql: prevent 'WHERE 1'
2021-05-05 11:49:11 +02:00
Laurent Destailleur
52213d0ac7
Fix duplicate permissions
2021-04-09 21:15:43 +02:00
Laurent Destailleur
13378897a8
FIX Report by Ricardo Matias
...
Conflicts:
test/phpunit/SecurityTest.php
2021-01-25 22:52:30 +01:00
Laurent Destailleur
934070f14e
Backport FIx #15970
2021-01-19 10:56:46 +01:00
Florian HENRY
77f213832e
fix: update group name
2021-01-11 19:40:44 +01:00
Laurent Destailleur
87a452c6f4
Fix warning
2020-12-30 12:16:01 +01:00
Laurent Destailleur
af41c06822
Fix warnings
2020-12-29 04:27:16 +01:00
Laurent Destailleur
11a122176d
Clean code
2020-12-24 02:33:11 +01:00
Laurent Destailleur
11b15557eb
Clean code
2020-12-24 02:09:11 +01:00
Laurent Destailleur
64e2ddbd80
Merge pull request #15666 from Zebedeu/develop
...
New #8472 personal and professional titles added
2020-12-07 22:40:01 +01:00
Frédéric FRANCE
4e18f46f28
doxygen
2020-12-05 23:53:55 +01:00
Zebedeu
6d2159e8f0
New #8472 personal and professional titles added
...
personal and professional titles added for employee users
2020-12-05 11:30:18 +01:00
Laurent Destailleur
9137713056
Debug v13
2020-12-03 00:40:41 +01:00
Laurent Destailleur
6a8ddacb33
Prepare database to allow to disconnect other session after a password
...
change
2020-11-29 21:01:57 +01:00
stickler-ci
0b408b8012
Fixing style errors.
2020-11-28 09:32:02 +00:00
ptibogxiv
34894c15e0
New get permissions for connected user by API
2020-11-28 10:28:23 +01:00
Laurent Destailleur
1f69f4ed5d
Fix deprecated
2020-11-13 19:39:59 +01:00
Laurent Destailleur
283a42c086
Fix bad key
2020-11-13 19:38:44 +01:00
Laurent Destailleur
bf8de86091
Merge pull request #15354 from frederic34/patch-14
...
Update adherent.class.php
2020-11-12 12:38:39 +01:00
Frédéric FRANCE
05410ebbb3
Update user.class.php
2020-11-11 09:26:13 +01:00
Frédéric FRANCE
36cd4a8d4d
Update user.class.php
2020-11-11 07:39:09 +01:00
Frédéric FRANCE
d28249d568
Update user.class.php
2020-11-11 07:35:33 +01:00
Frédéric FRANCE
b783a8775d
Update user.class.php
2020-11-11 07:31:10 +01:00
Frédéric FRANCE
0f8fc7ef2b
Update user.class.php
2020-11-10 21:46:51 +01:00
Frédéric FRANCE
fd078ef713
Update user.class.php
2020-11-10 21:43:45 +01:00
Scrutinizer Auto-Fixer
f6e3f58fcb
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-11-09 14:18:56 +00:00
Laurent Destailleur
924923ec41
Fix warning
2020-11-07 19:48:42 +01:00
Laurent Destailleur
95c35b2dc3
Fix warning
2020-11-07 19:25:04 +01:00
Laurent Destailleur
a71d50db9e
Clean code
2020-11-07 15:57:38 +01:00
Laurent Destailleur
bb2c35ae18
Fix warning
2020-11-07 15:28:10 +01:00
Laurent Destailleur
eba73101b9
Merge pull request #15210 from frederic34/zapieruser
...
work on zapier
2020-11-06 18:49:23 +01:00
Laurent Destailleur
b8f6e7f214
Fix var not defined
2020-11-06 16:28:26 +01:00
Frédéric FRANCE
545f39aacf
add work
2020-11-05 19:00:45 +01:00
Frédéric FRANCE
5d90611795
Merge remote-tracking branch 'upstream/develop' into zapieruser
2020-11-05 14:42:37 +01:00
Laurent Destailleur
f27508cf2f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/projet/class/project.class.php
2020-11-05 09:42:07 +01:00
Laurent Destailleur
72e94edae4
Fix permission on project for external user that are external contact
2020-11-05 09:40:37 +01:00
Frédéric FRANCE
32391d211a
doxygen
2020-11-05 08:55:04 +01:00
Frédéric FRANCE
6e7448a1d0
Merge remote-tracking branch 'upstream/develop' into zapieruser
2020-11-04 19:00:10 +01:00
Laurent Destailleur
7294a47ef5
Fix generation of user from member, contact, applications for job
2020-11-04 13:33:52 +01:00
