778 Commits

All Branches

Search

Author	SHA1	Message	Date
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
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	01326dc91c	Merge pull request 'test' (!31) from test into dev ... Reviewed-on: #31	2023-03-10 11:23:16 +00: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	5fce203252	Merge pull request 'test' (!28) from test into dev ... Reviewed-on: #28	2023-02-27 08:47:36 +00: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	b32be540f3	Merge pull request 'test' (!26) from test into dev ... Reviewed-on: #26	2023-02-23 19:28:45 +00: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
Juan Ferrer	ca5f80f6c3	refs #5122	2023-02-15 17:18:54 +01:00
Juan Ferrer	d1ff6889af	Merge pull request '5122-multipleBasket' (!19) from 5122-multipleBasket into dev ... Reviewed-on: #19	2023-02-15 16:15:03 +00:00
Juan Ferrer	a632a15242	refs #5122	2023-02-15 17:13:25 +01:00
Juan Ferrer	67b6f77b12	refs #5122	2023-02-15 14:07:09 +01:00
Juan Ferrer	e8eab29887	Merge branch 'dev' into 5122-multipleBasket	2023-02-14 17:10:34 +01:00
Juan Ferrer	326aeee127	Merge pull request 'test' (!18) from test into dev ... Reviewed-on: #18	2023-01-31 13:15:47 +00:00
Juan Ferrer	bbb0089b59	Merge pull request 'master' (!17) from master into test ... Reviewed-on: #17	2023-01-31 13:15:19 +00:00
Juan Ferrer	406b2f8300	#4253 Hotfix: OutdatedVersionError not handled	2023-01-31 14:09:01 +01:00
Juan Ferrer	efc7342359	fixes #5174 Redsys TPV api migrated to salix	2023-01-31 13:38:59 +01:00
Juan Ferrer	806c4cc3ad	refs #5122 Checkpoint	2023-01-30 11:08:26 +01:00
Juan Ferrer	c463e967ca	refs #3971 Form input locking when loading	2023-01-16 16:57:48 +01:00
Juan Ferrer	be43a38b38	refs #3971 Order confirm style fixes	2023-01-16 14:18:07 +01:00
Juan Ferrer	59ed61ae9b	refs #4253 Translation & UI fixes	2023-01-16 13:59:11 +01:00