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

588 Commits

Author SHA1 Message Date
William Buezas 9179dc7432 Ticket package 2024-07-02 09:35:18 -03:00
Pablo Natek 2ad9530b1a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7404-add-e2e-to-route 2024-07-02 09:58:46 +02:00
Javier Segarra 68298b9ba6 feat: rreplace eti by labeler 2024-07-01 19:03:17 +02:00
William Buezas dfed211578 Fix bad git pull merge 2024-07-01 11:10:50 -03:00
Javier Segarra 3f5f918684 Merge branch 'dev' into feature/TicketExpedition 2024-07-01 15:12:40 +02:00
Javier Segarra 7896e3d7f9 Merge branch 'dev' into feature/TicketDms 2024-07-01 14:59:09 +02:00
Javier Segarra 0cbd7c9cae Merge branch 'dev' into feature/TicketService 2024-07-01 14:53:08 +02:00
Javier Segarra 527c565ca9 Merge branch 'dev' into feature/TicketTracking 2024-07-01 14:50:23 +02:00
Javier Segarra 9bb75b8305 Merge branch 'dev' into feature/TicketVolume 2024-07-01 14:48:12 +02:00
Javier Segarra eeab4ed915 updates 2024-07-01 13:18:19 +02:00
Javier Segarra 0dfdb1edb0 Merge branch '7648_customerEntries' into 7648_dev_customerEntries 2024-07-01 12:27:07 +02:00
Javier Segarra 71900b15a6 feat: newsection and i18n 2024-07-01 12:18:58 +02:00
Alex Moreno 128303939b fix(ticket router): typo 2024-07-01 07:41:58 +02:00
Pablo Natek a69235e4d4 fix: refs #7404 add e2e and fix route 2024-07-01 07:39:35 +02:00
William Buezas 768b619904 Sale tracking 2024-06-30 17:43:21 -03:00
Javier Segarra 9f68c380da Merge branch 'dev' into feature/TicketExpedition 2024-06-29 00:32:33 +02:00
Javier Segarra 946a2d4823 Merge branch 'dev' into feature/TicketService 2024-06-28 13:24:24 +02:00
William Buezas db4c3a6799 Changes 2024-06-27 11:46:31 -03:00
William Buezas 0e8106af17 Resolve conflicts 2024-06-26 17:21:31 -03:00
William Buezas fd03336c7a Resolve conflicts 2024-06-26 09:12:23 -03:00
William Buezas 8ee4fa2e7d Resolve conflicts 2024-06-26 08:39:56 -03:00
William Buezas ad950f33c6 WIP 2024-06-26 08:27:36 -03:00
Carlos Satorres c570f2058b Merge branch 'dev' into 7409-workerBalance 2024-06-26 09:37:52 +00:00
Jon Elias f596a9b5f7 fix: refs #7014 fix wagon module 2024-06-26 07:26:35 +02:00
Jon Elias 42df3894ee Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7014-RefactorQDrawer 2024-06-26 07:16:42 +02:00
Javier Segarra 120a119b38 Merge branch 'dev' into feature/TicketTracking 2024-06-25 23:05:11 +02:00
Javier Segarra 151978160b fix: ticket order 2024-06-25 23:01:26 +02:00
Javier Segarra ff02e5d160 Merge branch 'dev' into feature/WeeklyTickets 2024-06-25 22:59:16 +02:00
Javier Segarra 7a2b334a64 Merge branch 'dev' into feature/TicketTracking 2024-06-25 22:41:15 +02:00
Javier Segarra c45c24e983 Merge branch 'dev' into feature/TicketPurchaseRequest 2024-06-25 22:31:52 +02:00
Javier Segarra 1a2b4739c3 Merge branch 'dev' into feature/TicketBasicData 2024-06-25 22:27:18 +02:00
Carlos Satorres 6e33a2930b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7409-workerBalance 2024-06-25 17:04:47 +02:00
Javier Segarra 1e080d02ed Merge branch 'dev' into feature/WeeklyTickets 2024-06-25 14:48:31 +02:00
Javier Segarra 049174232a Merge branch 'dev' into feature/TicketsFuture 2024-06-25 14:24:38 +02:00
Javier Segarra 5685d99cd6 Merge branch 'dev' into feature/TicketsAdvance 2024-06-25 14:22:00 +02:00
William Buezas 8e538fb463 WIP 2024-06-25 08:27:25 -03:00
Carlos Satorres 49b86672f5 Merge branch 'dev' into 7406-workerFormation 2024-06-25 11:18:05 +00:00
Jon Elias e8111502c0 refactor: refs #7014 deleted main files and changed route files 2024-06-25 10:28:48 +02:00
William Buezas fb12d4ddc0 WIP 2024-06-24 17:24:36 -03:00
William Buezas 4effba1580 Ticket dms 2024-06-24 16:38:41 -03:00
William Buezas 91df35fcae Ticket volume 2024-06-24 11:12:49 -03:00
William Buezas 17e9d95702 Ticket notes 2024-06-24 09:02:29 -03:00
Javier Segarra 01816613f2 Merge branch 'dev' into 7323_department_descriptor_routerLink 2024-06-21 12:50:14 +00:00
William Buezas 5cf183607d WIP 2024-06-21 09:20:03 -03:00
Javier Segarra 63b8ca46a3 Merge branch 'dev' into feature/TicketLog 2024-06-21 11:33:29 +02:00
Carlos Satorres 87a9ee5ccb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7409-workerBalance 2024-06-21 09:50:38 +02:00
Carlos Satorres fdedf7bf57 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation 2024-06-21 08:42:57 +02:00
William Buezas 9f1dd4d74d WIP 2024-06-20 09:41:53 -03:00
William Buezas 00ebbbfc78 Ticket log 2024-06-20 08:40:05 -03:00
William Buezas 0afd7f4ae1 Ticket tracking 2024-06-19 10:22:20 -03:00
William Buezas b3a4dd3f79 Ticket purchase request 2024-06-19 08:16:20 -03:00
Alex Moreno 819d1230c4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnTable 2024-06-19 09:57:31 +02:00
Carlos Satorres ac28a6728a refs #7409 change icon 2024-06-19 08:41:36 +02:00
William Buezas bb208040bb Last changes 2024-06-18 11:47:35 -03:00
Javier Segarra dc0a938c4c Merge branch 'dev' into feature/AccountList 2024-06-18 10:50:50 +02:00
Carlos Satorres 84378187be Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 7409-workerBalance 2024-06-18 08:56:23 +02:00
William Buezas 06e8e819f4 WIP 2024-06-17 12:11:23 -03:00
Carlos Satorres 25ab5a1b9f refs #7409 front section 2024-06-17 13:55:16 +02:00
William Buezas c807b5feb2 Weekly tickets 2024-06-17 08:21:43 -03:00
Alex Moreno a479637ee6 feat: customerList is customerExtendedList 2024-06-17 10:14:11 +02:00
Javier Segarra d55c75089c Merge branch 'dev' into 7323_department_descriptor_routerLink 2024-06-12 09:28:05 +00:00
Alex Moreno c3409a9d5c Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation 2024-06-12 07:50:41 +02:00
Javier Segarra d0759cb654 Merge branch 'dev' into feature/AccountFormsView 2024-06-11 21:12:13 +02:00
Alex Moreno 59e72dcd50 Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation 2024-06-11 12:53:50 +02:00
Javier Segarra 4e2358d722 fix: point 3 2024-06-11 11:58:06 +02:00
Javier Segarra fac9b6a439 Merge branch 'dev' into feature/AccountConnections 2024-06-11 07:39:41 +00:00
Jorge Penadés 01658ee100 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6598-getUserAcl 2024-06-11 09:10:19 +02:00
Javi Gallego 911ff376fd Merge pull request '#4560 - gastos-reparto' (!421) from 4560-gastos-reparto into dev 
Reviewed-on: verdnatura/salix-front#421
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-06-10 08:16:57 +00:00
William Buezas 91e0eb636f resolve conflicts 2024-06-07 10:51:00 -03:00
William Buezas bf3c146317 resolve conflicts 2024-06-07 10:24:11 -03:00
William Buezas 4c84fd9326 resolve conflicts 2024-06-07 09:03:41 -03:00
Javier Segarra 5551077c92 fix: roles 2024-06-07 11:16:15 +02:00
Javier Segarra 6053d42442 fix: descriptor and i18n 2024-06-07 11:09:46 +02:00
Javier Segarra 567c9ad307 Merge branch 'dev' into feature/MailAliases 2024-06-07 10:46:24 +02:00
Javier Segarra 0ea44eb8db Merge branch 'dev' into feature/AccountAcls 2024-06-07 10:07:15 +02:00
Javier Segarra ec5d5e52f4 Merge branch 'dev' into feature/ZoneCalendar 2024-06-07 09:32:51 +02:00
William Buezas f305cee3ce Account view forms 2024-06-06 14:07:40 -03:00
William Buezas 9f6d0b4dc9 Remove roles 2024-06-04 15:15:12 -03:00
William Buezas c71877cdb1 Account connections 2024-06-04 12:23:28 -03:00
William Buezas c574af9e9b resolve conflicts 2024-06-04 09:15:55 -03:00
William Buezas 253b54379c Add submodules routes again 2024-06-04 09:14:48 -03:00
William Buezas 37a8956f86 Merge branch 'feature/AccountList' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/AccountList 2024-06-04 09:11:37 -03:00
William Buezas c96e6482f9 remove mail alias content 2024-06-04 08:42:32 -03:00
William Buezas 3efca6242d Account ACLs 2024-06-04 08:41:41 -03:00
Javi Gallego 5f00f3bad4 Merge branch 'dev' into 4560-gastos-reparto 2024-06-04 09:42:44 +02:00
William Buezas 8320a75e61 make searchbar work 2024-06-03 09:03:37 -03:00
Javi Gallego 56a46cd130 4560 2024-06-03 11:52:19 +02:00
Javi Gallego ca4193e11a Merge branch 'dev' into 4560-gastos-reparto 2024-06-03 11:31:33 +02:00
William Buezas 8e1f7c24a4 submodules WIP 2024-06-02 13:26:46 -03:00
William Buezas 1c14841233 Several changes 2024-05-31 14:02:50 -03:00
Javier Segarra 28173ddee2 Merge branch 'dev' into feature/AccountRoles 2024-05-31 10:24:37 +02:00
Javier Segarra 4268f15d30 perf: remove unnecessary submodules 2024-05-31 10:23:03 +02:00
Javier Segarra c2dd7831d1 perf: remove unnecessary components 2024-05-31 10:17:44 +02:00
William Buezas 5c25c77f19 Mail aliases 2024-05-30 13:09:11 -03:00
William Buezas 0cf4f41d19 Merge branch '7311_boilerplate_users' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/MailAliases 2024-05-30 08:38:23 -03:00
William Buezas d82de6da58 Account roles 2024-05-29 16:14:29 -03:00
Alex Moreno 2b6612317c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation 2024-05-29 14:05:42 +02:00
Javier Segarra 532d60130d Merge branch 'dev' into feature/ZoneCalendar 2024-05-29 11:28:53 +02:00
Alex Moreno 5965e70740 Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation 2024-05-29 07:50:15 +02:00
William Buezas 0659eac652 Merge branch '7311_boilerplate_users' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/AccountRoles 2024-05-28 18:38:13 -03:00