691 Commits

All Branches

Search

Author	SHA1	Message	Date
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	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
Carlos Andrés	9146d28db5	Merge pull request 'hotfix-Ticket-#097414-traducción-meensaje-de-error' (!32) from hotfix-Ticket-#097414-traducción-meensaje-de-error into master ... Reviewed-on: #32 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-06-20 12:02:02 +00:00
Carlos Andrés	59242daa79	Merge branch 'master' into hotfix-Ticket-#097414-traducción-meensaje-de-error	2023-06-20 12:01:38 +00:00
Juan Ferrer	fd32b3f15a	refs #5489 Version increased	2023-06-16 08:28:05 +02:00
Juan Ferrer	56395aa91b	refs #5489 Account.sync(): bcryptPassword not used, removed	2023-06-15 13:14:01 +02:00
Carlos Andrés	2610448e79	hotfix Ticket #097414 traducción mensajes de error	2023-06-15 10:06:28 +02:00
Carlos Andrés	9eba09ddf7	hotfix Ticket #097414 traducción mensajes de error	2023-06-15 10:04:58 +02:00
Juan Ferrer	74980fbdd7	refs #5553 Insert/Update image table before save	2023-04-14 10:39:59 +02:00
Juan Ferrer	5ce2f46842	Merge pull request 'refs #3867 Fix: display message of forbidden errors' (!30) from master into test ... Reviewed-on: #30	2023-03-10 11:22:50 +00:00
Juan Ferrer	42f682739e	refs #3867 Fix: display message of forbidden errors	2023-03-07 08:50:12 +01:00
Juan Ferrer	bbe7f2ea14	Merge pull request 'refs #3723 Set docker memory limit' (!29) from master into test ... Reviewed-on: #29	2023-03-06 08:31:52 +00:00
Juan Ferrer	cdafea824e	refs #3723 Set docker memory limit	2023-03-06 09:25:02 +01:00
Juan Ferrer	9945c8f1b6	Merge pull request 'master' (!27) from master into test ... Reviewed-on: #27	2023-02-27 08:46:45 +00:00
Juan Ferrer	1ef0d48ba7	refs #4253 Version increased	2023-02-26 02:13:28 +01:00
Juan Ferrer	197758f2bc	refs #4253 supplant security code uncommented	2023-02-26 02:12:45 +01:00
Juan Ferrer	511e925467	refs #5122 Show shopping bag icon in basket	2023-02-24 08:59:45 +01:00
Juan Ferrer	f47e7e07a7	refs #5122 Pending orders: Show taxable base instead of total	2023-02-24 08:46:49 +01:00
Juan Ferrer	4190aad94e	Merge pull request 'master' (!25) from master into test ... Reviewed-on: #25	2023-02-23 19:22:05 +00:00
Juan Ferrer	9bfd42eaf8	refs #5122 Navigation improved, date shows year, fixes	2023-02-23 20:19:56 +01:00
Juan Ferrer	dd7185d5dd	refs #5122 Backend fix: Return error code for user exceptions	2023-02-23 17:05:19 +01:00
Juan Ferrer	10d8128133	refs #5122 Order check fixes	2023-02-23 16:50:49 +01:00
Juan Ferrer	b357c4a451	Merge pull request 'refs #5122 Version increased' (!24) from master into test ... Reviewed-on: #24	2023-02-23 13:40:14 +00:00
Juan Ferrer	e5941266ed	refs #5122 Version increased	2023-02-23 14:36:36 +01:00
Juan Ferrer	592f79fcbd	Merge pull request 'master' (!23) from master into test ... Reviewed-on: #23	2023-02-23 13:35:17 +00:00
Juan Ferrer	0abc6bdc23	refs #5122 Fix	2023-02-23 14:32:13 +01:00
Juan Ferrer	210b7e7806	Merge pull request 'refs #5253' (!22) from test into master ... Reviewed-on: #22	2023-02-23 09:30:42 +00:00
Juan Ferrer	92a4bc458c	Merge pull request 'dev' (!21) from dev into test ... Reviewed-on: #21	2023-02-16 10:33:51 +00:00
Juan Ferrer	520e0c1eff	refs #5161 Version increased	2023-02-16 11:23:38 +01:00
Juan Ferrer	afd23e08b7	Merge pull request 'refs #5122' (!20) from 5122-multipleBasket into dev ... Reviewed-on: #20	2023-02-15 19:57:41 +00:00
Juan Ferrer	18cdb4cc1b	Merge branch 'dev' into 5122-multipleBasket	2023-02-15 19:54:25 +00:00