 Jorge Penadés
|
89198ffe11
|
Merge pull request 'ref #6175 VnLinkPhone and MicroSIP icon created' (!87) from 6175-addMicrosipLink into dev
gitea/salix-front/pipeline/head This commit looks good
Details
Reviewed-on: #87
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2023-12-07 15:09:18 +00:00 |
|
Jorge Penadés
|
4ac353bcf1
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5876-spinnerOnLoading
gitea/salix-front/pipeline/head This commit looks good
Details
|
2023-12-07 16:07:56 +01:00 |
|
Jorge Penadés
|
575fa58dc6
|
Merge branch '6175-addMicrosipLink' of https://gitea.verdnatura.es/verdnatura/salix-front into 6175-addMicrosipLink
gitea/salix-front/pipeline/head This commit looks good
Details
|
2023-12-07 15:52:53 +01:00 |
|
Jorge Penadés
|
97789f2cdf
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6175-addMicrosipLink
|
2023-12-07 15:51:58 +01:00 |
|
Jorge Penadés
|
2f63a7f1fb
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5835-migrateInvoiceIn
gitea/salix-front/pipeline/head This commit looks good
Details
|
2023-12-07 15:49:53 +01:00 |
 William Buezas
|
8b112f3409
|
create componente VnSelectCreate
|
2023-12-07 11:29:49 -03:00 |
 Pablo Natek
|
fd1f46ffc6
|
feat(claimList): refs #6475 claimList add links
|
2023-12-07 12:51:47 +01:00 |
 Javier Segarra
|
745fcfe2c9
|
Merge pull request 'Merge dev-test' (!123) from dev into test
gitea/salix-front/pipeline/head This commit looks good
Details
Reviewed-on: #123
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2023-12-07 08:44:38 +00:00 |
|
Javier Segarra
|
e45f4b38bb
|
Merge pull request 'ci: dev-test' (!124) from #6527_dev-test into dev
gitea/salix-front/pipeline/head This commit looks good
Details
Reviewed-on: #124
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2023-12-07 08:23:39 +00:00 |
|
Javier Segarra
|
84226d48ed
|
ci: dev-test
gitea/salix-front/pipeline/head This commit looks good
Details
|
2023-12-07 08:46:38 +01:00 |
 Javi Gallego
|
e82c675d7d
|
Merge branch 'test' into dev
gitea/salix-front/pipeline/head This commit looks good
Details
|
2023-12-07 07:54:39 +01:00 |
|
Javi Gallego
|
dfabdeb706
|
Merge branch 'test' into dev
|
2023-12-07 07:54:36 +01:00 |
|
Javier Segarra
|
716fdb75fb
|
Merge pull request 'refs #5736 fix: i18n broken test env' (!115) from 5736_i18n_broken_test into test
gitea/salix-front/pipeline/head This commit looks good
Details
Reviewed-on: #115
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2023-12-07 06:40:15 +00:00 |
|
Javier Segarra
|
e8b85494bf
|
Merge branch 'test' into 5736_i18n_broken_test
gitea/salix-front/pipeline/head This commit looks good
Details
|
2023-12-07 06:39:24 +00:00 |
|
William Buezas
|
baca1281bf
|
Input text refactor
|
2023-12-06 13:23:32 -03:00 |
|
Pablo Natek
|
335c417509
|
Merge pull request '6545-more-feats-and-fixes' (!121) from 6545-more-feats-and-fixes into test
gitea/salix-front/pipeline/head This commit looks good
Details
Reviewed-on: #121
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2023-12-06 15:42:12 +00:00 |
|
Pablo Natek
|
735eac5137
|
feat: refs #6545 isTray
gitea/salix-front/pipeline/head This commit looks good
Details
|
2023-12-06 15:17:50 +01:00 |
|
Pablo Natek
|
6c524932ee
|
feat(addSpecific): refs #6545 add feats and fixes
gitea/salix-front/pipeline/head This commit looks good
Details
|
2023-12-06 14:14:47 +01:00 |
|
Pablo Natek
|
915f7ea45d
|
Merge pull request 'feat(wagonCounter): refs #6545 add +30 button and correct images' (!120) from 6545-fixWagonCounter into test
gitea/salix-front/pipeline/head This commit looks good
Details
Reviewed-on: #120
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2023-12-06 11:51:18 +00:00 |
|
Pablo Natek
|
e963eddfe6
|
feat(wagonCounter): refs #6545 add +30 button and correct images
gitea/salix-front/pipeline/head This commit looks good
Details
|
2023-12-06 12:09:03 +01:00 |
|
Pablo Natek
|
3b018a58e6
|
Merge pull request 'feat(wagonCounter): refs #6545 move to test' (!119) from 6545-counters-to-test into test
gitea/salix-front/pipeline/head This commit looks good
Details
Reviewed-on: #119
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2023-12-06 08:57:25 +00:00 |
|
Pablo Natek
|
9a566ba87c
|
feat(wagonCounter): refs #6545 move to test
gitea/salix-front/pipeline/head This commit looks good
Details
|
2023-12-06 09:48:51 +01:00 |
 Carlos Fonseca
