Jorge Penadés
|
0eb7d0f1b0
|
fix: refs #6630 resolve conficts
|
2024-01-10 15:35:01 +01:00 |
Jorge Penadés
|
0a940e2cfb
|
Merge pull request '#6643 create vnUserLink' (!147) from 6643-VnUserLink into dev
Reviewed-on: verdnatura/salix-front#147
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2024-01-10 13:56:59 +00:00 |
Jorge Penadés
|
fb4c371371
|
fix: refs #6643 remove console log
|
2024-01-10 14:36:30 +01:00 |
Jorge Penadés
|
315c089936
|
fix: refs #6643 fix tests
|
2024-01-10 14:01:36 +01:00 |
Jorge Penadés
|
2555d2b2d1
|
feat: refs #6643 create VnUserLink
|
2024-01-10 11:21:02 +01:00 |
Jorge Penadés
|
7b8ad3720e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6643-VnUserLink
|
2024-01-10 10:41:49 +01:00 |
Carlos Satorres
|
ceeba871ce
|
Merge pull request 'refs #6420 change url' (!136) from 6420-claimNotesSummary into dev
Reviewed-on: verdnatura/salix-front#136
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-01-10 07:27:18 +00:00 |
Carlos Satorres
|
fa62eb0292
|
Merge branch 'dev' into 6420-claimNotesSummary
|
2024-01-10 07:23:42 +00:00 |
Carlos Satorres
|
2825001bca
|
Merge pull request 'refs #6383 darkMode' (!152) from 6383-darkMode into dev
Reviewed-on: verdnatura/salix-front#152
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-01-10 07:23:29 +00:00 |
Jorge Penadés
|
57eca9b267
|
fix: refs #6630 getLogTree grouping fixed
|
2024-01-09 15:21:26 +01:00 |
Carlos Satorres
|
b83a773278
|
refs #6420 fix pr
|
2024-01-09 14:55:52 +01:00 |
Carlos Satorres
|
a4a7a48fb6
|
refs #6383 fix
|
2024-01-09 14:48:47 +01:00 |
Carlos Satorres
|
9e314276bd
|
refs #6383 set dark
|
2024-01-09 14:37:44 +01:00 |
Jorge Penadés
|
5438ce5c33
|
fix: refs #6630 fix css
|
2024-01-09 14:34:25 +01:00 |
Jorge Penadés
|
3e8744c837
|
fix: refs #6630 fix css
|
2024-01-09 14:24:29 +01:00 |
Carlos Satorres
|
a59a86dfd6
|
refs #6383 darkMode
|
2024-01-09 08:36:50 +01:00 |
Carlos Satorres
|
63b1c53ca9
|
refs #6420 scss fix
|
2024-01-08 14:17:40 +01:00 |
Carlos Satorres
|
651cc6b1ee
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6420-claimNotesSummary
|
2024-01-08 13:46:33 +01:00 |
Jorge Penadés
|
647bb58148
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6643-VnUserLink
|
2024-01-08 13:41:04 +01:00 |
Alex Moreno
|
94e4bb383a
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
|
2024-01-08 12:02:00 +01:00 |
Alex Moreno
|
dcedc314f7
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
|
2024-01-08 12:01:38 +01:00 |
Alex Moreno
|
80276100f5
|
refs #6062 fix: console.logs
|
2024-01-08 11:42:21 +01:00 |
Alex Moreno
|
75d2c9ac32
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front
|
2024-01-08 11:39:22 +01:00 |
Alex Moreno
|
1775ac85e2
|
refs #6062 fix(claimAction): pagination. fix(claimDevelopment): alignament. fix(claimSummary): object can be null
|
2024-01-08 11:39:21 +01:00 |
Pablo Natek
|
e3bd3ac663
|
Merge pull request 'fix(workerDescriptor): refs #6611 fix workerpopUp' (!146) from 6611-workerDescriptorPopUp into master
Reviewed-on: verdnatura/salix-front#146
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-01-08 09:15:18 +00:00 |
Pablo Natek
|
b670f6b3ee
|
Merge pull request 'refactor(ticketsms): refs #6259 add vnSms create customerSms' (!137) from 6259-ticketSmsToClientSms into dev
Reviewed-on: verdnatura/salix-front#137
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-01-08 07:59:29 +00:00 |
Jorge Penadés
|
a002231d3d
|
refactor: refs #6643 drop payments title
|
2024-01-08 08:52:17 +01:00 |
Pablo Natek
|
ad2844d88d
|
fix(workerDescriptor): refs #6611 fix workerpopUp
|
2024-01-08 08:37:36 +01:00 |
Pablo Natek
|
eca2413630
|
Merge branch 'dev' into 6259-ticketSmsToClientSms
|
2024-01-08 07:23:28 +00:00 |
Alex Moreno
|
babc217083
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
|
2024-01-08 08:00:23 +01:00 |
Alex Moreno
|
741ce4c274
|
refs #6062 fix: invoiceOuts translation
|
2024-01-08 08:00:06 +01:00 |
Pablo Natek
|
11a37b7716
|
Merge branch 'dev' into 6259-ticketSmsToClientSms
|
2024-01-04 14:47:46 +00:00 |
Carlos Satorres
|
7ae05f23fc
|
refs #6420 notes
|
2024-01-04 14:38:33 +01:00 |
Carlos Satorres
|
d30d16bced
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6420-claimNotesSummary
|
2024-01-04 12:23:09 +01:00 |
Alex Moreno
|
a7289602cc
|
Merge pull request '6618-vnSubToolBar' (!143) from 6618-vnSubToolBar into dev
Reviewed-on: verdnatura/salix-front#143
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-01-04 09:56:50 +00:00 |
Carlos Satorres
|
83cfd8e4da
|
Merge branch 'dev' into 6618-vnSubToolBar
|
2024-01-04 09:33:24 +00:00 |
Carlos Satorres
|
96acd00469
|
refs #6618 remove import
|
2024-01-04 10:33:11 +01:00 |
Alex Moreno
|
4306226e5c
|
refs #6635 feat: correct version
|
2024-01-04 08:08:28 +01:00 |
Carlos Satorres
|
9cd20439a6
|
refs #6618 fix name
|
2024-01-03 14:09:29 +01:00 |
Carlos Satorres
|
9a9bb2fa44
|
refs #6618 invoiceOut fix
|
2024-01-03 13:24:49 +01:00 |
Carlos Satorres
|
3c98d099b3
|
refs #6618 component Cards
|
2024-01-03 13:00:45 +01:00 |
Carlos Satorres
|
92127b766b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6618-vnSubToolBar
|
2024-01-03 13:00:25 +01:00 |
Javier Segarra
|
8bde0073f0
|
Merge pull request '#6098 - Show Toast when copy token' (!141) from 6098_lilium_token_copy into dev
Reviewed-on: verdnatura/salix-front#141
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2024-01-03 10:44:26 +00:00 |
Carlos Satorres
|
6b23c988b3
|
refs #6618 component vnSubToolBar
|
2024-01-03 11:06:03 +01:00 |
Carlos Satorres
|
3acc4b0d58
|
vn qtoolbar
|
2024-01-03 09:59:27 +01:00 |
Javier Segarra
|
6a6e38bb60
|
Merge branch '6098_lilium_token_copy' of https://gitea.verdnatura.es/verdnatura/salix-front into 6098_lilium_token_copy
|
2024-01-03 09:39:31 +01:00 |
Javier Segarra
|
c4cf9842cb
|
refs #6098 perf: add vite-ignore
|
2024-01-03 09:39:28 +01:00 |
Javier Segarra
|
e05a49e7b7
|
Merge branch 'dev' into 6098_lilium_token_copy
|
2024-01-03 08:22:20 +00:00 |
Javier Segarra
|
b00b2941c7
|
refs #6098 perf: define locale equivalences in i18n folder
|
2024-01-03 09:18:35 +01:00 |
Carlos Satorres
|
013a00d653
|
Merge pull request 'refs #6256 lv breakword' (!104) from 6256-breakWord into dev
Reviewed-on: verdnatura/salix-front#104
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-01-03 08:18:14 +00:00 |