1686 Commits

Author	SHA1	Message	Date
Laurent Destailleur	edb4cf4130	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: README.md htdocs/filefunc.inc.php	2021-06-19 20:05:25 +02:00
Laurent Destailleur	5d6b26ddb7	Fix css	2021-06-19 19:45:13 +02:00
Laurent Destailleur	61bd572a9c	Fix token for ajax call	2021-06-17 03:37:52 +02:00
Laurent Destailleur	dc6512e5af	Merge pull request #17940 from Hystepik/develop#3 ... Fix #17907 : import of the undefined function	2021-06-15 22:00:17 +02:00
Frédéric FRANCE	f79e16e3b1	replace recruitement by recruitment	2021-06-15 19:08:08 +02:00
lmarcouiller	674bd53b32	Fix #17907 : import of the undefined function	2021-06-15 16:11:25 +02:00
Laurent Destailleur	465ee6e643	Fix security check on public pages	2021-06-13 20:37:53 +02:00
Laurent Destailleur	3eea92c6e6	Clean code	2021-06-13 20:36:12 +02:00
Laurent Destailleur	6f97a551ef	Clean code	2021-06-13 20:32:11 +02:00
Laurent Destailleur	8b9af8f5ab	Responsive	2021-06-13 01:27:04 +02:00
Laurent Destailleur	693ac3eab6	Code comment	2021-06-10 16:38:09 +02:00
Laurent Destailleur	c0c773dd1d	css	2021-06-10 11:32:09 +02:00
Laurent Destailleur	fb46ece906	Fix yogosha 6347	2021-06-09 15:36:47 +02:00
Laurent Destailleur	facf594b2d	FIX Date of invoice generated from membership must be current date	2021-06-08 16:01:26 +02:00
Laurent Destailleur	beca3c8ad3	Debug v14	2021-06-07 01:51:56 +02:00
Laurent Destailleur	d6cbb9007f	Debug ticket form to add a local file	2021-06-07 01:43:24 +02:00
Laurent Destailleur	5d063ab880	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2021-06-05 01:11:16 +02:00
Laurent Destailleur	f0118183c8	Clean code	2021-06-05 01:11:05 +02:00
Laurent Destailleur	246cb09ba5	Update newpayment.php	2021-06-05 00:56:28 +02:00
Laurent Destailleur	420bf440ef	Update newpayment.php	2021-06-05 00:53:07 +02:00
daraelmin	c94946b934	Fix #17743 - token was hashed with membersubscription ... #Fix #17743 - token was hashed with membersubscription for retro-compatibility we must try to hash token wth both "membre" ans "membersubscription" to verify unique secure key d'or member	2021-06-04 23:14:31 +02:00
Laurent Destailleur	f55be9fd3a	Merge pull request #17689 from DorianVabre/dev_EventOrganizer_suggest ... new: working on conference or booth object and event type #FoundationFunding	2021-06-04 13:12:32 +02:00
Laurent Destailleur	402d90554a	Clean code	2021-06-04 10:04:56 +02:00
Laurent Destailleur	5a5fa1edbb	Fix regression amount was always empty.	2021-05-27 11:57:17 +02:00
Laurent Destailleur	531dee31fd	Fix securekey	2021-05-27 11:16:23 +02:00
Dorian Vabre	12d10adc17	Merge branch 'dev_EventOrganizer_suggest' of github.com:DorianVabre/dolibarr into dev_EventOrganizer_suggest	2021-05-21 16:02:22 +02:00
Dorian Vabre	fe272d3292	wip name of contact to add on ics file	2021-05-21 16:01:44 +02:00
stickler-ci	6f050fc23a	Fixing style errors.	2021-05-20 15:48:04 +00:00
Dorian Vabre	83555da795	Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganizer_suggest	2021-05-20 17:26:07 +02:00
Dorian Vabre	720a368b29	link ics ok (todo: add name of speaker)	2021-05-20 17:24:27 +02:00
Dorian Vabre	ab4ae85eb8	fix: getpost exportagenda apha to alpha	2021-05-20 16:33:04 +02:00
Dorian Vabre	df81ac8622	wip	2021-05-20 16:30:49 +02:00
Dorian Vabre	307ab92bc0	Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganizer_suggest	2021-05-20 16:13:42 +02:00
Dorian Vabre	c85b75924f	wip on adding a filter for the ics file + fix on class name	2021-05-10 16:57:48 +02:00
Dorian Vabre	f6956d6a62	using validate() function instead of settStatut(1) to validate an attendee	2021-05-10 15:58:54 +02:00
Dorian Vabre	7d0c3dcf6d	transition done from cookies to session	2021-05-10 15:50:29 +02:00
Dorian Vabre	d71dc37a75	fix	2021-05-10 15:39:39 +02:00
Dorian Vabre	ee4e8dd99f	cookies to session transition	2021-05-10 15:37:25 +02:00
Dorian Vabre	c5dc20b9dc	opti	2021-05-10 15:31:52 +02:00
Dorian Vabre	0e62edfd42	fix error on fetching thirdparty when there is none	2021-05-10 12:47:09 +02:00
Dorian Vabre	0dce9ee359	now using correct email templates after booth/conf suggestion	2021-05-10 10:22:45 +02:00
Dorian Vabre	d86b393d60	useless line removed	2021-05-10 09:54:26 +02:00
Dorian Vabre	058bef1a79	clean viewandvote page	2021-05-07 17:20:36 +02:00
Dorian Vabre	05bbb3dbf6	improved welcome msg on suggestbooth/conf pages	2021-05-07 16:39:03 +02:00
Dorian Vabre	c48234409b	added copyright	2021-05-07 16:15:13 +02:00
Dorian Vabre	d344ce5e08	clean viewandvote page	2021-05-07 15:59:25 +02:00
Dorian Vabre	dfd3742d91	fix on label on payment page	2021-05-07 15:33:00 +02:00
Dorian Vabre	dbde0f0b02	fix on status change when a booth is paid	2021-05-07 15:05:37 +02:00
Dorian Vabre	6111f43946	security fix, id was encoded where it should not be encoded	2021-05-07 14:49:00 +02:00
Dorian Vabre	5bb100de29	conforbooth class required in paymentok to confirm the booth	2021-05-07 13:02:34 +02:00