|
0dbb23075b
|
Merge pull request 'feature/ms-23-ExtraCommunity' (#26) from feature/ms-23-ExtraCommunity into dev
Reviewed-on: hyervoni/salix-front-mindshore#26
|
2023-12-05 18:48:54 +00:00 |
|
William Buezas
|
f8031734fa
|
resolve conflicts
|
2023-12-05 12:27:53 -03:00 |
|
William Buezas
|
e64960d234
|
Extra community
|
2023-12-05 12:25:25 -03:00 |
 Carlos Satorres
|
d328951ac1
|
refs #6256 refactor line break
gitea/salix-front/pipeline/head This commit looks good
Details
|
2023-12-05 14:26:11 +01:00 |
|
Jorge Penadés
|
ca9d3611af
|
Merge pull request 'refs #6545 counters created' (!116) from 6545-trolleyCounter into dev
gitea/salix-front/pipeline/head This commit looks good
Details
Reviewed-on: #116
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2023-12-05 07:47:51 +00:00 |
|
Jorge Penadés
|
e22c400326
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6545-trolleyCounter
gitea/salix-front/pipeline/head This commit looks good
Details
|
2023-12-05 08:32:15 +01:00 |
|
Jorge Penadés
|
7fb78ac298
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5835-migrateInvoiceIn
gitea/salix-front/pipeline/head This commit looks good
Details
|
2023-12-05 08:31:44 +01:00 |
|
Carlos Satorres
|
f8659c2153
|
Merge pull request 'refs #6334 fix amount, colors' (!117) from 6334-updateLinesAmount into dev
gitea/salix-front/pipeline/head This commit looks good
Details
Reviewed-on: #117
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2023-12-05 06:08:05 +00:00 |
|
Carlos Fonseca
|
66de3c73d3
|
Merge pull request 'Se cambia visualmente el componente que controla las descargas' (#25) from features/ms_39_rediseño_check_descargas into dev
Reviewed-on: hyervoni/salix-front-mindshore#25
|
2023-12-04 18:19:02 +00:00 |
carlosfonseca
|
ce72b52e88
|
Reubicacion de textos i18n a global
|
2023-12-04 12:54:40 -05:00 |
|
carlosfonseca
|
9f3fe3665b
|
Se cambia visualmente el componente que controla las descargas
|
2023-12-04 12:02:47 -05:00 |
|
Jorge Penadés
|
b43985b9db
|
refs #5835 refactor
gitea/salix-front/pipeline/head This commit looks good
Details
|
2023-12-04 15:26:19 +01:00 |
|
Jorge Penadés
|
a730f2c073
|
refs #6545 refactor
gitea/salix-front/pipeline/head This commit looks good
Details
|
2023-12-04 15:07:40 +01:00 |
|
Jorge Penadés
|
3d046e4bf7
|
refs #5835 summary grid updated
gitea/salix-front/pipeline/head This commit looks good
Details
|
2023-12-04 14:21:29 +01:00 |
|
Carlos Satorres
|
b400a23d43
|
refs #5633 remove emit
gitea/salix-front/pipeline/head This commit looks good
Details
|
2023-12-04 13:06:07 +01:00 |
|
Carlos Satorres
|
b2b366032f
|
refs #5633 create componente VnAccountNumber
gitea/salix-front/pipeline/head This commit looks good
Details
|
2023-12-04 12:24:39 +01:00 |
|
Carlos Satorres
|
03e42f676b
|
refs #6334 remove class
gitea/salix-front/pipeline/head This commit looks good
Details
|
2023-12-04 12:02:27 +01:00 |
|
Carlos Satorres
|
4eee95b945
|
refs #6334 fix amount, colors
gitea/salix-front/pipeline/head This commit looks good
Details
|
2023-12-04 11:40:17 +01:00 |
|
Jorge Penadés
|
a3d6275b2f
|
refs #6545 counters created
gitea/salix-front/pipeline/head This commit looks good
Details
|
2023-12-04 10:38:35 +01:00 |
|
Javier Segarra
|
51a2e7244c
|
refs #5736 fix: i18n broken test env
gitea/salix-front/pipeline/head This commit looks good
Details
|
2023-12-01 13:57:48 +01:00 |
|
William Buezas
|
9b6ec56011
|
Merge branch 'dev' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/ms-23-ExtraCommunity
|
2023-12-01 09:42:47 -03:00 |
|
William Buezas
|
1e3406b5fa
|
remove added vscode settings
|
2023-12-01 09:33:56 -03:00 |
 Kevin Martinez
|
f040037f8f
|
Merge pull request 'Implementacion de shelvings' (#23) from feature/shelving into dev
Reviewed-on: hyervoni/salix-front-mindshore#23
|
2023-12-01 11:28:51 +00:00 |
Kevin Martinez
|
f6067a6803
|
Merge branch 'dev' into feature/shelving
|
2023-12-01 08:25:47 -03:00 |
|
William Buezas
|
cdcdd4c544
|
Merge pull request 'New general improvements' (#24) from feature/new-improvements into dev
Reviewed-on: hyervoni/salix-front-mindshore#24
|
2023-12-01 11:24:55 +00:00 |
|
William Buezas
|
815231fec9
|
resolve conflict
|
2023-12-01 08:23:06 -03:00 |
|
William Buezas
|
dc29c51cf4
|
merge with dev
|
2023-12-01 08:17:47 -03:00 |
|
Kevin Martinez
|
11a029289b
|
Merge branch 'dev' into feature/shelving
|
2023-12-01 08:16:17 -03:00 |