 Jorge Penadés
|
e7c9a18f36
|
refs #6104 fix package
gitea/salix-front/pipeline/head This commit looks good
Details
|
2023-12-11 12:29:31 +01:00 |
|
Jorge Penadés
|
d2e9a4cde4
|
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-11 12:00:10 +01:00 |
|
Jorge Penadés
|
63372df35a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6104-changeVnLog
gitea/salix-front/pipeline/head This commit looks good
Details
|
2023-12-11 11:59:46 +01:00 |
|
Jorge Penadés
|
52622d9a00
|
refs #6104 fix tests
gitea/salix-front/pipeline/head This commit looks good
Details
|
2023-12-11 11:59:01 +01:00 |
 Carlos Satorres
|
fbb59b8d61
|
Merge pull request 'refs #5633 create componente VnAccountNumber' (!118) from 5633-accountNumberComponent into dev
gitea/salix-front/pipeline/head This commit looks good
Details
Reviewed-on: #118
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
|
2023-12-11 08:36:32 +00:00 |
|
Carlos Satorres
|
f5e89a9edc
|
Merge branch 'dev' into 5633-accountNumberComponent
gitea/salix-front/pipeline/head This commit looks good
Details
|
2023-12-11 08:31:08 +00:00 |
|
Jorge Penadés
|
42c34f7a46
|
refs #6104 merge conflicts
gitea/salix-front/pipeline/head This commit looks good
Details
|
2023-12-11 09:11:39 +01:00 |
 Pablo Natek
|
5c84a68ca6
|
Merge pull request '6475-descriptor_preview' (!109) from 6475-descriptor_preview into dev
gitea/salix-front/pipeline/head This commit looks good
Details
Reviewed-on: #109
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2023-12-11 07:27:42 +00:00 |
|
Jorge Penadés
|
ea12508fff
|
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-11 08:27:07 +01:00 |
|
Pablo Natek
|
e7d22052a7
|
merge(dev): refs #6475 merge dev
gitea/salix-front/pipeline/head This commit looks good
Details
|
2023-12-11 06:45:48 +01:00 |
|
Pablo Natek
|
1c3fc57e3d
|
feat: refs #6475 open descriptor proxy an show summary dialog button
gitea/salix-front/pipeline/head This commit looks good
Details
|
2023-12-11 06:35:54 +01:00 |
 William Buezas
|
f9fe504969
|
Apply dark/light colors to cards secondary button
|
2023-12-07 17:20:27 -03:00 |
|
William Buezas
|
ec9e8ec4e0
|
Merge branch 'dev' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into dev
|
2023-12-07 14:54:58 -03:00 |
|
William Buezas
|
d91c6ff11f
|
new requested changes
|
2023-12-07 14:54:53 -03:00 |
 Carlos Fonseca
|
b8d30fa0a4
|
Merge pull request 'Se corrige error por falta de importacion' (#30) from features/ms_correcciones_pr_2 into dev
Reviewed-on: hyervoni/salix-front-mindshore#30
|
2023-12-07 17:44:42 +00:00 |
carlosfonseca
|
02027d4392
|
Se corrige error por falta de importacion
|
2023-12-07 12:43:07 -05:00 |
|
Carlos Fonseca
|
0e624bdfd3
|
Merge pull request 'Se hacen correcciones segun solicititud para aprobacion del PR' (#29) from features/ms_correcciones_pr into dev
Reviewed-on: hyervoni/salix-front-mindshore#29
|
2023-12-07 17:39:01 +00:00 |
|
carlosfonseca
|
c2705ec603
|
Se hacen correcciones segun solicititud para aprobacion del PR
|
2023-12-07 12:36:29 -05:00 |
Kevin Martinez
|
4fd2b05137
|
Fix shelving pages
|
2023-12-07 13:33:11 -04:00 |
|
Jorge Penadés
|
479c782492
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6104-changeVnLog
gitea/salix-front/pipeline/head This commit looks good
Details
|
2023-12-07 16:25:13 +01:00 |
|
Jorge Penadés
|
09ff922c94
|
Merge pull request 'refs #5876 spinnerOnLoading' (!125) from 5876-spinnerOnLoading into dev
gitea/salix-front/pipeline/head This commit looks good
Details
Reviewed-on: #125
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2023-12-07 15:23:53 +00:00 |
|
Jorge Penadés
|
e15b14cd81
|
refs #5876 use palette color
gitea/salix-front/pipeline/head This commit looks good
Details
|
2023-12-07 16:18:16 +01:00 |
|
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
|
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 |
|
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 |