 Javi Gallego
|
56a46cd130
|
4560
|
2024-06-03 11:52:19 +02:00 |
|
Javi Gallego
|
ca4193e11a
|
Merge branch 'dev' into 4560-gastos-reparto
|
2024-06-03 11:31:33 +02:00 |
 William Buezas
|
8e1f7c24a4
|
submodules WIP
|
2024-06-02 13:26:46 -03:00 |
|
William Buezas
|
1c14841233
|
Several changes
|
2024-05-31 14:02:50 -03:00 |
 Javier Segarra
|
28173ddee2
|
Merge branch 'dev' into feature/AccountRoles
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-31 10:24:37 +02:00 |
|
Javier Segarra
|
4268f15d30
|
perf: remove unnecessary submodules
|
2024-05-31 10:23:03 +02:00 |
|
Javier Segarra
|
c2dd7831d1
|
perf: remove unnecessary components
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-31 10:17:44 +02:00 |
|
William Buezas
|
5c25c77f19
|
Mail aliases
|
2024-05-30 13:09:11 -03:00 |
|
William Buezas
|
0cf4f41d19
|
Merge branch '7311_boilerplate_users' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/MailAliases
|
2024-05-30 08:38:23 -03:00 |
|
William Buezas
|
d82de6da58
|
Account roles
|
2024-05-29 16:14:29 -03:00 |
 Alex Moreno
|
2b6612317c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation
|
2024-05-29 14:05:42 +02:00 |
|
Javier Segarra
|
532d60130d
|
Merge branch 'dev' into feature/ZoneCalendar
|
2024-05-29 11:28:53 +02:00 |
|
Alex Moreno
|
5965e70740
|
Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation
|
2024-05-29 07:50:15 +02:00 |
|
William Buezas
|
0659eac652
|
Merge branch '7311_boilerplate_users' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/AccountRoles
|
2024-05-28 18:38:13 -03:00 |
|
William Buezas
|
4292804922
|
Merge branch '7311_boilerplate_users' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/AccountList
|
2024-05-28 11:30:10 -03:00 |
|
William Buezas
|
d4600a1181
|
resolve conflicts and adapt tree
|
2024-05-28 11:20:43 -03:00 |
 Jorge Penadés
|
0de575bb6b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-28 13:14:11 +02:00 |
|
William Buezas
|
fcaca42b1f
|
resolve conflicts
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-27 12:35:59 -03:00 |
 Carlos Satorres
