wbuezas
/
salix-front-mindshore-fork2
forked from verdnatura/salix-front
0
0
Fork 0
Code Pull Requests Activity
854 Commits 155 Branches 0 Tags 30 MiB
Commit Graph

854 Commits

Author SHA1 Message Date
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
Javier Segarra e45f4b38bb Merge pull request 'ci: dev-test' (!124) from #6527_dev-test into dev 
Reviewed-on: verdnatura/salix-front#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: verdnatura/salix-front#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: verdnatura/salix-front#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: verdnatura/salix-front#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: verdnatura/salix-front#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: verdnatura/salix-front#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: verdnatura/salix-front#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: verdnatura/salix-front#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: verdnatura/salix-front#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
Carlos Satorres 247f935334 Merge pull request '6157-actionClaim' (!106) from 6157-actionClaim into dev 
Reviewed-on: verdnatura/salix-front#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
Carlos Satorres ce4fe44b03 refs #6157 refactor 2023-11-17 14:06:43 +01:00
Carlos Satorres 9b11ca05a4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6157-actionClaim 2023-11-16 13:16:57 +01:00
Alex Moreno 222a970a26 Merge pull request '4797-workerNotificationManager' (!107) from 4797-workerNotificationManager into dev 
Reviewed-on: verdnatura/salix-front#107
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2023-11-10 09:39:52 +00:00
Alex Moreno 54276b2460 refs #4797 refactor(workerNotification): const url_key 2023-11-10 08:09:17 +01:00
Carlos Satorres ae655dabe2 refs #6157 refactor stateColor, updateDestinations, change responsability 2023-11-09 13:52:45 +01:00
Alex Moreno 9993344d70 Merge branch 'dev' into 4797-workerNotificationManager 2023-11-09 10:04:47 +00:00
Alex Moreno 31c9876fb0 refs #4797 test: workerNotification e2e 2023-11-09 10:59:08 +01:00
Alex Moreno a32aab709a refs #6415 feat: package version 2023-11-09 09:29:20 +01:00
Alex Moreno c870e8b367 refs #6415 fix: package version 2023-11-09 09:28:53 +01:00
Alex Moreno 82674aa5ba Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2023-11-09 08:45:51 +01:00
Alex Moreno b82f5d210f refs #4797 test: workerNotification front 2023-11-09 07:43:16 +01:00
Alex Moreno 0b3a957944 refs #4797 fix: remove clientCreate 2023-11-08 12:20:00 +01:00