Commit Graph

886 Commits

Author SHA1 Message Date
Laurent Destailleur
7f1d61f8a8 Fix phpcs 2021-03-02 15:34:43 +01:00
Laurent Destailleur
7144e80063 Merge pull request #16322 from FHenry/dev_new_conf_defaulteventstatus
NEW: Conf for default actiomm status when created from card (and DefaultValues CRUD class)
2021-03-02 14:45:05 +01:00
Laurent Destailleur
3a00952cd1 Update user.class.php 2021-03-02 14:44:31 +01:00
stickler-ci
54d35fa59f Fixing style errors. 2021-03-01 20:00:32 +00:00
Frédéric FRANCE
a4e25359e7 add missing rule 2021-03-01 20:37:16 +01:00
Florian HENRY
f62386a6a5 set Default values as CURD classes 2021-03-01 20:36:42 +01:00
Frédéric FRANCE
b970f4eca6 code syntax user directory 2021-02-26 13:18:40 +01:00
Anthony Berton
ae9582286d Update user.class.php 2021-02-17 16:39:03 +01:00
Anthony Berton
060bfde082 20200217 2021-02-17 15:26:56 +01:00
Laurent Destailleur
6a12de741f FIX Report by Ricardo Matias 2021-01-25 22:46:09 +01:00
Laurent Destailleur
113ef1a02b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/user/class/user.class.php
2021-01-19 16:21:53 +01:00
Laurent Destailleur
934070f14e Backport FIx #15970 2021-01-19 10:56:46 +01:00
Laurent Destailleur
8cd8f21fde Update user.class.php 2021-01-19 10:53:47 +01:00
lmarcouiller
73eee33f8a redo of pull request with sql updated 2021-01-19 09:24:15 +01:00
stickler-ci
7e0f83d97e Fixing style errors. 2021-01-18 16:06:06 +00:00
lmarcouiller
7c7f80fb59 update pull request with sql in simple quotes 2021-01-18 17:05:15 +01:00
lmarcouiller
841736df87 Fix #15970 user.class.php 2021-01-18 14:20:30 +01:00
Laurent Destailleur
aaddda9a6e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/accountancy/bookkeeping/listbysubaccount.php
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/user/class/usergroup.class.php
2021-01-14 14:13:08 +01:00
Laurent Destailleur
16d98d2691 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/fr_FR/admin.lang
	htdocs/projet/graph_opportunities.inc.php
	htdocs/user/class/usergroup.class.php
2021-01-14 14:09:09 +01:00
Florian HENRY
77f213832e fix: update group name 2021-01-11 19:40:44 +01:00
Laurent Destailleur
17b68a30d7 Merge branch 'develop' into dev_add_tag_on_massaction 2020-12-30 13:10:02 +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
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