 Alex Moreno
|
0585080303
|
refs #6011 deploy 2330 version
|
2023-07-20 09:26:40 +02:00 |
|
Alex Moreno
|
5771ccb488
|
Merge branch 'dev' into 5934-clientSms
|
2023-07-20 06:50:56 +00:00 |
|
Alex Moreno
|
aefcb8c49a
|
Merge branch 'dev' into 5837-quitRestrictionFrance
|
2023-07-20 06:40:23 +00:00 |
 Vicent Llopis
|
6df1ef9d4c
|
Merge branch 'dev' into 5934-clientSms
|
2023-07-20 05:16:54 +00:00 |
|
Vicent Llopis
|
ab95ef74a9
|
refs #5934 refactor: nombres variables
|
2023-07-20 07:17:35 +02:00 |
|
Alex Moreno
|
8c84f006b0
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2023-07-20 07:15:30 +02:00 |
 Sergio De la torre
|
6344c11d1e
|
Merge branch 'dev' into 5983_inventory_parking
|
2023-07-19 14:29:18 +00:00 |
|
Sergio De la torre
|
7cff014988
|
refs #5983 fix(itemShelving): vn
|
2023-07-19 13:27:31 +02:00 |
 Carlos Satorres
|
579d6d53d8
|
Merge branch 'dev' into 5837-quitRestrictionFrance
|
2023-07-19 10:46:17 +00:00 |
 Jorge Penadés
|
b17de86fb1
|
refs #6043 add ACL
|
2023-07-19 12:15:52 +02:00 |
|
Sergio De la torre
|
e2f50d63f6
|
Merge branch 'dev' into 5983_inventory_parking
|
2023-07-19 05:02:39 +00:00 |
|
Sergio De la torre
|
85c017431c
|
refs #5983 fix(itemShelving): fixtures
|
2023-07-19 07:01:43 +02:00 |
|
Carlos Satorres
|
36db2ee883
|
Merge branch 'dev' into 5066-vehicleSorted
|
2023-07-18 15:05:56 +00:00 |
|
Alex Moreno
|
2f6c988005
|
Merge branch 'dev' into 5983_inventory_parking
|
2023-07-18 13:53:17 +00:00 |
|
Sergio De la torre
|
9076553070
|
refs #5983 test(itemShelving): add getInventory
|
2023-07-18 14:11:50 +02:00 |
|
Vicent Llopis
|
b3a7a170f0
|
refs #5934 feat: añadido clientSms log
|
2023-07-18 11:54:43 +02:00 |
|
Sergio De la torre
|
93da129239
|
refs #5983 feat(itemShelving): add getInventory
|
2023-07-18 08:54:45 +02:00 |
 Guillermo Bonet
|
3c013110d3
|
refs #5819 Changed structure sql
|
2023-07-18 07:32:45 +02:00 |
|
Carlos Satorres
|
b2b335326e
|
Merge branch 'dev' into 5066-vehicleSorted
|
2023-07-14 11:49:26 +00:00 |
|
Vicent Llopis
|
6980392ba1
|
fix: tabulacion
|
2023-07-14 13:11:09 +02:00 |
|
Vicent Llopis
|
4f183d1c6a
|
fix: worker.basic-data el boton guardar estava activo al hacer F5
|
2023-07-14 12:18:41 +02:00 |
|
Carlos Satorres
|
765c22df96
|
refs #5837 new table
|
2023-07-14 11:30:13 +02:00 |
|
Carlos Satorres
|
191f478523
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5949-recycledPlasticItem
|
2023-07-13 10:58:09 +02:00 |
|
Vicent Llopis
|
01dc26f64e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4770-routes_roadmap2
|
2023-07-13 09:42:53 +02:00 |
|
Alex Moreno
|
ac4e264d53
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix
|
2023-07-13 08:43:50 +02:00 |
|
Vicent Llopis
|
3a61bc6052
|
refs #5887 move changes sql
|
2023-07-13 08:21:17 +02:00 |
|
Carlos Satorres
|
7da1824e89
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5949-recycledPlasticItem
|
2023-07-13 06:39:05 +02:00 |
|
Vicent Llopis
|
7aaaf5492c
|
refs #5887 refacotr: move code to hook
|
2023-07-12 15:07:06 +02:00 |
|
Vicent Llopis
|
c0d329edca
|
a
|
2023-07-12 14:04:17 +02:00 |
|
Vicent Llopis
|
aea5133f39
|
refs #5877 fix: aply changes
|
2023-07-12 14:01:39 +02:00 |
|
Vicent Llopis
|
551d06ee83
|
refs #5887 para eliminar sigue las mismas reglas que para añadir
|
2023-07-12 13:55:57 +02:00 |
|
Alex Moreno
|
219a4fbca9
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2023-07-12 13:09:58 +02:00 |
|
Alex Moreno
|
9cb29b9166
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
|
2023-07-12 13:05:17 +02:00 |
|
Vicent Llopis
|
a831a1534b
|
Merge branch 'dev' into 4770-routes_roadmap2
|
2023-07-11 11:50:15 +00:00 |
|
Vicent Llopis
|
6655807d80
|
refs #4770 refactor: change acl
|
2023-07-11 13:50:38 +02:00 |
|
Vicent Llopis
|
d4a4e04f25
|
refs #5887 feat: cambiados permisos para añadir/quitar alias de correo
|
2023-07-11 12:33:34 +02:00 |
|
Vicent Llopis
|
56247b5012
|
add acl
|
2023-07-11 09:33:45 +02:00 |
|
Carlos Satorres
|
d1c8f0ff11
|
refs #5949 itemRecycle
|
2023-07-11 07:37:51 +02:00 |
|
Alex Moreno
|
8922d27f20
|
refs #4614 fix e2e
|
2023-07-07 12:25:02 +02:00 |
|
Vicent Llopis
|
6fa6c21cb1
|
remove fixtures
|
2023-07-07 09:31:26 +02:00 |
|
Alex Moreno
|
8fe9b387ce
|
refs #4614 test: front and correct folder
|
2023-07-06 15:16:52 +02:00 |
|
Alex Moreno
|
be0120728d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4614-ticket_weight
|
2023-07-06 15:15:36 +02:00 |
|
Alex Moreno
|
d9d4441d59
|
refs #5970 deploy: 233001 init
|
2023-07-06 13:38:59 +02:00 |
|
Alex Moreno
|
a665b6c060
|
refs #5970 fix sql
|
2023-07-06 11:51:04 +02:00 |
|
Alex Moreno
|
63a8f40443
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa
|
2023-07-06 10:42:53 +02:00 |
|
Alex Moreno
|
6530e87508
|
refs #4614 feat(ticket): prevent invoice without weight
|
2023-07-05 15:20:51 +02:00 |
|
Alex Moreno
|
040e9e4197
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4614-ticket_weight
|
2023-07-05 12:50:45 +02:00 |
|
Vicent Llopis
|
e58d4e5db3
|
refs #4770 feat: añadida sección 'Troncales'
|
2023-07-04 14:42:51 +02:00 |
 Pablo Natek
|
2ccf8d5197
|
refs #5347
|
2023-07-03 14:49:21 +02:00 |
|
Pablo Natek
|
6b557d5d8a
|
refs #5347
|
2023-07-03 14:14:25 +02:00 |