762 Commits

All Branches

Search

Author	SHA1	Message	Date
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
Juan Ferrer	17e54cfc60	Merge pull request 'test' (!16) from test into dev ... Reviewed-on: #16	2022-12-09 11:55:42 +00:00
Juan Ferrer	baa9bb7cdf	Merge pull request 'refs #3971 Fixes: Checkout, pay' (!15) from master into test ... Reviewed-on: #15	2022-12-09 11:55:18 +00:00
Juan Ferrer	87d75be910	refs #3971 Fixes: Checkout, pay	2022-12-09 12:51:51 +01:00
Juan Ferrer	ac629dc97b	Merge pull request 'test' (!14) from test into dev ... Reviewed-on: #14	2022-12-05 09:21:44 +00:00
Juan Ferrer	ff3320d590	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/hedera-web into test	2022-12-02 19:24:38 +01:00
Juan Ferrer	e8b727ab6c	refs #4922 .quasar dir added to gitignore	2022-12-02 09:18:09 +01:00
Juan Ferrer	5934ee3832	refs #3971 User supplant fixes	2022-12-02 09:15:43 +01:00
Juan Ferrer	4f09574697	Merge pull request 'test' (!13) from test into dev ... Reviewed-on: #13	2022-12-01 08:07:57 +00:00
Juan Ferrer	6d95dfb999	Merge pull request 'master' (!12) from master into test ... Reviewed-on: #12	2022-12-01 08:07:08 +00:00
Juan Ferrer	1fa9b1e8b0	refs #3971 Order checkout hotfix	2022-12-01 09:04:33 +01:00
Juan Ferrer	327508c3ee	Merge pull request 'test' (!11) from test into master ... Reviewed-on: #11	2022-12-01 07:54:27 +00:00
Juan Ferrer	ba2c143677	Merge branch 'test' into dev	2022-11-29 19:15:05 +01:00
Juan Ferrer	9309bd156c	refs #3971 fixes	2022-11-29 19:13:32 +01:00
Juan Ferrer	875629fc17	Merge pull request 'test' (!10) from test into dev ... Reviewed-on: #10	2022-11-28 09:52:02 +00:00
Juan Ferrer	ebb6055be5	refs #3971 Version increased	2022-11-28 10:41:45 +01:00
Juan Ferrer	209d2e2606	Merge branch 'master' into test	2022-11-28 10:19:39 +01:00