723 Commits

All Branches

Search

Author	SHA1	Message	Date
Juan Ferrer	2515cbcee7	ci: HOTFIX Use version to tag docker images	2024-02-22 09:41:39 +01:00
Juan Ferrer	d1cdba800d	Jenkinsfile refactor	2024-02-22 09:25:38 +01:00
Juan Ferrer	02ddc87755	version increased	2024-02-22 09:03:28 +01:00
Juan Ferrer	7689be689f	Merge branch 'master' into test	2024-02-22 08:56:16 +01:00
Juan Ferrer	33778629e6	Merge pull request 'dev' (!49) from dev into test ... Reviewed-on: #49	2024-02-15 12:35:15 +00:00
Juan Ferrer	7f1d8ebb8e	version updated	2024-02-15 13:34:20 +01:00
Juan Ferrer	4d8a67f499	Merge pull request 'test' (!48) from test into dev ... Reviewed-on: #48	2024-02-15 12:32:01 +00:00
Guillermo Bonet	c6120af93b	Merge pull request 'refactor: refs #6780 Deleted references to warehouse vn2008' (!47) from 6780-changeViewDependencesVn2008 into dev ... Reviewed-on: #47 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-02-02 08:16:55 +00:00
Guillermo Bonet	95f819c22f	refactor: refs #6780 Deleted references to warehouse vn2008	2024-02-01 09:46:16 +01:00
Juan Ferrer	496061fb3c	refs #6200 Version increased	2023-10-10 14:17:50 +02:00
Juan Ferrer	0b85c1230a	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/hedera-web	2023-10-10 12:46:42 +02:00
Juan Ferrer	3ed871cb4c	refs #6200 fix	2023-10-10 12:46:05 +02:00
Juan Ferrer	c7159a1e13	Merge pull request 'refs #6200 test into master' (!46) from test into master ... Reviewed-on: #46	2023-10-10 08:21:49 +00:00
Juan Ferrer	fba880fb33	refs #6200 Version increased	2023-10-10 09:37:29 +02:00
Juan Ferrer	1535a557a8	refs #6200 Fixes: style & add to basket	2023-10-09 21:08:40 +02:00
Juan Ferrer	4a09fe39a8	refs #6200 style fixes, mock local date	2023-10-09 21:01:11 +02:00
Juan Ferrer	3977b258d3	refs #6200 Style fixes	2023-10-09 20:20:01 +02:00
Juan Ferrer	6915e06c71	refs #6200 Minimal amount	2023-10-09 19:51:59 +02:00
Juan Ferrer	a474f9df05	Merge branch 'master' into test	2023-10-09 19:06:44 +02:00
Juan Ferrer	620bd53262	refs #5879 Fixes: PHP max upload filesize	2023-08-30 17:48:23 +02:00
Juan Ferrer	8f98597ea2	refs #5863 Fixes: Mailer, logout & run db	2023-08-21 11:41:51 +02:00
Alex Moreno	a2cd8a711e	Merge pull request 'refs #5762 feat(changePassword): salix compatibility' (!44) from 5762-recover-password_salix2 into test ... Reviewed-on: #44 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-08-18 06:57:15 +00:00
Alex Moreno	08b4a3437c	refs #5762 feat(changePassword): salix compatibility	2023-08-07 07:25:11 +02:00
Juan Ferrer	a59c44fb3a	refs #5863 Version increased	2023-08-02 08:49:49 +02:00
Juan Ferrer	2adfd2299a	Merge pull request 'hotFix(logout): correct order' (!43) from hotFix_correctOrder_logout into master ... Reviewed-on: #43 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-07-28 11:25:16 +00:00
Juan Ferrer	f929e67d76	Merge branch 'master' into hotFix_correctOrder_logout	2023-07-28 11:24:56 +00:00
Juan Ferrer	d37493b081	ticket #097414 Fix: Use client language	2023-07-28 13:11:33 +02:00
Alex Moreno	0f3ddb1a99	hotFix(logout): correct order	2023-07-28 10:16:28 +02:00
Juan Ferrer	bb4e348d0c	Merge pull request 'test into master' (!42) from test into master ... Reviewed-on: #42	2023-07-27 20:07:42 +00:00
Juan Ferrer	754b8cd6c4	refs #6079 Add tag 8 & modify france phone	2023-07-27 21:55:17 +02:00
Alex Moreno	7bb067223a	Merge pull request '5863_logout_remove_session' (!40) from 5863_logout_remove_session into test ... Reviewed-on: #40 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-07-14 11:04:56 +00:00
Alex Moreno	9363cdf5a4	refs #5863 fix remove user session	2023-07-12 08:34:47 +02:00
Alex Moreno	d17bc6115f	refs #5863 logout remove $_SESSION['user']	2023-07-12 07:17:20 +02:00
Javi Gallego	9475c26663	Merge pull request 'refs #5863 add echos in login' (!39) from 5863_service_add_echos2 into test ... Reviewed-on: #39 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-07-11 11:57:09 +00:00
Alex Moreno	607513452f	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/hedera-web into 5863_service_add_echos2	2023-07-11 11:36:50 +02:00
Alex Moreno	86be0278a6	refs #5863 add echos in login	2023-07-11 11:35:15 +02:00
Alex Moreno	a8f98d62ab	Merge pull request 'refs #5863 add echos in login' (!38) from 5863_service_add_echos into test ... Reviewed-on: #38 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-07-11 07:21:12 +00:00
Alex Moreno	2af5851066	refs #5863 add echos in login	2023-07-11 09:18:34 +02:00
Javi Gallego	1470e77572	Merge pull request 'refs #5863 remove echos' (!37) from 5863-visit_user3 into test ... Reviewed-on: #37 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-07-10 07:23:01 +00:00
Alex Moreno	32cc865290	refs #5863 remove echos	2023-07-10 09:17:16 +02:00
Javi Gallego	8bcfe9f50c	Merge pull request 'refs #5863 echos' (!36) from 5863-visit_user2 into test ... Reviewed-on: #36 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-07-10 06:44:52 +00:00
Alex Moreno	f638143e3e	refs #5863 echos	2023-07-10 08:43:15 +02:00
Javi Gallego	07bde10609	Merge pull request 'refs #5863 add echos' (!35) from 5863-visit_user into test ... Reviewed-on: #35 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-07-10 05:54:10 +00:00
Alex Moreno	4231365e4f	refs #5863 add echos	2023-07-10 07:52:24 +02:00
Juan Ferrer	fa56a4e540	refs #5879 Jenkinsfile: debuild updated	2023-06-20 17:29:01 +02:00
Juan Ferrer	5bcfd5897c	Merge pull request 'refs #5879 test into dev' (!34) from test into dev ... Reviewed-on: #34	2023-06-20 15:20:29 +00:00
Juan Ferrer	572d4b7b83	Merge branch 'master' into test	2023-06-20 17:18:54 +02:00
Juan Ferrer	bbeb70eb6b	refs #5879 Upgrade Debian image	2023-06-20 16:56:19 +02:00
Juan Ferrer	2905a6ab57	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/hedera-web	2023-06-20 16:08:14 +02:00
Juan Ferrer	5b84671d57	hotfix #097414 Version increased	2023-06-20 16:08:13 +02:00