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

628 Commits

Author SHA1 Message Date
Jorge Penadés 42c34f7a46 refs #6104 merge conflicts 2023-12-11 09:11:39 +01: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 e15b14cd81 refs #5876 use palette color 2023-12-07 16:18:16 +01: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 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
Javi Gallego dfabdeb706 Merge branch 'test' into dev 2023-12-07 07:54:36 +01: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 e963eddfe6 feat(wagonCounter): refs #6545 add +30 button and correct images 2023-12-06 12:09:03 +01:00
Pablo Natek 9a566ba87c feat(wagonCounter): refs #6545 move to test 2023-12-06 09:48:51 +01: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
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
Alex Moreno 615c5c1477 warmFix: ticket with null zone 2023-11-29 08:44:16 +01: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
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 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
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 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 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
Alex Moreno e8aef29512 refs #4797 feat(WorkerNotification): use Maps 2023-11-08 12:19:38 +01:00
Carlos Satorres 20bbee8397 Merge branch '6157-actionClaim' of https://gitea.verdnatura.es/verdnatura/salix-front into 6157-actionClaim 2023-11-07 12:50:57 +01:00
Carlos Satorres b98f982495 refs #6157 remove salixUrl 2023-11-07 12:50:54 +01:00
Carlos Satorres b89f5aadf1 Merge branch 'dev' into 6157-actionClaim 2023-11-07 11:43:57 +00:00
Carlos Satorres 35eae2f9a5 remove consolelog 2023-11-07 12:43:10 +01:00
Carlos Satorres 6db52e00ea refs #6157 test ui 2023-11-07 12:42:39 +01:00
Alex Moreno 5350765469 refs #4797 style(workerNotificationManager) 2023-11-06 15:33:18 +01:00
Alex Moreno 4de39452ca refs #4797 feat(workerNotification): add cards 2023-11-06 08:32:03 +01:00
Alex Moreno cc13e3935e refs #4797 feat(workerNotificationManager): use crudModel 2023-11-03 15:24:48 +01:00
Carlos Satorres 08060d276a refs #6157 fix arraydata, and internal error 2023-11-03 13:41:10 +01:00
Carlos Satorres ef177c01e5 refs #6157 reguralize import migrate 2023-11-02 14:08:10 +01:00
Jorge Penadés 3e5c079c00 ref #6104 merge confilcts 2023-10-30 16:20:31 +01:00
Jorge Penadés 1d9663637c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6248-createBreadCrumbs 2023-10-30 13:52:10 +01:00
Carlos Satorres abb1b3f7c1 refs #6157 card 2023-10-30 11:28:48 +01:00