Jorge Penadés
|
613492d04a
|
Merge pull request 'fix conflicts' (!361) from testToDev into dev
gitea/salix-front/pipeline/head This commit looks good
Details
Reviewed-on: #361
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
|
2024-05-07 14:37:08 +00:00 |
Jorge Penadés
|
392d1892ba
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into testToDev
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-07 16:19:13 +02:00 |
Jorge Penadés
|
0e7c2c7118
|
Merge pull request '#6938-warmfix' (!359) from 6938-warmfix into test
gitea/salix-front/pipeline/head This commit looks good
Details
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
gitea/salix-front/pipeline/pr-master This commit looks good
Details
Reviewed-on: #359
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2024-05-07 14:21:13 +00:00 |
Jorge Penadés
|
5e0db81a21
|
fix: refs #6938 conflicts
gitea/salix-front/pipeline/pr-test This commit looks good
Details
|
2024-05-07 15:51:55 +02:00 |
Jorge Penadés
|
ac0ebf431f
|
Merge pull request '#6938 wamfix workerCard' (!357) from 6938-warmfix-masterToTest into test
gitea/salix-front/pipeline/head There was a failure building this commit
Details
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
gitea/salix-front/pipeline/pr-test This commit looks good
Details
Reviewed-on: #357
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
|
2024-05-07 13:37:05 +00:00 |
Jorge Penadés
|
0a71060f60
|
fix: refs #6938 workerCard
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
gitea/salix-front/pipeline/pr-test This commit looks good
Details
|
2024-05-07 15:28:00 +02:00 |
Alex Moreno
|
1d9616c25e
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head There was a failure building this commit
Details
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-07 14:18:56 +02:00 |
Alex Moreno
|
13f8937f12
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
gitea/salix-front/pipeline/head There was a failure building this commit
Details
|
2024-05-07 14:18:36 +02:00 |
Javier Segarra
|
0843d70951
|
Merge pull request 'Item Shelving' (!343) from hyervoni/salix-front-mindshore:feature/ItemShelving into dev
gitea/salix-front/pipeline/head This commit looks good
Details
Reviewed-on: #343
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-05-07 10:57:43 +00:00 |
Alex Moreno
|
9b31fa5042
|
Merge branch 'dev' into feature/ItemShelving
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-07 10:54:12 +00:00 |
Javier Segarra
|
175746a4a4
|
Merge pull request 'Item Basic data' (!346) from hyervoni/salix-front-mindshore:feature/ItemBasicData into dev
gitea/salix-front/pipeline/head This commit looks good
Details
Reviewed-on: #346
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-05-07 10:47:01 +00:00 |
Javier Segarra
|
753b5bf939
|
Merge branch 'dev' into feature/ItemBasicData
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-07 10:44:48 +00:00 |
Jorge Penadés
|
095e62ebac
|
Merge pull request '#6938 rollback phone' (!355) from 6938-hotfix-rollbackHidePhone into master
gitea/salix-front/pipeline/head This commit looks good
Details
gitea/salix-front/pipeline/pr-test There was a failure building this commit
Details
Reviewed-on: #355
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-05-07 10:44:05 +00:00 |
Jorge Penadés
|
5712810ae2
|
fix: refs #6938 rollback phone
gitea/salix-front/pipeline/pr-master This commit looks good
Details
|
2024-05-07 12:00:20 +02:00 |
Alex Moreno
|
4caf27b4f8
|
deploy: init version 2422
gitea/salix-front/pipeline/head This commit looks good
Details
|
2024-05-07 08:37:52 +02:00 |
Alex Moreno
|
82db1fac11
|
Merge pull request '7336_devToTest' (!354) from 7336_devToTest into test
gitea/salix-front/pipeline/head This commit looks good
Details
Reviewed-on: #354
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
|
2024-05-07 06:33:59 +00:00 |
Alex Moreno
|
e4ffd4fcdd
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good
Details
gitea/salix-front/pipeline/pr-test This commit looks good
Details
|
2024-05-07 08:04:46 +02:00 |
Alex Moreno
|
5341f555ef
|
Merge pull request '7299_testToMaster' (!351) from 7299_testToMaster into master
gitea/salix-front/pipeline/head This commit looks good
Details
Reviewed-on: #351
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
|
2024-05-07 05:36:02 +00:00 |
Javier Segarra
|
605a24156b
|
Merge branch 'dev' into feature/ItemShelving
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-06 07:54:28 +00:00 |
Javier Segarra
|
49b6c57ad4
|
fix: show Color
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-06 08:53:12 +02:00 |
Javier Segarra
|
6a81076874
|
fix: replace inputMin rule
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-06 08:45:29 +02:00 |
Javier Segarra
|
62bf968b0b
|
change action to st-actions
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-06 08:41:12 +02:00 |
Javier Casado
|
f6abcc6693
|
Merge pull request 'refs #7113 fix test' (!318) from 7113-fixClaimPhoto into dev
gitea/salix-front/pipeline/head This commit looks good
Details
Reviewed-on: #318
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-05-06 06:38:47 +00:00 |
Javier Segarra
|
f85665b271
|
fix: replace QToolbar by Teleport
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-06 08:37:41 +02:00 |
Javier Segarra
|
0f5d06614d
|
feat: VnInput numberValidation
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-06 07:24:52 +02:00 |
William Buezas
|
d15a92ce7d
|
Resolve conflicts
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-03 08:57:39 -03:00 |
jcasado
|
e744077d65
|
Merge branch '7113-fixClaimPhoto' of https://gitea.verdnatura.es/verdnatura/salix-front into 7113-fixClaimPhoto
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-03 10:21:49 +02:00 |
jcasado
|
f7e91424b9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7113-fixClaimPhoto
|
2024-05-03 10:21:41 +02:00 |
Javier Casado
|
534f71c9e3
|
Merge branch 'dev' into 7113-fixClaimPhoto
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-03 07:26:10 +00: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 |
William Buezas
|
d68934a526
|
Item basic data
|
2024-05-02 11:51:04 -03:00 |
Javier Segarra
|
e3a36c0ab1
|
Merge pull request 'refactor: refs #6887 pending claim changes' (!335) from 6887-endClaimMigration into dev
gitea/salix-front/pipeline/head This commit looks good
Details
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
Reviewed-on: #335
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
|
2024-05-02 12:45:12 +00: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 |
Javier Segarra
|
9dcce336a8
|
Merge pull request 'Item last entries' (!342) from hyervoni/salix-front-mindshore:feature/ItemLastEntries into dev
gitea/salix-front/pipeline/head There was a failure building this commit
Details
Reviewed-on: #342
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-05-02 12:43:04 +00:00 |
Javier Segarra
|
988be19b96
|
Merge branch 'dev' into 6887-endClaimMigration
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-02 12:42:46 +00:00 |
Javier Segarra
|
d069ca5095
|
Merge branch '6887-endClaimMigration' of https://gitea.verdnatura.es/verdnatura/salix-front into 6887-endClaimMigration
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
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
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-02 14:34:54 +02:00 |
Javier Segarra
|
1675919801
|
fix: minor build bugs
|
2024-05-02 14:33:24 +02:00 |
Javier Segarra
|
7e842f2ce1
|
Merge pull request 'Item tax' (!337) from hyervoni/salix-front-mindshore:feature/ItemTax into dev
gitea/salix-front/pipeline/head There was a failure building this commit
Details
Reviewed-on: #337
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-05-02 12:23:53 +00:00 |
William Buezas
|
8043d72676
|
Merge branch 'feature/ItemLastEntries' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/ItemLastEntries
gitea/salix-front/pipeline/pr-dev There was a failure building this commit
Details
|
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
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-02 12:05:30 +00:00 |
Javier Segarra
|
f90bd908a5
|
Merge branch 'dev' into feature/ItemTax
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-02 14:00:01 +02:00 |
Carlos Satorres
|
104b159039
|
Merge pull request 'refs #6895 remove autoload' (!341) from 6895-removeShelving into dev
gitea/salix-front/pipeline/head There was a failure building this commit
Details
Reviewed-on: #341
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-05-02 11:43:48 +00:00 |
Jon Elias
|
0fa2a99080
|
Merge branch '6887-endClaimMigration' of https://gitea.verdnatura.es/verdnatura/salix-front into 6887-endClaimMigration
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
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
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-02 10:09:41 +00:00 |
Javier Segarra
|
6a958a0807
|
Actualizar src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
gitea/salix-front/pipeline/pr-dev There was a failure building this commit
Details
|
2024-05-02 08:32:39 +00:00 |