Commit Graph

502 Commits

Author SHA1 Message Date
Javier Segarra 120a119b38 Merge branch 'dev' into feature/TicketTracking
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-25 23:05:11 +02:00
Javier Segarra 151978160b fix: ticket order
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-25 23:01:26 +02:00
Javier Segarra ff02e5d160 Merge branch 'dev' into feature/WeeklyTickets
gitea/salix-front/pipeline/pr-dev This commit looks good Details
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
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
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
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
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-25 14:24:38 +02:00
Javier Segarra 5685d99cd6 Merge branch 'dev' into feature/TicketsAdvance
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-25 14:22:00 +02:00
Carlos Satorres 49b86672f5 Merge branch 'dev' into 7406-workerFormation
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-25 11:18:05 +00:00
Javier Segarra 01816613f2 Merge branch 'dev' into 7323_department_descriptor_routerLink
gitea/salix-front/pipeline/pr-dev This commit looks good Details
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
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-21 11:33:29 +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
gitea/salix-front/pipeline/pr-dev This commit looks good Details
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
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
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
William Buezas bb208040bb Last changes 2024-06-18 11:47:35 -03:00
Javier Segarra dc0a938c4c Merge branch 'dev' into feature/AccountList
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-18 10:50:50 +02:00
William Buezas 06e8e819f4 WIP 2024-06-17 12:11:23 -03:00
William Buezas c807b5feb2 Weekly tickets 2024-06-17 08:21:43 -03:00
Alex Moreno a479637ee6 feat: customerList is customerExtendedList
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-06-17 10:14:11 +02:00
Javier Segarra d55c75089c Merge branch 'dev' into 7323_department_descriptor_routerLink
gitea/salix-front/pipeline/pr-dev This commit looks good Details
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
gitea/salix-front/pipeline/pr-dev This commit looks good Details
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
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
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
gitea/salix-front/pipeline/pr-dev This commit looks good Details
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
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-11 09:10:19 +02:00
Javi Gallego 911ff376fd Merge pull request '#4560 - gastos-reparto' (!421) from 4560-gastos-reparto into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #421
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-06-10 08:16:57 +00:00
William Buezas 91e0eb636f resolve conflicts
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-07 10:51:00 -03:00
William Buezas bf3c146317 resolve conflicts
gitea/salix-front/pipeline/pr-dev This commit looks good Details
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
gitea/salix-front/pipeline/pr-dev This commit looks good Details
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
gitea/salix-front/pipeline/pr-dev This commit looks good Details
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
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-07 09:32:51 +02:00
William Buezas f305cee3ce Account view forms
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-06 14:07:40 -03:00
William Buezas 9f6d0b4dc9 Remove roles
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-04 15:15:12 -03:00
William Buezas c71877cdb1 Account connections
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-04 12:23:28 -03:00
William Buezas c574af9e9b resolve conflicts
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-04 09:15:55 -03:00
William Buezas 253b54379c Add submodules routes again
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
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
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
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
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-03 09:03:37 -03:00