|
ef52c9b0c0
|
refs #7406 routes trad
gitea/salix-front/pipeline/pr-dev There was a failure building this commit
Details
|
2024-05-27 10:42:47 +02:00 |
|
Jorge Penadés
|
12016f8653
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-24 09:02:24 +02:00 |
|
Javier Segarra
|
286fe0d20c
|
Merge branch 'dev' into feature/UpcomingDeliveries
|
2024-05-24 08:13:37 +02:00 |
|
Javier Segarra
|
889263bfb8
|
feat: roleCreate as dialog
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-23 13:47:14 +02:00 |
|
Jorge Penadés
|
c6477af493
|
fix: refs #6942 formModel watch changes & invoiceInCreate
|
2024-05-23 09:29:50 +02:00 |
|
Javier Segarra
|
433564507e
|
Merge branch 'dev' into 7311_boilerplate_users
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-23 08:53:10 +02:00 |
|
Javier Segarra
|
06664cc2d0
|
feat: newRole
|
2024-05-23 08:52:57 +02:00 |
|
William Buezas
|
790e69f659
|
WIP
|
2024-05-22 08:08:43 -03:00 |
|
William Buezas
|
84845b7958
|
WIP
|
2024-05-21 09:50:36 -03:00 |
|
Javier Segarra
|
dc14116717
|
perf: RoleCard, BasicData, summary
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-21 08:52:34 +02:00 |
|
Javier Segarra
|
2cae2168ac
|
perf: AccountCard, BasicData, summary
|
2024-05-21 08:52:19 +02:00 |
|
William Buezas
|
7466d03f15
|
resolve conflicts
|
2024-05-20 08:46:08 -03:00 |
|
Jorge Penadés
|
2366ef772f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-20 08:55:35 +02:00 |
|
Javier Segarra
|
c40f322a8f
|
Merge branch 'dev' into feature/ZoneWarehouses
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-20 08:40:27 +02:00 |
|
William Buezas
|
202473158c
|
resolve conflicts
|
2024-05-19 14:21:32 -03:00 |
|
Javier Segarra
|
aa007117a7
|
Merge branch 'dev' into 7311_boilerplate_users
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-18 10:16:28 +02:00 |
|
William Buezas
|
e196cf8fd5
|
Zone warehouses
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-17 10:57:20 -03:00 |
|
Jorge Penadés
|
1abcb4796f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-17 14:36:22 +02:00 |
|
Javier Segarra
|
49b562ca44
|
Merge branch 'dev' into feature/UpcomingDeliveries
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-17 12:30:55 +02:00 |
|
Javier Segarra
|
01ad6d9bea
|
Merge branch 'dev' into feature/ZoneDelivery
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-17 09:52:21 +02:00 |
|
William Buezas
|
a35ccb5b51
|
Zone Locations
|
2024-05-16 16:38:27 -03:00 |
|
Jorge Penadés
|
b63735a709
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6598-getUserAcl
gitea/salix-front/pipeline/pr-dev There was a failure building this commit
Details
|
2024-05-16 12:35:52 +02:00 |
|
Jorge Penadés
|
4f38ae3745
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6598-getUserAcl
gitea/salix-front/pipeline/pr-dev There was a failure building this commit
Details
|
2024-05-15 16:43:34 +02:00 |
|
Jorge Penadés
|
31573c0f0b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7274-fixCustomer
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-15 11:22:23 +02:00 |
|
Alex Moreno
|
2b27e39d72
|
fix: zone icon and isVolumetric default false
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-15 09:37:33 +02:00 |
|
William Buezas
|
cbe44c97f6
|
Upcoming deliveries
gitea/salix-front/pipeline/pr-dev There was a failure building this commit
Details
|
2024-05-14 12:03:43 -03:00 |
|
Jorge Penadés
|
a6c761c031
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into fix_Customer_1
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-14 13:42:38 +02:00 |
|
Javier Segarra
|
fc6bd82ea0
|
Merge branch 'dev' into feature/ZoneCreate
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-14 11:52:29 +02:00 |
|
Javier Segarra
|
20f9b53afb
|
Merge branch 'dev' into 7271-EndZoneMigration
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-14 10:42:43 +02:00 |
|
Javier Segarra
|
32e715ce6b
|
Merge branch 'dev' into feature/Monitors
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-13 17:59:39 +02:00 |
|
William Buezas
|
8e7b043a46
|
Resolve conflicts
|
2024-05-13 10:28:21 -03:00 |
|
William Buezas
|
9304b511bc
|
Zone delivery
|
2024-05-13 10:14:36 -03:00 |
|
Javier Segarra
|
1181cd0daa
|
Merge branch 'dev' into 7271-EndZoneMigration
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-13 12:15:50 +00:00 |
|
Jorge Penadés
|
0b83d3663f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5919-locker
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-13 13:20:15 +02:00 |
 Jon Elias
