Jon Elias
|
57e1a2cfdb
|
Merge branch 'dev' into 6739-invoiceOut
|
2024-05-08 12:54:41 +00:00 |
Javier Segarra
|
0ebb9c6c52
|
fix: unnexpected bottom spca
|
2024-05-08 13:43:45 +02:00 |
Javier Segarra
|
fdd94b09f3
|
style: fix searchba input width
|
2024-05-08 11:43:18 +00:00 |
Carlos Satorres
|
26506c1f9f
|
refs #6877 remove update
|
2024-05-08 13:27:42 +02:00 |
Jorge Penadés
|
f803a210a6
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6891-showRightSideFilterPanel
|
2024-05-08 13:26:05 +02:00 |
Jorge Penadés
|
e52cb99a80
|
feat: refs #6891 itemTypeSearchbar
|
2024-05-08 13:23:41 +02:00 |
Jorge Penadés
|
c02dcf622a
|
fix: refs #6891 correct redirection
|
2024-05-08 13:22:21 +02:00 |
Jorge Penadés
|
54de101442
|
feat: refs #6891 improve useRedirect
|
2024-05-08 13:00:54 +02:00 |
Jorge Penadés
|
f7b6f3b9e1
|
fix: refs #6891 parking basicData
|
2024-05-08 12:59:56 +02:00 |
Jorge Penadés
|
80336868dc
|
feat: refs #6891 improve useRedirect
|
2024-05-08 12:52:42 +02:00 |
Jorge Penadés
|
7b370e6b93
|
feat: refs #6891 improve useRedirect
|
2024-05-08 12:39:48 +02:00 |
Jorge Penadés
|
07c67b0df2
|
feat: refs #6891 keep arrayData opts
|
2024-05-08 12:30:44 +02:00 |
Carlos Satorres
|
c18d035be5
|
Merge pull request 'refs #6842 isFreelance' (!348) from 6842-errorCalendar into dev
Reviewed-on: verdnatura/salix-front#348
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-05-08 10:21:28 +00:00 |
Jorge Penadés
|
b5a599c8e7
|
feat: refs #6891 set text searchbar item
|
2024-05-08 12:09:16 +02:00 |
Jorge Penadés
|
4d1cef7f68
|
feat: refs #6891 improve useRedirect
|
2024-05-08 12:06:31 +02:00 |
Javier Segarra
|
2fc3868a25
|
Merge branch 'test' into fix_Customer_1
|
2024-05-08 09:28:13 +00:00 |
Jorge Penadés
|
1d16abd572
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6891-showRightSideFilterPanel
|
2024-05-08 11:03:40 +02:00 |
Jorge Penadés
|
a1f785ccbe
|
feat: refs #5919 WIP workerlocker
|
2024-05-08 11:02:40 +02:00 |
Jorge Penadés
|
dec9b924eb
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5919-locker
|
2024-05-08 10:36:03 +02:00 |
Carlos Satorres
|
3d3f72757a
|
Merge branch 'dev' into 6842-errorCalendar
|
2024-05-08 08:10:37 +00:00 |
Alex Moreno
|
e4af4d3e4a
|
Merge pull request 'Item tags' (!350) from hyervoni/salix-front-mindshore:feature/ItemTags into dev
Reviewed-on: verdnatura/salix-front#350
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-05-08 08:03:55 +00:00 |
Alex Moreno
|
d69b362407
|
Merge branch 'dev' into feature/ItemTags
|
2024-05-08 08:02:55 +00:00 |
Carlos Satorres
|
1b65ec7c38
|
refs #6877 fix filterdate
|
2024-05-08 09:39:26 +02:00 |
Jorge Penadés
|
ad4c3a078a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6891-showRightSideFilterPanel
|
2024-05-08 09:08:53 +02:00 |
Javier Segarra
|
6efd03dc0c
|
Merge pull request '#7271 - Zones Boilerplate' (!327) from 7271_boilerplate_zones into dev
Reviewed-on: verdnatura/salix-front#327
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2024-05-08 06:17:41 +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
|
05f7c4f2d3
|
fix: refs #6891 fix prop
|
2024-05-07 17:34:55 +02:00 |
Jorge Penadés
|
0a281b2b73
|
fix: refs #6891 rollback customUrl
|
2024-05-07 17:33:12 +02:00 |
Jorge Penadés
|
ff0e290963
|
feat: refs #6891 ticket
|
2024-05-07 17:11:51 +02:00 |
Jorge Penadés
|
29e567d405
|
fix: refs #6891 use new props
|
2024-05-07 16:42:09 +02:00 |
Jorge Penadés
|
613492d04a
|
Merge pull request 'fix conflicts' (!361) from testToDev into dev
Reviewed-on: verdnatura/salix-front#361
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
|
2024-05-07 14:37:08 +00:00 |
Jorge Penadés
|
7504e5d12c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6891-showRightSideFilterPanel
|
2024-05-07 16:36:34 +02:00 |
Jorge Penadés
|
0e7c2c7118
|
Merge pull request '#6938-warmfix' (!359) from 6938-warmfix into test
Reviewed-on: verdnatura/salix-front#359
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2024-05-07 14:21:13 +00: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
|
ac0ebf431f
|
Merge pull request '#6938 wamfix workerCard' (!357) from 6938-warmfix-masterToTest into test
Reviewed-on: verdnatura/salix-front#357
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
|
2024-05-07 13:37:05 +00:00 |
Jorge Penadés
|
0a71060f60
|
fix: refs #6938 workerCard
|
2024-05-07 15:28:00 +02:00 |
Jorge Penadés
|
014ec60e47
|
feat: refs #6891 worker & supplier
|
2024-05-07 15:10:36 +02:00 |
Alex Moreno
|
1ba3a3151c
|
feat: refs #6825 scroll for table mode
|
2024-05-07 14:54:53 +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 |
Jorge Penadés
|
6b1befa037
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6891-showRightSideFilterPanel
|
2024-05-07 14:15:03 +02:00 |
Jorge Penadés
|
64f41cf8dc
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6891-showRightSideFilterPanel
|
2024-05-07 13:47:39 +02:00 |
Carlos Satorres
|
a691644b9a
|
refs #6877 changes filter date
|
2024-05-07 13:38:25 +02:00 |
Jorge Penadés
|
e1bf3f5404
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6243-generalizeCmrSection
|
2024-05-07 13:07:16 +02:00 |
Jorge Penadés
|
0703de350c
|
fix: refs #6891 rollback order & route searchbar
|
2024-05-07 13:04:27 +02:00 |
Javier Segarra
|
0843d70951
|
Merge pull request 'Item Shelving' (!343) from hyervoni/salix-front-mindshore:feature/ItemShelving into dev
Reviewed-on: verdnatura/salix-front#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
|
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
Reviewed-on: verdnatura/salix-front#346
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-05-07 10:47:01 +00:00 |