Commit Graph

123 Commits

Author SHA1 Message Date
Javier Segarra bb58f72e3f updates 2024-06-13 09:37:39 +02:00
Javier Segarra 1641ad396c Merge branch 'dev' into 6321_negative_tickets 2024-06-12 23:07:14 +02:00
Jon Elias 4045a3a631 Merge branch 'dev' into 7154-ItemDescriptor
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-11 12:56:52 +00:00
Javi Gallego cb0559fee8 Merge pull request '7548-ticketSummaryCollection' (!432) from 7548-ticketSummaryCollection into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #432
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-06-11 12:53:42 +00:00
Jon Elias 2d0b33c626 Merge branch '7154-ItemDescriptor' of https://gitea.verdnatura.es/verdnatura/salix-front into 7154-ItemDescriptor
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-11 14:29:44 +02:00
Jon Elias de18b670ea feat: refs #7154 changed label 2024-06-11 14:29:42 +02:00
Javier Segarra 8d9bfd8f1d Merge branch 'dev' into 6321_negative_tickets
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-11 13:52:48 +02:00
Jon Elias 989ea3d82c Merge branch 'dev' into 7154-ItemDescriptor
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-11 11:49:25 +00:00
Jon Elias e5a590a9f9 feat: refs #7154 new item descriptor field
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-11 13:48:15 +02:00
Javi Gallego 0e0e351805 Merge branch 'dev' into 7548-ticketSummaryCollection 2024-06-10 10:53:33 +02:00
Jorge Penadés d35f9c9468 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6243-generalizeCmrSection
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-07 12:03:52 +02:00
Javi Gallego 9ceac32d89 feat: refs #7548 grafana 2024-06-07 11:59:26 +02:00
Javier Segarra 0ea44eb8db Merge branch 'dev' into feature/AccountAcls 2024-06-07 10:07:15 +02:00
Alex Moreno 395eb6bed7 Merge branch 'dev' into feature/AccountRoles
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-06 07:32:15 +00:00
William Buezas 3efca6242d Account ACLs 2024-06-04 08:41:41 -03:00
Javier Segarra 5b1819f7da Merge branch 'dev' into 6321_negative_tickets 2024-06-04 09:27:46 +02:00
Jorge Penadés 1bc99cbd22 feat: refs #6243 show all cmrs & filter by warehouse
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-03 16:30:59 +02:00
Jorge Penadés f58b072964 feat: refs #6600 Add option to add comment for photo motivation
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-03 09:30:37 +02:00
Javier Segarra 28173ddee2 Merge branch 'dev' into feature/AccountRoles
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-31 10:24:37 +02:00
William Buezas 4bd78922af remove unnecesary files
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-30 15:43:26 -03:00
William Buezas 05b7df9168 Role submodules 2024-05-30 15:34:37 -03: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
Javier Segarra ceae5eaa9e Merge branch 'dev' into 6321_negative_tickets 2024-05-24 11:21:06 +02:00
Jorge Penadés 5bddc6e04d fix: refs #6942 wip: formModel
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-05-22 11:22:46 +02:00
Javier Segarra a2316fb222 feat: change skeleteon different components 2024-05-18 10:35:08 +02:00
Javier Segarra aa007117a7 Merge branch 'dev' into 7311_boilerplate_users
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-18 10:16:28 +02:00
Javier Segarra 372e797059 feat: recover split
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-05-15 16:25:25 +02:00
Javier Segarra 58597bdddf Merge branch 'dev' into 6321_negative_tickets
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-15 08:55:47 +02:00
Javier Segarra 1ca7420207 feat: replace item 2024-05-15 08:54:22 +02:00
Jorge Penadés a6c761c031 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into fix_Customer_1
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-14 13:42:38 +02:00
Javier Segarra 32e715ce6b Merge branch 'dev' into feature/Monitors
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-13 17:59:39 +02:00
Jorge Penadés 99ea8e843c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6321_negative_tickets
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-13 13:22:39 +02:00
Jorge Penadés 0b83d3663f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5919-locker
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-13 13:20:15 +02:00
Javier Segarra 7f185c091b feat: add descriptor 2024-05-10 08:13:02 +02:00
Javier Segarra c68ad5be34 feat #7311: minor changes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-09 08:40:00 +02:00
Javier Segarra 034342beb2 Merge branch 'dev' into 7311_boilerplate_users
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-09 08:29:18 +02:00
Javier Segarra 99ef7fad76 feat #7311: subsections 2024-05-09 08:28:58 +02:00
Javier Segarra c8b9233c87 feat #7311: i18n pageTitles 2024-05-09 08:00:53 +02:00
William Buezas 712d7e13ff Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/Monitors 2024-05-08 10:45:05 -03:00
William Buezas 5bdbbf426a Tables development 2024-05-08 10:43:18 -03:00
Javier Segarra 61519595a9 Merge branch 'dev' into 6321_negative_tickets
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-08 12:30:01 +02:00
Jorge Penadés a1f785ccbe feat: refs #5919 WIP workerlocker
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-08 11:02:40 +02:00
Javier Segarra ccc87a0958 Merge branch 'dev' into 7271_boilerplate_zones
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-08 07:52:59 +02:00
Alex Moreno a139c11a22 Merge branch 'test' into fix_Customer_1
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-05-07 07:05:25 +00:00
William Buezas dbc9e9dd71 Sales monitor base 2024-05-05 19:13:36 -03:00
Jon Elias 312985b427 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7271_boilerplate_zones
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-03 12:37:30 +02:00
Jon Elias 1a5f2fbea2 feat: refs #7271 advanced structure 2024-05-03 12:30:53 +02:00
William Buezas d2e178a41b resolve conflicts
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-02 12:02:44 -03:00
Javier Segarra 9fa03beda1 Merge branch 'dev' into 6887-endClaimMigration
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-02 12:44:02 +00:00