843 Commits

Author	SHA1	Message	Date
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	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	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
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	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	e4af61a587	Merge remote-tracking branch 'upstream/develop' into zapieruser	2020-10-30 08:17:53 +01:00
Frédéric FRANCE	e049eb960d	add trigger user create	2020-10-29 20:53:28 +01:00
Frédéric FRANCE	317ffc65c9	Merge remote-tracking branch 'upstream/develop' into zapieruser	2020-10-29 18:41:22 +01:00
Frédéric FRANCE	9e70d7ca65	fix undefined variable	2020-10-29 18:37:52 +01:00
Frédéric FRANCE	5d0ac98c34	work on zapier	2020-10-29 00:34:41 +01:00
Frédéric FRANCE	7ef2aaf8af	Update user.class.php	2020-10-28 20:57:36 +01:00
Frédéric FRANCE	19ff2ef19e	Update user.class.php	2020-10-27 20:52:37 +01:00
Frédéric FRANCE	584373af55	Update user.class.php	2020-10-27 20:15:46 +01:00
Frédéric FRANCE	ae3228b9e0	retrieve the spelling 🎉	2020-10-23 20:08:35 +02:00
Laurent Destailleur	a0b17635fd	NEW When creating a user from a member linked to a thirdparty, you can ... decide if it is an internal or external (default) user.	2020-10-14 14:02:07 +02:00
Scrutinizer Auto-Fixer	1512521d91	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-10-07 13:01:28 +00:00
stickler-ci	a88c0b97a8	Fixing style errors.	2020-09-23 11:31:17 +00:00
Sekan, Tobias	815d0c2589	Fix that a admin can remove all his user rights	2020-09-23 13:18:09 +02:00
Laurent Destailleur	aee6bc173f	WIP Add start/end date of validity for user/logins	2020-09-21 18:44:20 +02:00
Laurent Destailleur	718497915c	Enhance the IK module	2020-09-21 16:31:51 +02:00
Laurent Destailleur	b4137392ea	Merge pull request #14789 from bafbes/abb120144 ... fix:remove deleted user params	2020-09-20 17:12:15 +02:00
Laurent Destailleur	233aa58161	Fix sanitizing	2020-09-20 03:36:02 +02:00
bahfir abbes	09f23c1d84	fix:remove deleted user params	2020-09-19 13:14:46 +01:00
Laurent Destailleur	7bcf2c9089	css	2020-09-15 14:45:51 +02:00
Laurent Destailleur	c4383747a1	Look and feel v13	2020-09-11 13:57:16 +02:00
Scrutinizer Auto-Fixer	c263c8a76c	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-09-08 19:27:28 +00:00
Scrutinizer Auto-Fixer	b78ff67d7e	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-09-07 08:18:17 +00:00
stickler-ci	2cbb4081fe	Fixing style errors.	2020-08-25 10:20:48 +00:00
Sekan, Tobias	4c851884e5	Address feedback	2020-08-25 12:16:44 +02:00
Sekan, Tobias	ba98db934d	Show user on external calender events	2020-08-21 08:18:26 +02:00
Laurent Destailleur	e891250fb3	Reduce log	2020-08-17 17:40:08 +02:00
Laurent Destailleur	1bb24de555	Can set the language of a user.	2020-08-07 14:22:43 +02:00
Laurent Destailleur	a6ecf6dbbc	Fix syntax error	2020-06-25 12:18:57 +02:00
Laurent Destailleur	333d4873c3	Properties ->contactid has been renamed into ->contact_id	2020-06-25 12:17:47 +02:00
Laurent Destailleur	c4bbf12e72	Fix css	2020-05-30 00:58:11 +02:00
Laurent Destailleur	af3c24d0a9	Fix css	2020-05-30 00:56:51 +02:00
Laurent Destailleur	f8b92e507c	Clean code	2020-05-28 19:10:06 +02:00
Frédéric FRANCE	b41ac00b98	add new rule	2020-05-21 15:05:19 +02:00
Frédéric FRANCE	ee6fadd0d5	add new rule	2020-05-21 01:41:27 +02:00
Laurent Destailleur	1ec8b31e46	Fix remove action param in url to allow a second try without the error ... message	2020-05-06 15:15:12 +02:00
Laurent Destailleur	abdb0cc8c0	Fix use correct trackid	2020-05-06 15:03:57 +02:00
Laurent Destailleur	e7ae9c752e	Fix missing trackid	2020-05-06 14:48:02 +02:00
Laurent Destailleur	3ed11f374a	Look and feel v12	2020-04-24 23:56:57 +02:00
Laurent Destailleur	72c6ac1c72	Complete #13708, normalization of code	2020-04-23 13:21:39 +02:00
Laurent Destailleur	2c4bb867b3	FIX #12996	2020-04-13 17:36:12 +02:00
Laurent Destailleur	596ba8d679	Clean deprecated code.	2020-04-13 01:10:35 +02:00
Laurent Destailleur	069fb27ced	Look and feel v12	2020-04-10 12:27:34 +02:00
Laurent Destailleur	054ffb7547	Depreciate variables not used by Dolibarr.	2020-03-06 14:38:06 +01:00
Laurent Destailleur	a6b0fec90b	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/exports/class/export.class.php	2020-02-17 12:35:34 +01:00
Laurent Destailleur	504a67daee	FIX duplicate class name into some log lines	2020-02-17 12:34:00 +01:00
Scrutinizer Auto-Fixer	9781c20f84	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-02-02 18:34:09 +00:00
Laurent Destailleur	be2d6494a7	FIX #12908	2020-01-28 21:23:05 +01:00
Laurent Destailleur	39737c7c4b	Fix opacity on text with a href links inside ... Fix var not defined	2019-12-22 13:19:14 +01:00
Laurent Destailleur	e8db3a2aa0	Fix look and feel v11	2019-12-19 10:17:20 +01:00
Scrutinizer Auto-Fixer	455178ff73	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-12-18 14:20:36 +00:00
Laurent Destailleur	838633d0de	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/system/filecheck.php htdocs/api/class/api_setup.class.php htdocs/compta/facture/card.php htdocs/compta/stats/index.php htdocs/core/actions_massactions.inc.php htdocs/install/upgrade2.php htdocs/loan/card.php htdocs/loan/document.php htdocs/loan/info.php htdocs/loan/note.php htdocs/loan/schedule.php htdocs/product/list.php htdocs/ticket/card.php htdocs/user/class/user.class.php	2019-12-14 14:53:49 +01:00
Laurent Destailleur	8b57e9fcf0	Merge pull request #12697 from bb2a/patch-7 ... Full name in uppercase on creation and modification	2019-12-14 14:00:09 +01:00
stickler-ci	31b09f433f	Fixing style errors.	2019-12-12 16:29:11 +00:00
Anthony Berton	68a1b12fba	Update user.class.php	2019-12-12 17:27:24 +01:00
Frédéric FRANCE	307bad1d2a	doxygen todo	2019-12-11 19:11:13 +01:00
Frédéric FRANCE	6366a2a606	doxygen	2019-12-06 18:05:16 +01:00
atm-lena	486f598067	FIX getrights() request	2019-12-05 16:11:12 +01:00
Laurent Destailleur	06de7f968f	Fix class not found	2019-12-05 14:06:03 +01:00
Laurent Destailleur	d58bb5f66b	Fix link to user	2019-11-28 16:16:55 +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
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	45c77b4560	Renaming some libelle into label	2019-11-02 12:59:38 +01:00
Laurent Destailleur	f9031cdbfd	Clean code	2019-11-02 11:36:48 +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
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	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
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	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
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	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
Regis Houssin	de84f12b24	FIX broken feature with ldap trigger !!!	2019-05-10 11:47:44 +02:00
Laurent Destailleur	68d438b697	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/fourn/commande/card.php htdocs/user/class/user.class.php	2019-04-25 01:50:48 +02:00
Regis Houssin	740fddcd42	FIX missing global $user	2019-04-24 08:22:00 +02:00
Regis Houssin	41a82023e3	FIX missing compatibility with multicompany	2019-04-24 08:17:10 +02:00
Laurent Destailleur	fae2983c2a	Merge branch 'develop' into new_user_hr_fields	2019-04-11 18:27:58 +02:00
Laurent Destailleur	7b01e76d2b	Fix doxygen	2019-04-08 16:04:15 +02:00
Laurent Destailleur	fff9b7db9d	Fix doxygen	2019-04-04 18:33:12 +02:00
Laurent Destailleur	ee4150665e	Fix phpcs	2019-03-21 20:15:19 +01:00
Laurent Destailleur	5693fbfe97	Merge pull request #10898 from grandoc/new_branch_21_03_2019 ... add some comments	2019-03-21 18:29:11 +01:00
Mathieu Pellegrin	e0d89101df	#9480 Password link broken if login contains space	2019-03-21 18:25:00 +01:00
Laurent Destailleur	6c2bd13b58	Merge pull request #10895 from mpellegrin/develop ... #9480 Password link broken if login contains space	2019-03-21 18:24:21 +01:00
Philippe GRAND	2ad649eaea	add some comments	2019-03-21 15:18:05 +01:00
Laurent Destailleur	5d21547854	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/extrafields.class.php htdocs/product/price.php htdocs/user/perms.php	2019-03-21 12:20:24 +01:00
Mathieu Pellegrin	e971018c71	#9480 Password link broken if login contains space	2019-03-21 12:06:43 +01:00
Laurent Destailleur	3c1d7bfbf0	FIX counter of permissions in badge was wrong	2019-03-19 16:30:40 +01:00
Laurent Destailleur	0c101f3d1b	Fix translation	2019-03-18 11:21:51 +01:00
Maxime Kohlhaas	0a0e29a089	New fields on user object for hrm purpose	2019-03-16 08:53:06 +01:00
Frédéric FRANCE	bd2e541fd6	add visibility	2019-03-01 18:28:51 +01:00
Frédéric FRANCE	49cbaed569	Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing	2019-02-27 14:21:15 +01:00
Laurent Destailleur	727c4b787b	Merge pull request #10617 from wdammak/patch-29 ... NEW Add Default Warehouse to user record (if module stock is on)	2019-02-27 13:38:55 +01:00
Frédéric FRANCE	5a4ac82880	Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing	2019-02-27 08:23:29 +01:00
Frédéric FRANCE	1c07006015	wip	2019-02-25 21:36:27 +01:00
Alexandre SPANGARO	acb9cfe07a	NEW: Add LinkedIn field	2019-02-25 09:07:58 +01:00
wdammak	d31aadf5da	Add Default Warehouse to user	2019-02-15 05:20:33 +01:00
Frédéric FRANCE	1e43f8e54a	PEAR FunctionCallSignature	2019-02-10 10:45:49 +01:00
Laurent Destailleur	57f81217ee	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/localtax/index.php htdocs/compta/tva/index.php	2019-02-03 21:14:44 +01:00
Laurent Destailleur	4d41b1b33c	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-02-03 19:45:45 +01:00
Laurent Destailleur	bd2c7092a4	Update user.class.php	2019-02-03 19:25:11 +01:00
gauthier	bfc7265cbc	FIX : better test on fetch	2019-01-31 11:53:10 +01:00
gauthier	0c4e5a6487	FIX : better test	2019-01-31 09:30:07 +01:00
Laurent Destailleur	648eea3a70	Merge branch 'develop' into nospaceaftercomma	2019-01-30 16:00:11 +01:00
gauthier	3477cf6bd3	FIX : must fetch member in current entity	2019-01-29 18:01:28 +01:00
Alexandre SPANGARO	cc88c4f8ff	Move my email to the new one	2019-01-28 21:39:22 +01:00
Frédéric FRANCE	b10558bacd	Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma	2019-01-27 23:23:38 +01:00
Laurent Destailleur	4f9f0fd7b5	Merge branch 'develop' into elseif	2019-01-27 17:54:06 +01:00
Frédéric FRANCE	f0cdf300d1	Squiz.Functions.FunctionDeclarationArgumentSpacing	2019-01-27 15:20:16 +01:00
Frédéric FRANCE	7ee086b402	PSR2 space after comma in function call	2019-01-27 11:55:16 +01:00
Frédéric FRANCE	6e91b3cefc	PSR2 usage of else if is discouraged	2019-01-27 10:49:34 +01:00
Laurent Destailleur	5c516fdae2	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/html.form.class.php	2018-12-26 19:43:01 +01:00
Laurent Destailleur	35debd06fb	List of events show user firstname by default	2018-12-23 01:28:36 +01:00
Laurent Destailleur	85375495e5	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 ... Conflicts: htdocs/core/class/html.form.class.php htdocs/product/class/product.class.php htdocs/public/notice.php htdocs/user/card.php	2018-12-22 19:06:58 +01:00
Laurent Destailleur	3fee4c3309	The delete of a user need the parameter $user	2018-12-22 17:34:27 +01:00
Laurent Destailleur	2b088a73c1	FIX CVE-2018-19998	2018-12-22 17:16:08 +01:00
Laurent Destailleur	527ad04ae8	FIX Mandatory field feature should works on textarea ... Conflicts: htdocs/core/lib/functions.lib.php	2018-12-15 18:13:30 +01:00
Laurent Destailleur	6188156c52	FIX Mandatory field feature should works on textarea	2018-12-15 18:11:40 +01:00
Laurent Destailleur	ef3a280f40	Merge pull request #10082 from grandoc/new_branch_26_11_2018 ... fix typo error	2018-11-29 10:57:48 +01:00
Laurent Destailleur	bb565d33f9	FIX Several fixes in fetchAll	2018-11-27 16:39:08 +01:00
Philippe GRAND	a59a4c60e0	FIX : Typo errors	2018-11-26 16:09:05 +01:00
Regis Houssin	04edcaa89c	FIX compatibility between proposal sharing and proposalnumber sharing	2018-11-13 20:20:46 +01:00
Regis Houssin	569d59d251	FIX change my deprecated email	2018-10-27 14:43:12 +02:00