|
14910c5899
|
feat: refs #7271 basicData and Log
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-13 12:46:25 +02:00 |
|
Javier Segarra
|
f9e77596e4
|
feat: roles sections
|
2024-05-10 22:01:57 +02:00 |
|
Javier Segarra
|
555b5a663c
|
feat: role router
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-10 18:06:40 +02:00 |
|
Javier Segarra
|
c045b0d1f4
|
feat accountRoutes
|
2024-05-10 17:47:34 +02:00 |
|
Javier Segarra
|
f6d3e37787
|
feat: accountRoles
|
2024-05-10 08:02:12 +02:00 |
|
William Buezas
|
d227d4b09b
|
Zone create
|
2024-05-09 11:32:04 -03:00 |
|
William Buezas
|
9b9e482fa7
|
Zone list and Zone summary
|
2024-05-09 08:21:30 -03:00 |
|
Javier Segarra
|
c68ad5be34
|
feat #7311: minor changes
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-09 08:40:00 +02:00 |
|
Javier Segarra
|
034342beb2
|
Merge branch 'dev' into 7311_boilerplate_users
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-09 08:29:18 +02:00 |
|
Javier Segarra
|
99ef7fad76
|
feat #7311: subsections
|
2024-05-09 08:28:58 +02:00 |
|
Javier Segarra
|
01bedb94d0
|
feat #7311: enable leftmenu option
|
2024-05-09 07:54:16 +02:00 |
|
William Buezas
|
a3ce81d66d
|
Zone list
|
2024-05-08 15:23:52 -03:00 |
|
William Buezas
|
712d7e13ff
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/Monitors
|
2024-05-08 10:45:05 -03:00 |
|
William Buezas
|
5bdbbf426a
|
Tables development
|
2024-05-08 10:43:18 -03:00 |
|
Jorge Penadés
|
a1f785ccbe
|
feat: refs #5919 WIP workerlocker
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-08 11:02:40 +02:00 |
|
Alex Moreno
|
d69b362407
|
Merge branch 'dev' into feature/ItemTags
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-08 08:02:55 +00:00 |
|
Alex Moreno
|
a139c11a22
|
Merge branch 'test' into fix_Customer_1
gitea/salix-front/pipeline/pr-test This commit looks good
Details
|
2024-05-07 07:05:25 +00:00 |
|
William Buezas
|
dbc9e9dd71
|
Sales monitor base
|
2024-05-05 19:13:36 -03:00 |
|
William Buezas
|
99adc9aa05
|
WIP
|
2024-05-03 08:53:50 -03:00 |
|
Jorge Penadés
|
0e7e804475
|
feat: refs #6598 create useAcl composable
gitea/salix-front/pipeline/pr-dev There was a failure building this commit
Details
|
2024-05-03 13:18:46 +02: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 |
|
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
|
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 |
|
Jon Elias
|
c1a464d9ae
|
fix: refs #6887 fix conflicts
|
2024-05-02 13:02:59 +02:00 |
|
Javier Segarra
|
494f0be44a
|
Merge branch 'dev' into feature/ItemDiary
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-02 08:13:41 +00:00 |
|
Javier Segarra
|
94fc856bea
|
Merge branch 'dev' into feature/ItemDiary
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-02 08:05:17 +00:00 |
|
Javier Segarra
|
b530101cda
|
Merge branch 'dev' into 7190_renewTokenMultimedia
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-02 07:44:20 +00:00 |
|
Javier Segarra
|
4ef7b0e17c
|
fix: item routes order
|
2024-05-01 13:31:32 +02:00 |
|
Javier Segarra
|
d2531efdd6
|
fix: Botanical icon
|
2024-05-01 13:27:40 +02:00 |
|
William Buezas
|
ac219bfbb7
|
Item shelvings
|
2024-04-30 16:15:48 -03:00 |
|
Jon Elias
|
d5762f65b3
|
refactor: refs #6887 fixed errors
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-04-30 10:34:48 +02:00 |
|
Jon Elias
|
5b15558dbf
|
refactor: refs #6887 fixed errors
|
2024-04-30 10:32:32 +02:00 |
|
William Buezas
|
ac9063e166
|
Item Last entries
|
2024-04-29 17:01:26 -03:00 |
|
Javier Segarra
|
761bc7724f
|
fix: redirect
|
2024-04-29 11:46:40 +02:00 |
|
Javier Segarra
|
19fcacebc9
|
perf: VnSearchbar
|
2024-04-29 10:12:19 +02:00 |
|
William Buezas
|
322ad816b9
|
item diary
|
2024-04-28 19:37:44 -03:00 |
|
Javier Segarra
|
2deeada1f5
|
Merge remote-tracking branch 'origin/dev' into fix_Customer_1
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-04-26 12:50:46 +02:00 |
|
Javier Segarra
|
93bbd0c222
|
fix: icons
gitea/salix-front/pipeline/pr-test This commit looks good
Details
|
2024-04-26 10:48:25 +02:00 |
|
Javier Segarra
|
33f3024246
|
Merge branch 'dev' into 7190_renewTokenMultimedia
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-04-26 07:47:24 +00:00 |
|
Javier Segarra
|
98846bbd1a
|
Merge remote-tracking branch 'origin/dev' into feature/ItemBotanical
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-04-26 09:28:40 +02:00 |
 Pablo Natek
|
cb22eaee4d
|
Merge branch 'dev' into 4988-agencySection
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-04-26 06:58:53 +00:00 |
|
Javier Segarra
|
22d9d369c8
|
Merge remote-tracking branch 'origin/dev' into feature/ItemBotanical
|
2024-04-26 08:52:05 +02:00 |
|
Javier Segarra
|
aa87d54f57
|
Merge remote-tracking branch 'origin/dev' into feature/ItemLog
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-04-26 08:34:05 +02:00 |
|
Pablo Natek
|
f29f7a55a2
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4988-agencySection
|
2024-04-25 16:28:30 +02:00 |
|
William Buezas
|
823351f76d
|
Item botanical
gitea/salix-front/pipeline/pr-dev There was a failure building this commit
Details
|
2024-04-25 10:55:48 -03:00 |
|
Pablo Natek
|
e184f70be5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4988-agencySection
gitea/salix-front/pipeline/pr-dev There was a failure building this commit
Details
|
2024-04-25 09:59:17 +02:00 |
|
William Buezas
|
726699bbc5
|
Item log
gitea/salix-front/pipeline/pr-dev There was a failure building this commit
Details
|
2024-04-24 10:38:00 -03:00 |