 Alexandre Riera
|
925e30350a
|
resolved conflicts
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-24 08:50:18 +02: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 |
|
Carlos Satorres
|
caed48de01
|
Merge branch 'dev' into 084200-footerAlbaranReport
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-24 06:38:02 +00:00 |
|
Alexandre Riera
|
5b44323009
|
Merge pull request 'master -> test' (!1477) from master-to-test into test
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1477
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2023-04-24 06:37:44 +00:00 |
|
Alexandre Riera
|
84c01ecea7
|
Merge branch 'test' into master-to-test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-24 06:19:25 +00:00 |
|
Alexandre Riera
|
d48ede678d
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into master-to-test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-24 08:10:22 +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
|
a7a0853248
|
Merge pull request '5318-deviceProductionLog_toSalix' (!1460) from 5318-deviceProductionLog_toSalix into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1460
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2023-04-24 05:07:06 +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
|
d945707761
|
Merge pull request 'hotfix savesign dms hasFile' (!1474) from hotfix-dms-hasFile into master
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1474
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2023-04-21 12:57:29 +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
|
75432b8823
|
Merge pull request '5128-client.credit-management' (!1459) from 5128-client.credit-management into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1459
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2023-04-21 11:49:32 +00:00 |
|
Vicent Llopis
|
f96122ad3e
|
Merge branch 'dev' into 5128-client.credit-management
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-21 11:43:14 +00:00 |
|
Vicent Llopis
|
f347256617
|
Merge pull request '5456-client-welcome_email_añadirTraducciones' (!1470) from 5456-client-welcome_email_añadirTraducciones into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1470
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2023-04-21 11:38:33 +00:00 |
|
Alex Moreno
|
f738d1659b
|
Merge branch 'dev' into 5456-client-welcome_email_añadirTraducciones
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-21 11:31:00 +00: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
|
8e885fa335
|
Merge pull request '231401_test_to_dev' (!1473) from 231401_test_to_dev into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1473
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>
|
2023-04-21 11:29:59 +00:00 |
|
Alex Moreno
|
9bd8f71f19
|
fix package.json
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-21 12:50:07 +02:00 |
|
Alex Moreno
|
7a79dfd4d1
|
deploy: 231401 test to dev
|
2023-04-21 12:49:03 +02:00 |
|
Alex Moreno
|
25414f23f0
|
Merge pull request '(231401) master to test' (!1466) from 231401_master_to_test into test
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1466
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>
|
2023-04-21 10:38:35 +00:00 |
|
Alex Moreno
|
1842a5c464
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 231401_master_to_test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-21 12:31:05 +02:00 |
|
Vicent Llopis
|
3fd145b9d0
|
Merge pull request 'hotfix_ticketSmsChanges' (!1471) from hotfix_ticketSmsChanges into master
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1471
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2023-04-21 10:29:10 +00:00 |
|
Vicent Llopis
|
a725ee90cf
|
update backTest timeout
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-21 11:50:07 +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
|
4c6b4ea6c8
|
refactor: eliminada la doble paginación en los logs
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-21 10:15:00 +02:00 |
|
Alex Moreno
|
9766008ca9
|
fix: upload jasmine.DEFAULT_TIMEOUT_INTERVAL to 90000
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-21 10:04:14 +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
|
10def65a3f
|
Merge branch '5540-validarSupplierIsVies' of https://gitea.verdnatura.es/verdnatura/salix into 5540-validarSupplierIsVies
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-21 09:14:32 +02:00 |
|
Carlos Satorres
|
d8b5659a5d
|
refs #5540 client vies
|
2023-04-21 09:14:30 +02:00 |
|
Alex Moreno
|
3103e60d4b
|
fix: upload jasmine.DEFAULT_TIMEOUT_INTERVAL to 60000
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-21 09:14:06 +02:00 |
|
Alex Moreno
|
df3f2f3b62
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 231401_master_to_test
|
2023-04-21 09:12:56 +02:00 |
|
Alexandre Riera
|
b3a10698af
|
hotfix negativeBases
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-21 08:20:38 +02:00 |
|
Vicent Llopis
|
07e76a9333
|
Merge branch 'dev' into 5128-client.credit-management
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-21 06:07:27 +00: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
|
088f2f9181
|
Merge branch 'dev' into 5540-validarSupplierIsVies
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-20 13:27:57 +00:00 |
|
Carlos Satorres
|
b942bc2fe7
|
Merge branch 'dev' into 5575-tercerDecimalLatest
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-20 13:26:45 +00:00 |
|
Carlos Satorres
|
e32939cde9
|
Merge branch 'dev' into 084200-footerAlbaranReport
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-20 13:25:06 +00:00 |