Commit Graph

1215 Commits

Author SHA1 Message Date
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
Florian HENRY
1b6a4fc4ae Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_add_tag_on_massaction 2020-12-24 15:00:15 +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
Florian HENRY
26d3ea2227 on going 2020-12-23 23:32:50 +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
Laurent Destailleur
5f290e0de1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-11-02 11:41:19 +01:00
Laurent Destailleur
83a7b19333 Look and feel v13 2020-11-02 11:41:07 +01:00
Laurent Destailleur
02fb63ac96 Merge pull request #15253 from frederic34/patch-6
Update user.class.php
2020-11-02 09:30:23 +01:00
Laurent Destailleur
20c70691e4 Better compatibility php8 2020-11-01 21:37:04 +01:00
Frédéric FRANCE
497e5902d6 Update user.class.php
The variable $num does not seem to be defined for all execution paths leading up to this point.
The variable $rd does not seem to be defined for all execution paths leading up to this point.
2020-11-01 20:54:36 +01:00
Frédéric FRANCE
e52b79d586 Merge remote-tracking branch 'upstream/develop' into zapieruser 2020-11-01 14:19:06 +01:00
Frédéric FRANCE
d9bf49c5dc phpcs 2020-10-31 21:04:38 +01:00
Frédéric FRANCE
be4a4cb54b Merge remote-tracking branch 'upstream/develop' into zapieruser 2020-10-31 16:10:16 +01:00
Frédéric FRANCE
8bf2b1797c tabs 2020-10-31 15:59:33 +01:00
Scrutinizer Auto-Fixer
7f52920716 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-31 13:32:18 +00:00
Frédéric FRANCE
2cbbf86a5b Merge remote-tracking branch 'upstream/develop' into zapieruser 2020-10-30 17:48:00 +01:00
Frédéric FRANCE
a317d71413 Update api_users.class.php 2020-10-30 15:23:05 +01:00
Frédéric FRANCE
29faf681e6 work on members 2020-10-30 14:30:25 +01:00
Frédéric FRANCE
e4af61a587 Merge remote-tracking branch 'upstream/develop' into zapieruser 2020-10-30 08:17:53 +01:00