888 Commits

All Branches

Search

Author	SHA1	Message	Date
Jorge Penadés	42c34f7a46	refs #6104 merge conflicts	2023-12-11 09:11:39 +01:00
Pablo Natek	5c84a68ca6	Merge pull request '6475-descriptor_preview' (!109) from 6475-descriptor_preview into dev ... Reviewed-on: #109 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-12-11 07:27:42 +00:00
Pablo Natek	e7d22052a7	merge(dev): refs #6475 merge dev	2023-12-11 06:45:48 +01:00
Pablo Natek	1c3fc57e3d	feat: refs #6475 open descriptor proxy an show summary dialog button	2023-12-11 06:35:54 +01:00
Jorge Penadés	479c782492	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6104-changeVnLog	2023-12-07 16:25:13 +01:00
Jorge Penadés	09ff922c94	Merge pull request 'refs #5876 spinnerOnLoading' (!125) from 5876-spinnerOnLoading into dev ... Reviewed-on: #125 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-12-07 15:23:53 +00:00
Jorge Penadés	e15b14cd81	refs #5876 use palette color	2023-12-07 16:18:16 +01:00
Jorge Penadés	89198ffe11	Merge pull request 'ref #6175 VnLinkPhone and MicroSIP icon created' (!87) from 6175-addMicrosipLink into dev ... Reviewed-on: #87 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-12-07 15:09:18 +00:00
Jorge Penadés	4ac353bcf1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5876-spinnerOnLoading	2023-12-07 16:07:56 +01:00
Jorge Penadés	575fa58dc6	Merge branch '6175-addMicrosipLink' of https://gitea.verdnatura.es/verdnatura/salix-front into 6175-addMicrosipLink	2023-12-07 15:52:53 +01:00
Jorge Penadés	97789f2cdf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6175-addMicrosipLink	2023-12-07 15:51:58 +01:00
Pablo Natek	fd1f46ffc6	feat(claimList): refs #6475 claimList add links	2023-12-07 12:51:47 +01:00
Javier Segarra	e45f4b38bb	Merge pull request 'ci: dev-test' (!124) from #6527_dev-test into dev ... Reviewed-on: #124 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-12-07 08:23:39 +00:00
Javier Segarra	84226d48ed	ci: dev-test	2023-12-07 08:46:38 +01:00
Javi Gallego	e82c675d7d	Merge branch 'test' into dev	2023-12-07 07:54:39 +01:00
Javi Gallego	dfabdeb706	Merge branch 'test' into dev	2023-12-07 07:54:36 +01:00
Javier Segarra	716fdb75fb	Merge pull request 'refs #5736 fix: i18n broken test env' (!115) from 5736_i18n_broken_test into test ... Reviewed-on: #115 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-12-07 06:40:15 +00:00
Javier Segarra	e8b85494bf	Merge branch 'test' into 5736_i18n_broken_test	2023-12-07 06:39:24 +00:00
Pablo Natek	335c417509	Merge pull request '6545-more-feats-and-fixes' (!121) from 6545-more-feats-and-fixes into test ... Reviewed-on: #121 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-12-06 15:42:12 +00:00
Pablo Natek	735eac5137	feat: refs #6545 isTray	2023-12-06 15:17:50 +01:00
Pablo Natek	6c524932ee	feat(addSpecific): refs #6545 add feats and fixes	2023-12-06 14:14:47 +01:00
Pablo Natek	915f7ea45d	Merge pull request 'feat(wagonCounter): refs #6545 add +30 button and correct images' (!120) from 6545-fixWagonCounter into test ... Reviewed-on: #120 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-12-06 11:51:18 +00:00
Pablo Natek	e963eddfe6	feat(wagonCounter): refs #6545 add +30 button and correct images	2023-12-06 12:09:03 +01:00
Pablo Natek	3b018a58e6	Merge pull request 'feat(wagonCounter): refs #6545 move to test' (!119) from 6545-counters-to-test into test ... Reviewed-on: #119 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-12-06 08:57:25 +00:00
Pablo Natek	9a566ba87c	feat(wagonCounter): refs #6545 move to test	2023-12-06 09:48:51 +01:00
Jorge Penadés	ca9d3611af	Merge pull request 'refs #6545 counters created' (!116) from 6545-trolleyCounter into dev ... Reviewed-on: #116 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-12-05 07:47:51 +00:00
Jorge Penadés	e22c400326	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6545-trolleyCounter	2023-12-05 08:32:15 +01:00
Carlos Satorres	f8659c2153	Merge pull request 'refs #6334 fix amount, colors' (!117) from 6334-updateLinesAmount into dev ... Reviewed-on: #117 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-12-05 06:08:05 +00:00
Jorge Penadés	a730f2c073	refs #6545 refactor	2023-12-04 15:07:40 +01:00
Carlos Satorres	03e42f676b	refs #6334 remove class	2023-12-04 12:02:27 +01:00
Carlos Satorres	4eee95b945	refs #6334 fix amount, colors	2023-12-04 11:40:17 +01:00
Jorge Penadés	a3d6275b2f	refs #6545 counters created	2023-12-04 10:38:35 +01:00
Javier Segarra	51a2e7244c	refs #5736 fix: i18n broken test env	2023-12-01 13:57:48 +01:00
Javier Segarra	3a80b6b63b	Merge pull request 'refs #5815-quasar-NODE_ENV' (!111) from 5815-vite_NODE_ENV into test ... Reviewed-on: #111 Reviewed-by: Juan Ferrer <juan@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-11-30 07:16:01 +00:00
Javi Gallego	1370ecbd8b	Merge branch 'test' into 5815-vite_NODE_ENV	2023-11-29 08:54:04 +00:00
Alex Moreno	615c5c1477	warmFix: ticket with null zone	2023-11-29 08:44:16 +01:00
Alex Moreno	cad5d830a0	Merge pull request 'refs #6062 feat(arrayData): support exprBuilder' (!112) from 6062-exprBuilder into dev ... Reviewed-on: #112 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-11-27 12:23:33 +00:00
Javier Segarra	6ac89e7aa2	Update quasar.config.js	2023-11-27 11:57:09 +00:00
Alex Moreno	54379b3e65	typo	2023-11-24 13:32:20 +01:00
Alex Moreno	023cfc6ac7	refs #6062 feat(arrayData): support exprBuilder	2023-11-24 13:31:08 +01:00
Javi Gallego	5719857d83	Merge branch 'test' into 5815-vite_NODE_ENV	2023-11-24 10:20:15 +00:00
Alex Moreno	dacfe1a96d	refs #5654 fix(descriptors): add data-key	2023-11-24 10:36:31 +01:00
Pablo Natek	0114de4db5	feat(preview): refs #6475 add preview icon on descriptor	2023-11-24 09:41:57 +01:00
Carlos Satorres	247f935334	Merge pull request '6157-actionClaim' (!106) from 6157-actionClaim into dev ... Reviewed-on: #106 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-11-24 07:46:29 +00:00
Carlos Satorres	98fa68bb80	refs 6157 markerlabel	2023-11-24 08:41:21 +01:00
Carlos Satorres	c3d9085a57	refs #6157 minorFix	2023-11-24 08:10:44 +01:00
Carlos Satorres	d03092f41d	refs #6157 arrayData	2023-11-23 15:50:42 +01:00
Alex Moreno	f25baf2e27	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2023-11-23 08:26:42 +01:00
Javier Segarra	25e7c3231a	refs #5815 ci: set custom NODE_ENV in environment	2023-11-22 12:40:12 +01:00
Carlos Satorres	1320db7bf0	refs #6157 e2e + front	2023-11-20 18:13:26 +01:00