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

2408 Commits

Author SHA1 Message Date
William Buezas 399c2723a9 change monitor list layout 2024-05-08 10:58:27 -03: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
Carlos Satorres 3d3f72757a Merge branch 'dev' into 6842-errorCalendar 2024-05-08 08:10:37 +00:00
Alex Moreno d69b362407 Merge branch 'dev' into feature/ItemTags 2024-05-08 08:02:55 +00:00
Javier Segarra ccc87a0958 Merge branch 'dev' into 7271_boilerplate_zones 2024-05-08 07:52:59 +02:00
Javier Segarra 9a6dd65774 feat: remove deprecatedHour fn 2024-05-08 07:52:18 +02:00
Jorge Penadés 392d1892ba Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into testToDev 2024-05-07 16:19:13 +02:00
Jorge Penadés 5e0db81a21 fix: refs #6938 conflicts 2024-05-07 15:51:55 +02:00
Jorge Penadés 0a71060f60 fix: refs #6938 workerCard 2024-05-07 15:28:00 +02:00
Alex Moreno 1d9616c25e Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-05-07 14:18:56 +02:00
Alex Moreno 13f8937f12 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-05-07 14:18:36 +02:00
Alex Moreno 9b31fa5042 Merge branch 'dev' into feature/ItemShelving 2024-05-07 10:54:12 +00:00
Jorge Penadés 5712810ae2 fix: refs #6938 rollback phone 2024-05-07 12:00:20 +02:00
Javier Segarra c0dd140a3a fix: validTag 2024-05-07 11:38:12 +02:00
Carlos Satorres ac0993aa11 refs #6842 pr changes 2024-05-07 10:20:26 +02:00
Javier Segarra 4d490652ea feat #7271: add template 2024-05-06 10:11:07 +02:00
Javier Segarra 49b6c57ad4 fix: show Color 2024-05-06 08:53:12 +02:00
Javier Segarra 6a81076874 fix: replace inputMin rule 2024-05-06 08:45:29 +02:00
Javier Segarra 62bf968b0b change action to st-actions 2024-05-06 08:41:12 +02:00
Javier Segarra f85665b271 fix: replace QToolbar by Teleport 2024-05-06 08:37:41 +02:00
Javier Segarra 0f5d06614d feat: VnInput numberValidation 2024-05-06 07:24:52 +02:00
William Buezas dbc9e9dd71 Sales monitor base 2024-05-05 19:13:36 -03:00
William Buezas f3b1de1ee4 Item tags 2024-05-03 17:19:13 -03:00
Javier Segarra 743faef956 fix: #6842 Not update calendar correctly 2024-05-03 15:05:37 +02:00
Carlos Satorres 710b45f43a refs #6842 isFreelance 2024-05-03 14:49:50 +02:00
William Buezas d15a92ce7d Resolve conflicts 2024-05-03 08:57:39 -03:00
William Buezas 99adc9aa05 WIP 2024-05-03 08:53:50 -03:00
Jon Elias 312985b427 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7271_boilerplate_zones 2024-05-03 12:37:30 +02:00
Jon Elias f03ad52387 Merge branch '7271_boilerplate_zones' of https://gitea.verdnatura.es/verdnatura/salix-front into 7271_boilerplate_zones 2024-05-03 12:31:22 +02:00
Jon Elias 1a5f2fbea2 feat: refs #7271 advanced structure 2024-05-03 12:30:53 +02:00
William Buezas d2e178a41b resolve conflicts 2024-05-02 12:02:44 -03:00
William Buezas d68934a526 Item basic data 2024-05-02 11:51:04 -03:00
Javier Segarra 9fa03beda1 Merge branch 'dev' into 6887-endClaimMigration 2024-05-02 12:44:02 +00:00
Javier Segarra 988be19b96 Merge branch 'dev' into 6887-endClaimMigration 2024-05-02 12:42:46 +00:00
Javier Segarra cb0d721465 feat: zoneSummary 2024-05-02 14:41:51 +02:00
Javier Segarra d069ca5095 Merge branch '6887-endClaimMigration' of https://gitea.verdnatura.es/verdnatura/salix-front into 6887-endClaimMigration 2024-05-02 14:40:59 +02:00
Javier Segarra 1a79bd6fb8 feat: zoneSummary 2024-05-02 14:40:56 +02:00
Javier Segarra 03759d2746 Merge branch 'dev' into feature/ItemLastEntries 2024-05-02 14:34:54 +02:00
Javier Segarra 1675919801 fix: minor build bugs 2024-05-02 14:33:24 +02:00
William Buezas 8043d72676 Merge branch 'feature/ItemLastEntries' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/ItemLastEntries 2024-05-02 09:16:44 -03:00
William Buezas 120e84f439 Add condition to packing and grouping badge colors 2024-05-02 09:16:24 -03:00
William Buezas 554b9e814b WIP 2024-05-02 09:08:03 -03:00
Javier Segarra 793376139c Merge branch 'dev' into 6887-endClaimMigration 2024-05-02 12:05:30 +00:00
Javier Segarra f90bd908a5 Merge branch 'dev' into feature/ItemTax 2024-05-02 14:00:01 +02:00
Jon Elias 0fa2a99080 Merge branch '6887-endClaimMigration' of https://gitea.verdnatura.es/verdnatura/salix-front into 6887-endClaimMigration 2024-05-02 13:03:04 +02:00
Jon Elias c1a464d9ae fix: refs #6887 fix conflicts 2024-05-02 13:02:59 +02:00
Carlos Satorres 8bb5f77b57 Merge branch 'dev' into 6895-removeShelving 2024-05-02 10:09:41 +00:00
Javier Segarra 6a958a0807 Actualizar src/pages/InvoiceIn/Card/InvoiceInDueDay.vue 2024-05-02 08:32:39 +00:00
Javier Segarra e4f787f2fa Merge branch 'dev' into feature/ItemDiary 2024-05-02 08:28:00 +00:00