Vicent Llopis
|
6fa6c21cb1
|
remove fixtures
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-07 09:31:26 +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
|
a665b6c060
|
refs #5970 fix sql
gitea/salix/pipeline/head This commit looks good
Details
|
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
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-06 10:42:53 +02:00 |
Alex Moreno
|
040e9e4197
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4614-ticket_weight
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-05 12:50:45 +02:00 |
Vicent Llopis
|
e58d4e5db3
|
refs #4770 feat: añadida sección 'Troncales'
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-04 14:42:51 +02:00 |
Pablo Natek
|
2ccf8d5197
|
refs #5347
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-03 14:49:21 +02:00 |
Alex Moreno
|
461e1d4d5d
|
refs #5475 feat: userUses, fix forbiddenError and merge in dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-03 13:33:48 +02:00 |
Alex Moreno
|
7fe8698b6f
|
refs #5753 fix ticketToInvoice
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-03 10:04:03 +02:00 |
Alex Moreno
|
d1fb2859be
|
Merge branch 'dev' into 5753_232401_db_dump
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-07-03 06:59:42 +00:00 |
Alex Moreno
|
f636c3b1ab
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-30 11:57:56 +02:00 |
Alex Moreno
|
ff320895a2
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5753_232401_db_dump
|
2023-06-30 08:23:00 +02:00 |
Alex Moreno
|
c6bee8f2f9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-29 14:50:06 +02:00 |
Carlos Andrés
|
1d993c74e5
|
refs #5590 fix total invoiceOut
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-29 10:39:07 +02:00 |
Vicent Llopis
|
e3e0c7e97a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5774-ticket.lines_evitarCantidadNegativa
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-28 14:31:54 +02:00 |
Alex Moreno
|
8723cf2958
|
refs #5753 fix legacy bugs
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-28 14:10:21 +02:00 |
Carlos Satorres
|
3bea23c52a
|
refs #5660 delivery acls
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-28 11:30:45 +02:00 |
Carlos Satorres
|
a930963ef9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5660-changeRolDeliveryAssistant
|
2023-06-27 12:34:37 +02:00 |
Alex Moreno
|
e43e52b561
|
refs #5753 db export and fix fixtures
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-26 15:21:45 +02:00 |
Alex Moreno
|
798481b24a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa
|
2023-06-26 07:53:44 +02:00 |
Juan Ferrer
|
47a4a9950f
|
refs #5772 Parallelism added to PDF generation
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-23 11:42:30 +02:00 |
Alex Moreno
|
6ab431f8ef
|
refs #5475 tests
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-21 14:17:25 +02:00 |
Carlos Satorres
|
9870cc7b14
|
refs #5660 change assist
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-21 13:34:27 +02:00 |
Alex Moreno
|
d6c504d3bb
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-21 07:53:40 +02:00 |
Vicent Llopis
|
f6cb1cb130
|
Merge branch 'dev' into 5554-renovar_token
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-20 12:07:52 +00:00 |
Alex Moreno
|
dd157d59d9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-16 13:42:13 +02:00 |
Vicent Llopis
|
425118d333
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4734-addViaexpress
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-16 13:09:38 +02:00 |
Carlos Satorres
|
0eca606de0
|
Merge branch 'dev' into 5660-changeRolDeliveryAssistant
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-16 07:29:30 +00:00 |
Sergio De la torre
|
1f454e6219
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5513-back-embalaje
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-15 07:22:10 +02:00 |
Alex Moreno
|
3a5e591cf0
|
refs #5475 feat(signin): use twoFactor and passExpired
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-14 15:15:00 +02:00 |
Vicent Llopis
|
0cc5781f3f
|
refs #4734 feat: añadido método putExpedicionInternacional de viaexpress
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-13 15:05:37 +02:00 |
Vicent Llopis
|
61f99744c9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5554-renovar_token
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-13 07:43:23 +02:00 |
Carlos Satorres
|
908799adee
|
refs #5660 deliveryAssit
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-12 14:58:28 +02:00 |
Alex Moreno
|
f113bfbc95
|
Merge branch 'dev' into test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-12 12:32:29 +00:00 |
Alex Moreno
|
22e69e6e91
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired
|
2023-06-12 11:06:27 +02:00 |
Alexandre Riera
|
703c224e91
|
refs #5513 modified-entry email
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-12 10:26:50 +02:00 |
Alex Moreno
|
a8215e38f0
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5701-update_to_mariadb10.7.7
|
2023-06-12 07:31:25 +02:00 |
Alex Moreno
|
d735f142a1
|
Merge branch 'dev' into 5472-user_passExpired
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-12 05:04:28 +00:00 |
Alex Moreno
|
50ced36338
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5701-update_to_mariadb10.7.7
|
2023-06-09 08:43:39 +02:00 |
Carlos Satorres
|
c66feb53f0
|
refs #5760 fix fixtures
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-09 08:29:18 +02:00 |
Carlos Satorres
|
ec9dfa90fd
|
refs #5760 fixtures
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-09 08:06:45 +02:00 |
Alex Moreno
|
96d88cdf4b
|
refs #5366 refactor(invoiceIn_toBook): use invoiceIn_booking
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-08 14:42:07 +02:00 |
Vicent Llopis
|
cf559b2ba5
|
refs #5774 feat: solo se pueden añadir cantidades negativas si es un ticket de abono
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-08 09:19:57 +02:00 |
Alex Moreno
|
1240a6b71a
|
Merge branch 'dev' into 5472-user_passExpired
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-07 11:44:47 +00:00 |
Alex Moreno
|
edc601fd5d
|
refs #5489 fix(account/sync), fix(order) catalog-search-panel popover
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-07 13:34:13 +02:00 |
Vicent Llopis
|
7cf85eeef8
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5554-renovar_token
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-07 09:03:33 +02:00 |
Alexandre Riera
|
bfd421c188
|
Merge branch 'dev' into 5137-aviso-impresora
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-07 06:30:43 +00:00 |
Alex Moreno
|
ac0e7ae32b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-07 07:08:02 +02:00 |
Alex Moreno
|
cb50c617ee
|
refs #5489 deprecate account.user.password
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-06 15:09:01 +02:00 |
Vicent Llopis
|
b144948dcf
|
conflictos resueltos
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-06 12:31:44 +02:00 |
Vicent Llopis
|
98af8ee10f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5554-renovar_token
|
2023-06-06 12:31:20 +02:00 |
Alex Moreno
|
5d6eaca6b8
|
refs #5472 test(changePassword): e2e
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-05 15:20:07 +02:00 |
Alexandre Riera
|
9c9a2d4fe2
|
Merge branch 'dev' into 5513-backs-embalajes
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-05 12:25:50 +00:00 |
Alex Moreno
|
91b0e3013a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-05 08:11:47 +02:00 |
Alex Moreno
|
bca7224f74
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-05 08:09:16 +02:00 |
Alex Moreno
|
9462ca90a7
|
refs #5472 refactor setPassword & changePassword, fix sync
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-01 15:29:46 +02:00 |
Alex Moreno
|
0263d76021
|
refs #5701 update to mariadb 10.7.7
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-31 14:58:16 +02:00 |
Vicent Llopis
|
46b6625527
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5554-renovar_token
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-30 12:06:31 +02:00 |
Alexandre Riera
|
30816f7947
|
Merge branch 'dev' into 5513-backs-embalajes
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-30 09:51:42 +00:00 |
Alexandre Riera
|
1bb5033729
|
Merge branch 'dev' into 5137-aviso-impresora
gitea/salix/pipeline/head Build queued...
Details
|
2023-05-29 10:56:21 +00:00 |
Alex Moreno
|
c7b8e57d95
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-26 07:41:48 +02:00 |
Alex Moreno
|
375fdf2a21
|
fix item_getBalance
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-25 14:31:28 +02:00 |
Vicent Llopis
|
886c4a15b5
|
refs #5554 fix: manejado si la tabla accessTokenConfig esta vacía
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-25 10:19:00 +02:00 |
Vicent Llopis
|
eab329b230
|
refs #554 feat: actualizar el token automáticamente
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-24 15:01:59 +02:00 |
Alexandre Riera
|
74ba21b1b7
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3628-item-historical-absoluto
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-24 13:39:01 +02:00 |
Alexandre Riera
|
49bd9c35b4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3628-item-historical-absoluto
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-24 12:19:45 +02:00 |
Carlos Satorres
|
af1f92613f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5297-newWorker_iban_not_required
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-23 13:57:11 +02:00 |
Alex Moreno
|
6f503e2a81
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl
|
2023-05-23 08:23:16 +02:00 |
Juan Ferrer
|
da0aa57539
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-22 19:06:20 +02:00 |
Juan Ferrer
|
26c2ab867d
|
Merge pull request 'master into test' (!1546) from master into test
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1546
|
2023-05-22 17:04:32 +00:00 |
Juan Ferrer
|
6b0fd99eb8
|
refs #5667 Fixes: Style, translations, fixtures, UI
|
2023-05-19 10:56:15 +02:00 |
Alexandre Riera
|
d70a31bfbd
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5513-backs-embalajes
|
2023-05-18 14:49:27 +02:00 |
Alexandre Riera
|
e8376c00a0
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5137-aviso-impresora
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-18 14:43:20 +02:00 |
Alexandre Riera
|
2591d2d115
|
refs #3628 added check & date-picker
gitea/salix/pipeline/head Build queued...
Details
|
2023-05-18 11:42:22 +02:00 |
Alex Moreno
|
6ddbd8b8ea
|
Merge branch 'dev' into 5488-use_checkAccessAcl
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-17 11:43:25 +00:00 |
Alex Moreno
|
cd34ccad8f
|
refs #5579 use variable
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-17 13:14:43 +02:00 |
Juan Ferrer
|
fa40bd9811
|
refs #5667 Style & translation fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-17 10:18:41 +02:00 |
Alex Moreno
|
cc23fd1337
|
refs #5579 fix mockTimes and remove userLog_add
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-17 09:23:37 +02:00 |
Alex Moreno
|
c9af22780b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5579-db-export
|
2023-05-17 08:24:23 +02:00 |
Alex Moreno
|
7f881409fc
|
refs #5579 fix mockTime
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-16 15:00:31 +02:00 |
Alex Moreno
|
3e33030b1d
|
refs #5579 update mariadb version to 10.7.6
gitea/salix/pipeline/head This commit is unstable
Details
|
2023-05-15 15:16:22 +02:00 |
Alex Moreno
|
ea6837e33a
|
refs #5579 export structure and data
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-12 13:07:24 +02:00 |
Alexandre Riera
|
9760e50212
|
refs #5513 minor fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-12 08:46:12 +02:00 |
Pablo Natek
|
65082be077
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5153-worker-sin-tr
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-12 08:28:19 +02:00 |
Alexandre Riera
|
ded8e0e141
|
refs #5137 added trigger, template and test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-10 13:22:53 +02:00 |
Carlos Satorres
|
2c6f71b4c4
|
Merge branch 'dev'
|
2023-05-08 10:16:57 +02:00 |
Alexandre Riera
|
a2055d35fb
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5513-backs-embalajes
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-08 09:48:09 +02:00 |
Alexandre Riera
|
d21b949ffb
|
refs #5513 fix getItemsPackaging
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-08 09:18:53 +02:00 |
Alex Moreno
|
456e1d5912
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl
|
2023-05-05 14:11:47 +02:00 |
Alexandre Riera
|
5cdec35ed4
|
refs #5513 addFromPackaging.spec.js
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-04 14:30:10 +02:00 |
Alex Moreno
|
a1521f5220
|
Merge branch 'dev' into 4617-use_tmp_in_ticketToInvoice
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-03 09:39:39 +00:00 |
Alex Moreno
|
4a7902ae4d
|
Merge branch 'dev' into 4617-use_tmp_in_ticketToInvoice
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-02 08:41:18 +00:00 |
Alex Moreno
|
ac55dc4cc7
|
refs #5297 feat(worker_new): add payMethod
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-28 14:17:19 +02:00 |
Pablo Natek
|
8651898a1f
|
Merge branch 'dev' into 5153-worker-sin-tr
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-28 08:36:47 +00:00 |
Alex Moreno
|
42e3c8f29d
|
refs #5488 fix(): use hasWriteRole
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-28 09:35:15 +02:00 |
Alex Moreno
|
c1ea1acc8c
|
refs #4614 fear(ticket): add 'set weight' funcionality
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-26 13:49:08 +02:00 |
Carlos Satorres
|
a524d7837d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5316-kkeoEntryNotes
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-26 11:45:20 +02:00 |
Carlos Satorres
|
af875dd67e
|
Merge
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-26 10:26:54 +02:00 |
Carlos Satorres
|
57ec0f8587
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 084200-footerAlbaranReport
|
2023-04-26 09:03:37 +02:00 |
Alex Moreno
|
73153071d6
|
Merge branch 'dev' into 5293-claim-sections
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-26 05:56:46 +00:00 |