101 Commits

Author	SHA1	Message	Date
Laurent Destailleur	dbaa43f3be	Merge remote-tracking branch 'origin/3.8' into 3.9 ... Conflicts: htdocs/fourn/commande/card.php htdocs/holiday/card.php htdocs/holiday/list.php htdocs/user/card.php	2016-01-23 11:45:39 +01:00
Laurent Destailleur	dadc24462a	Fix: We must ue the "small" size of imge to show on card pages.	2016-01-22 14:14:39 +01:00
Laurent Destailleur	49a325e7ae	Fix: We must ue the "small" size of imge to show on card pages.	2016-01-22 14:10:27 +01:00
Laurent Destailleur	52cd5d505e	Fix several bugs on css, translation or look	2016-01-01 23:44:23 +01:00
philippe grand	c740a85006	[Qual] Uniformize code	2015-12-21 14:43:21 +01:00
Laurent Destailleur	374480043e	Add maxwidth300 on combo list for users and sale representatives	2015-12-06 00:37:58 +01:00
Laurent Destailleur	de730c9762	NEW Introduce cost price on product.	2015-11-30 21:20:45 +01:00
aspangaro	d12e3ca91f	Finish work on better integration of skype	2015-11-28 14:43:16 +01:00
Laurent Destailleur	3f87b30327	Use same way to obfuscate key than password	2015-11-22 14:21:12 +01:00
Laurent Destailleur	97dc4c346b	Merge pull request #4026 from aspangaro/develop-hrm ... New: FR #3699 HRM Add address informations in user card	2015-11-21 00:27:29 +01:00
aspangaro	98d5f21787	Debug state	2015-11-19 06:21:37 +01:00
aspangaro	1e4d8ec104	New: HRM #3699 Add address informations in user card	2015-11-18 06:34:08 +01:00
aspangaro	c7df6c15a2	Different display if employee mode	2015-11-17 21:22:45 +01:00
Laurent Destailleur	59a79442b0	Enhance code for select field list feature. ... Add gender and employee on user list.	2015-11-11 17:05:18 +01:00
Laurent Destailleur	13a0fa2c69	Missing css	2015-11-10 15:50:13 +01:00
Laurent Destailleur	d2fa580f5d	The code generator can generate a list.php page with all feature ... immediatly working (sort, extrafields, hooks, select fields to show...)	2015-11-05 13:43:22 +01:00
Laurent Destailleur	f15425be52	Include the link "Back to list" on banner of all user tabs.	2015-11-04 15:45:35 +01:00
Laurent Destailleur	8df59134a9	Merge pull request #3705 from aspangaro/develop-hrm ... New : Module HRM	2015-10-22 19:15:49 +02:00
Laurent Destailleur	5db82b8869	Merge pull request #3743 from hregis/develop_origin ... Fix: Parse error: syntax error, unexpected '}'	2015-10-17 10:37:03 +02:00
aspangaro	aac88519de	Merge remote-tracking branch 'Upstream/develop' into develop-hrm ... Conflicts: htdocs/user/card.php	2015-10-17 07:19:46 +02:00
Laurent Destailleur	b3491ef4e5	Merge remote-tracking branch 'origin/3.8' into develop ... Conflicts: ChangeLog htdocs/comm/propal/class/propal.class.php htdocs/compta/facture/admin/facture_cust_extrafields.php htdocs/compta/facture/admin/facturedet_cust_extrafields.php htdocs/compta/facture/class/facture.class.php htdocs/contrat/card.php	2015-10-16 10:12:36 +02:00
Regis Houssin	d44e961014	Fix: Parse error: syntax error, unexpected '}' ... Fix: bad indentation !!! use tabulation instead spaces please !!!	2015-10-15 16:35:05 +02:00
Regis Houssin	39d89ef9aa	Fix: Parse error: syntax error, unexpected '}'	2015-10-15 16:11:03 +02:00
Marcos García de La Fuente	87ad6e7941	Merge branch 'develop' into doactions-usercard ... # Conflicts: # htdocs/user/agenda_extsites.php	2015-10-13 09:49:19 +02:00
aspangaro	0b54cc4509	Merge remote-tracking branch 'Upstream/develop' into develop-hrm	2015-10-11 21:05:15 +02:00
Laurent Destailleur	b24d609ecc	New banner tab is available on all tab of user object	2015-10-11 16:12:12 +02:00
Laurent Destailleur	bd48ad265d	The new banner tab is also on user card now	2015-10-11 15:21:21 +02:00
Marcos García de La Fuente	1cd0f7263f	Merge remote-tracking branch 'upstream/develop' into doactions-usercard ... # Conflicts: # htdocs/user/card.php # htdocs/user/param_ihm.php	2015-10-10 22:38:02 +02:00
Marcos García de La Fuente	3fd626705f	NEW Added doActions hooks to user cards ... Close #3394	2015-10-10 22:31:01 +02:00
aspangaro	b571cc86ff	Add a yn form in user card to know if the user is also an employee	2015-10-09 07:30:48 +02:00
Laurent Destailleur	7b2fbdd638	FIX Can't change the admin with default setup	2015-10-05 10:04:34 +02:00
Juanjo Menent	7bc6f14736	Merge pull request #3608 from All-3kcis/develop-patch-7 ... fix dangerous sql injection	2015-10-03 23:16:04 +02:00
All-3kcis	e17b3529ab	Correct error	2015-09-26 15:12:32 +02:00
Juanjo Menent	6999ad0a4f	Merge pull request #3587 from GPCsolutions/fiche_titre ... [Qual] Replaced deprecated function calls.	2015-09-26 08:39:22 +02:00
All-3kcis	2a84afeee4	fix dangerous sql injection #3327	2015-09-25 16:31:55 +02:00
Raphaël Doursenaud	631ee83745	[Qual] Replaced deprecated print_fiche_titre()	2015-09-24 18:34:58 +02:00
Raphaël Doursenaud	9f2545b95d	[Qual] Replaced deprecated dol_clone by native clone	2015-09-24 17:24:40 +02:00
Laurent Destailleur	8332609d06	Merge pull request #3539 from All-3kcis/develop-patch-6 ... FIX #3524	2015-09-18 20:49:27 +02:00
All-3kcis	31266b3c11	FIX #3524 ... (Fatal error: Call to undefined function getRandomPassword() in /htdocs/user/card.php on line 846)	2015-09-17 10:00:32 +02:00
Laurent Destailleur	099e3f0376	FIX Removed warnings	2015-09-17 00:47:56 +02:00
Laurent Destailleur	a5c6582bc1	Fix duplicate translation/encoding on setEventMessage ... Conflicts: htdocs/ftp/index.php	2015-09-12 12:55:20 +02:00
Laurent Destailleur	c785f8cfb1	Fix duplicate translation/encoding on setEventMessage	2015-09-12 12:52:07 +02:00
Laurent Destailleur	15ab9c0ecd	Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/core/lib/security.lib.php htdocs/product/stock/mouvement.php	2015-08-20 16:08:42 +02:00
Laurent Destailleur	da8e71b2c5	Fix #3309	2015-08-20 16:05:29 +02:00
Juanjo Menent	e1f627ca8e	Merge remote-tracking branch 'origin/3.7' into 3.8	2015-08-10 20:37:44 +02:00
Marcos García de La Fuente	8a1c5450c2	Fixed minor problem with error alert when creating user	2015-08-09 18:26:12 +02:00
Laurent Destailleur	9451296f6b	Fix: Missing tooltip	2015-07-28 12:11:39 +02:00
All-3kcis	d3f283a8d9	Correct api_key and error "DB_ERROR_RECORD_ALREADY_EXISTS"	2015-07-21 11:43:23 +02:00
Laurent Destailleur	2df2e8b44e	Merge remote-tracking branch 'origin/3.8' into develop	2015-07-20 00:55:30 +02:00
elarifr	80c8c30ba7	generate fake api_key to store if api module not enabled ... correct user role select if api module not enabled	2015-07-19 22:43:06 +02:00