 Pablo Natek
|
3e15728db4
|
Merge branch 'dev' into 5075-client_balance
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-24 15:33:28 +00:00 |
 Carlos Satorres
|
40da3dfe52
|
Merge branch 'dev' into 5575-tercerDecimalLatest
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-24 12:53:28 +00:00 |
|
Carlos Satorres
|
08e890d6d9
|
Merge branch 'dev' into 5436-mensajeClienteSinCorreo
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-24 12:40:57 +00:00 |
 Juan Ferrer
|
a053764122
|
refs #5517 E2E fixes
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-24 12:59:56 +02:00 |
|
Juan Ferrer
|
081b4af6d6
|
Merge branch 'dev' into 5517-improveLogs+translations
|
2023-04-24 10:44:42 +02:00 |
|
Carlos Satorres
|
4473cc11c7
|
Merge branch 'dev' into 5439-inheritRole
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-24 08:43:19 +00:00 |
|
Carlos Satorres
|
210bd949d2
|
Merge branch 'dev' into 5436-mensajeClienteSinCorreo
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-24 08:38:06 +00:00 |
|
Carlos Satorres
|
1717f03ccc
|
Merge branch 'dev' into 5575-tercerDecimalLatest
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-24 07:38:06 +00:00 |
 Vicent Llopis
|
4983aa1632
|
refs #5542 fix backTest
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-24 09:11:09 +02:00 |
|
Vicent Llopis
|
9b432bac85
|
refs #5542 fix: test
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-24 08:57:10 +02:00 |
|
Carlos Satorres
|
67db2f0476
|
Merge branch 'dev' into 5540-validarSupplierIsVies
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-24 06:51:41 +00:00 |
|
Carlos Satorres
|
cd4f66e292
|
refs #5540 arreglar e2e
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-24 08:48:35 +02:00 |
|
Vicent Llopis
|
bf558761a4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5542-refund_refactor
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-24 08:45:56 +02:00 |
 Alexandre Riera
|
0a1583aa54
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test-to-dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-24 08:42:32 +02:00 |
 Alex Moreno
|
ef12fdf889
|
Merge branch 'dev' into 5575-tercerDecimalLatest
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-24 06:02:34 +00:00 |
|
Alex Moreno
|
5e33395534
|
Merge branch 'dev' into 5436-mensajeClienteSinCorreo
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-24 06:02:00 +00:00 |
|
Vicent Llopis
|
5b7ca82509
|
Merge branch 'dev' into 5318-deviceProductionLog_toSalix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-24 04:58:30 +00:00 |
|
Alexandre Riera
|
6609f96f92
|
Merge branch 'master' into hotfix-negativeBases
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-21 12:56:15 +00:00 |
|
Alexandre Riera
|
bbf1c40987
|
Merge branch 'master' into hotfix-dms-hasFile
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-21 12:48:06 +00:00 |
|
Alexandre Riera
|
2975e7fae3
|
hotfix savesign
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-21 14:46:46 +02:00 |
|
Vicent Llopis
|
e24366707b
|
refactor: añadido focus a la seccion usuarios
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-21 14:26:12 +02:00 |
|
Vicent Llopis
|
2b74ab43ae
|
refactor front
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-21 14:12:53 +02:00 |
|
Vicent Llopis
|
9f04581862
|
refs #5542 "importar reclamacion" crea un registro en ticketRefund
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-21 14:00:28 +02:00 |
|
Vicent Llopis
|
38e5660e61
|
refs #5542 refactorizado "abono" para que siempre cree un único ticket abono
|
2023-04-21 13:59:28 +02:00 |
|
Vicent Llopis
|
ea1035311e
|
Merge branch 'dev' into 5128-client.credit-management
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-21 11:30:58 +00:00 |
|
Alex Moreno
|
7a79dfd4d1
|
deploy: 231401 test to dev
|
2023-04-21 12:49:03 +02:00 |
|
Carlos Satorres
|
397d8f658e
|
refs #5540 error trad
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-21 10:41:50 +02:00 |
|
Vicent Llopis
|
83f71cdd36
|
refactor: mostrar en columnas visibles 'Frágil'
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-21 10:31:23 +02:00 |
|
Vicent Llopis
|
5af961ac69
|
fix: maneja si se elimina la sale
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-21 09:53:21 +02:00 |
|
Alexandre Riera
|
af1ad7e08c
|
fixed e2e
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-21 09:47:34 +02:00 |
|
Carlos Satorres
|
d8b5659a5d
|
refs #5540 client vies
|
2023-04-21 09:14:30 +02:00 |
|
Alexandre Riera
|
b3a10698af
|
hotfix negativeBases
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-21 08:20:38 +02:00 |
|
Pablo Natek
|
de3b4f37c2
|
Merge branch 'dev' into 5075-client_balance
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-21 05:54:00 +00:00 |
|
Juan Ferrer
|
9694a35343
|
refs #5517 Added: Tests, filter panel, model and props titles
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-20 19:46:57 +02:00 |
|
Juan Ferrer
|
6f1744baff
|
Merge branch 'dev' into 5517-improveLogs+translations
|
2023-04-20 16:30:24 +02:00 |
|
Carlos Satorres
|
33c296c34d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5439-inheritRole
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-20 14:31:46 +02:00 |
|
Vicent Llopis
|
ec9a5722c2
|
refs #5128 añadido icono de grafana
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-20 13:58:49 +02:00 |
|
Carlos Satorres
|
d6e6dab03b
|
Merge branch 'dev'
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-20 11:55:52 +02:00 |
|
Carlos Satorres
|
b4183c2698
|
refs #5436 mod de error
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-20 11:33:28 +02:00 |
|
Carlos Satorres
|
c103eeab7f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5436-mensajeClienteSinCorreo
|
2023-04-20 10:40:22 +02:00 |
|
Alex Moreno
|
63e0031bc6
|
deploy(231401): test to master
|
2023-04-20 08:24:43 +02:00 |
|
Alexandre Riera
|
aecde484f4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5293-claim-sections
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-20 07:52:05 +02:00 |
|
Alexandre Riera
|
84c2512847
|
refs #5293 open lilium in the same page
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-20 07:51:25 +02:00 |
|
Vicent Llopis
|
f6bf92b74b
|
refs #5128 intentando poner icono grafana
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-19 15:21:59 +02:00 |
|
Vicent Llopis
|
6fbb734a34
|
quitado salto de linea
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-19 14:43:23 +02:00 |
|
Vicent Llopis
|
187ba032d2
|
refs #5128 rol por ACL
|
2023-04-19 14:43:15 +02:00 |
|
Vicent Llopis
|
34b360040b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5128-client.credit-management
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-19 12:18:45 +02:00 |
|
Vicent Llopis
|
5ace66ebca
|
refs #5318 fix e2e
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-19 09:54:54 +02:00 |
|
Vicent Llopis
|
be8a11cafc
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5318-deviceProductionLog_toSalix
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-19 09:52:28 +02:00 |
|
Carlos Satorres
|
a559c1f648
|
refs #5575 mod3Decimal
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-19 09:02:04 +02:00 |
 Joan Sanchez
