 Pau
|
cc6e2a8d01
|
remove package locks to avoid merge conflicts
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-12-19 07:30:47 +01:00 |
|
Pau
|
5235ed5499
|
Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-12-02 08:05:04 +00:00 |
 Joan Sanchez
|
6cb0e518d4
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-12-01 07:33:38 +01:00 |
 Guillermo Bonet
|
23f429d94a
|
refs #4550 fixed no ellipsize in agencyDescription
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-30 12:44:33 +01:00 |
|
Guillermo Bonet
|
497e3e54a2
|
refs #4550 changes
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-30 10:52:52 +01:00 |
|
Guillermo Bonet
|
d0acd3e4c0
|
refs #4550 collection-label changes
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-30 08:18:37 +01:00 |
|
Guillermo Bonet
|
b7fa4dca4c
|
refs #4550 changed font-family of collection-label
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-29 14:16:44 +01:00 |
|
Joan Sanchez
|
990dd88e2c
|
Merge pull request 'test → dev (Hacer despues)' (!1186) from test into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
Reviewed-on: #1186
|
2022-11-29 13:08:38 +00:00 |
|
Pau
|
18a23cf8b5
|
add some right padding to prevent the printer from cutting the label
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-29 13:47:53 +01:00 |
|
Joan Sanchez
|
5f3e7c3384
|
Merge branch 'test' into master
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-29 11:49:06 +00:00 |
|
Guillermo Bonet
|
2faacb169a
|
refs #4550 collection-label more fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-29 11:56:05 +01:00 |
|
Guillermo Bonet
|
b262b29627
|
refs #4550 collection-label fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-29 08:22:32 +01:00 |
|
Pau
|
97cdbc4118
|
Merge branch '4732-previa-label' of https://gitea.verdnatura.es/verdnatura/salix into 4732-previa-label
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-28 14:34:15 +01:00 |
|
Pau
|
884286015f
|
fix labels not working on test data refs #4732 @2h
|
2022-11-28 14:01:38 +01:00 |
 Vicent Llopis
|
4b54cf954b
|
refactor: envia el email con formato Verdnatura
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-28 13:56:21 +01:00 |
|
Pau
|
02f2724f2b
|
Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-25 06:35:15 +00:00 |
 Alex Moreno
|
660648e01f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
|
2022-11-22 14:35:25 +01:00 |
|
Joan Sanchez
|
7e12938de3
|
Merge branch 'dev' into test
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-22 12:53:03 +00:00 |
|
Guillermo Bonet
|
3c6ed672f5
|
refs #4550 added xmldom module and bugs fixed
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-22 12:33:12 +01:00 |
|
Guillermo Bonet
|
6247ebc65c
|
refs #4550 HOTFIX added jsbarcode module in print
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-22 10:42:39 +01:00 |
|
Pau
|
b1e12d7128
|
Merge branch '4732-new-label' into 4732-previa-label
|
2022-11-21 13:33:52 +01:00 |
|
Pau
|
2567a1fab3
|
refs #4732 @4h30m
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-21 13:31:55 +01:00 |
|
Alex Moreno
|
26be27c2ee
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-21 13:13:25 +01:00 |
|
Pau
|
d41269bbbe
|
Change fixtures so the provider is present in the label
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-18 11:58:46 +01:00 |
|
Pau
|
bc5940b036
|
Label show provider
|
2022-11-18 11:46:13 +01:00 |
|
Joan Sanchez
|
d7729654ee
|
fix(ordersFilter): wrong table schema
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-17 16:48:31 +01:00 |
|
Joan Sanchez
|
f501707adf
|
fix(ordersFilter): wrong table schema
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-17 16:47:01 +01:00 |
|
Alex Moreno
|
8dcd567a68
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-15 13:20:52 +01:00 |
|
Pau
|
6eaee8faca
|
Merge branch 'master' into 4609-Refactor-www.verdnatura.es-and-shop.verdnatura.es
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-15 06:06:20 +00:00 |
|
Vicent Llopis
|
a30f50ffe5
|
refactor: borrado console.log
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-14 12:20:27 +01:00 |
|
Pau
|
3c771fc771
|
refactor missing URL's refs #4609
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-14 08:53:00 +01:00 |
|
Alex Moreno
|
d1dce73a33
|
feat: creat email/vehicle-event-expired
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-14 08:50:38 +01:00 |
|
Vicent Llopis
|
7e50f23563
|
refacor code
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-11 08:55:56 +01:00 |
 Juan Ferrer
|
e7f26e8502
|
Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-11 00:56:20 +01:00 |
|
Juan Ferrer
|
ad741ba738
|
Merge branch 'master' into 4609-Refactor-www.verdnatura.es-and-shop.verdnatura.es
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-10 20:37:11 +01:00 |
|
Joan Sanchez
|
1f05e6fb3b
|
Label without header & footer
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-10 14:50:08 +01:00 |
|
Alex Moreno
|
4c216c4556
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-11-10 14:40:55 +01:00 |
|
Joan Sanchez
|
55b90d8a80
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4810-print_template
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-10 13:43:04 +01:00 |
|
Joan Sanchez
|
800d98a5b5
|
Removed unused components
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-10 13:34:23 +01:00 |
|
Joan Sanchez
|
303020a731
|
Attachment fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-10 11:51:14 +01:00 |
|
Joan Sanchez
|
133897c29f
|
Updated templates
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-10 10:38:54 +01:00 |
|
Joan Sanchez
|
83798dfadb
|
Email template slots
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-10 09:51:28 +01:00 |
|
Joan Sanchez
|
b8add5b0bc
|
Report template
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-10 08:57:42 +01:00 |
|
Joan Sanchez
|
89e49c3843
|
Template component
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-10 07:48:24 +01:00 |
|
Guillermo Bonet
|
6804c1a756
|
Merge branch 'dev' into 4550-printServer
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-09 16:55:29 +01:00 |
|
Alex Moreno
|
5339bc1143
|
feat(recoverPassword): use loopback
|
2022-11-09 14:51:30 +01:00 |
|
Alex Moreno
|
cace29f75c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
|
2022-11-09 14:20:17 +01:00 |
 Alexandre Riera
|
ff2ee4401e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4547-informe-compensacion
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-09 13:26:54 +01:00 |
|
Joan Sanchez
|
f9eee431b4
|
fix(driver-route): routes with empty lines
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-09 10:27:00 +01:00 |
|
Guillermo Bonet
|
6744b3f797
|
added collection-label
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-08 14:40:38 +01:00 |