|
6f2aa0f618
|
Worker note ACL
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-18 14:51:48 +02:00 |
|
Joan Sanchez
|
32c9e22d96
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-18 11:41:55 +02:00 |
|
Joan Sanchez
|
a0d8ed1433
|
E2e fixes
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-18 11:33:36 +02:00 |
|
Alexandre Riera
|
2df362327f
|
Merge branch 'dev' into 5418-buscador-lateral-fixed-price
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-18 08:33:15 +00:00 |
|
Joan Sanchez
|
a5f6991511
|
continue
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-18 10:18:44 +02:00 |
|
Joan Sanchez
|
aabc4ec58d
|
fix(consumption): continue queue if client mailing fails
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-18 10:08:04 +02:00 |
|
Alexandre Riera
|
28a7722bb6
|
Merge branch 'dev' into 5518-log-user-role
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-18 08:01:42 +00:00 |
|
Joan Sanchez
|
fded7d062b
|
section fix
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-18 09:49:23 +02:00 |
|
Vicent Llopis
|
b3e7cedd1e
|
refs #5128 borrada línea por error
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-18 09:49:12 +02:00 |
|
Vicent Llopis
|
c5225cb632
|
refs #5128 borrado código innecesario
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-18 09:23:19 +02:00 |
|
Vicent Llopis
|
48cd23750e
|
refs #5128 add testBack
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-18 09:09:09 +02:00 |
|
Vicent Llopis
|
c9dffe9175
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5128-client.credit-management
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-18 08:39:43 +02:00 |
|
Joan Sanchez
|
6fd5c8ae2d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
|
2023-04-18 08:34:20 +02:00 |
|
Joan Sanchez
|
6d593a0937
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5213-minorBugs2
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-18 08:32:22 +02:00 |
|
Pablo Natek
|
3636543f73
|
refs #5075
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-18 08:19:23 +02:00 |
|
Alex Moreno
|
560b5b374f
|
Merge branch 'dev' into 5075-client_balance
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-18 05:37:12 +00:00 |
|
Vicent Llopis
|
d99815356a
|
refs #5144 manejado que el usuario sea NULL
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-18 07:26:35 +02:00 |
|
Alex Moreno
|
0c475be10b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4617-use_tmp_in_ticketToInvoice
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-17 14:23:02 +02:00 |
|
Alexandre Riera
|
7d8a0597c1
|
Merge branch 'dev' into 5518-log-user-role
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-17 09:53:36 +00:00 |
|
Alexandre Riera
|
2675c02d13
|
refs #5518 moved models to account
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-17 11:52:52 +02:00 |
|
Alexandre Riera
|
2bc190b01e
|
Merge branch 'dev' into 5293-claim-sections
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-17 08:49:41 +00:00 |
|
Alexandre Riera
|
0dcbc9fc8b
|
refs #5293 redirected claim.photos to lilium
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-17 10:46:26 +02:00 |
|
Carlos Satorres
|
d399cda050
|
refs #5316 quitar comment
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-17 10:34:08 +02:00 |
|
Joan Sanchez
|
3ee29553b4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-17 09:00:52 +02:00 |
|
Joan Sanchez
|
610f51aaf8
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-17 08:59:49 +02:00 |
|
Joan Sanchez
|
f53ebb7641
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-17 08:59:34 +02:00 |
|
Joan Sanchez
|
02c573bd23
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
|
2023-04-17 08:57:24 +02:00 |
|
Carlos Satorres
|
60d3729b4a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5316-kkeoEntryNotes
|
2023-04-17 08:55:22 +02:00 |
|
Alex Moreno
|
0bfdbcb750
|
refs #4617 use temporary instead of vn
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-17 08:44:24 +02:00 |
|
Joan Sanchez
|
51e42e485b
|
Merge pull request 'refs #5284 new onCreateClaimAccepted y createClaim' (!1372) from 5284-fueraPlazo into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
Reviewed-on: #1372
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2023-04-17 06:44:17 +00:00 |
|
Carlos Satorres
|
af8603185c
|
refs #5439 inheritedRole
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-17 08:35:44 +02:00 |
|
Juan Ferrer
|
c5dcfd3cab
|
refs #4480, #5484 Front & back tests passed, md5 password removed from code, some e2e missing
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-15 14:24:50 +02:00 |
|
Juan Ferrer
|
2af48b3049
|
refs #4480 Fix: VnUser before save hook removed -> setting password attribute
|
2023-04-15 01:51:38 +02:00 |
|
Juan Ferrer
|
add3a8b1fa
|
merge with dev
|
2023-04-15 01:49:23 +02:00 |
|
Alexandre Riera
|
ad3836552e
|
refs #5518 sections added
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-14 14:16:29 +02:00 |
|
Vicent Llopis
|
4c18efa589
|
refs #5128 creado método setRating
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-14 13:05:57 +02:00 |
|
Joan Sanchez
|
35f94c58b7
|
reafactor(image): upload image using gm library
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-14 13:04:40 +02:00 |
|
Vicent Llopis
|
83dd386eed
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5128-client.credit-management
|
2023-04-14 10:39:16 +02:00 |
|
Alexandre Riera
|
b9b52c6b1d
|
Merge branch 'dev' into 5418-buscador-lateral-fixed-price
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-14 07:08:02 +00:00 |
|
Juan Ferrer
|
b4ef49cf24
|
Merge branch 'dev' into 5546-codigo-registro
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-13 16:48:11 +00:00 |
|
Alexandre Riera
|
8ade602563
|
hotfix one sign for every ticket
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-13 14:18:01 +02:00 |
|
Carlos Satorres
|
a2ddbd8a66
|
refs #5284 test update
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-13 14:04:10 +02:00 |
|
Joan Sanchez
|
6d5167ab7f
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-13 13:47:18 +02:00 |
|
Alexandre Riera
|
ac4772e44e
|
refs #5418 mistake doing git pull origin dev
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-13 13:46:29 +02:00 |
|
Carlos Satorres
|
90268a79b0
|
refs #5284 test createClaim
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-13 13:41:10 +02:00 |
|
Vicent Llopis
|
2ada64e1bf
|
refs #5517 eliminadas traducciones duplicadas
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-13 08:49:50 +02:00 |
|
Alexandre Riera
|
71e202d586
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5546-codigo-registro
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-13 08:45:05 +02:00 |
|
Carlos Satorres
|
44eab101cc
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5284-fueraPlazo
|
2023-04-13 08:44:56 +02:00 |
|
Vicent Llopis
|
3790e3457f
|
refs #5517 añadidas más traducciones
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-13 08:43:42 +02:00 |
|
Carlos Satorres
|
ad267c933c
|
refs #5540 country.code
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-13 08:30:33 +02:00 |