 Carlos Satorres
|
6f3704c365
|
hotfix colors ticket advance ticket future
|
2023-06-06 11:42:35 +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 |
|
Alexandre Riera
|
15b5f10a93
|
refs #5513 addFromBuy back added
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-05 09:10:19 +02: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
|
d134ca45f1
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-01 14:19:23 +02:00 |
|
Alex Moreno
|
d02ee2fd12
|
deploy(232201)
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-01 07:16:06 +02:00 |
|
Alex Moreno
|
4f3b6c3035
|
typo
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-31 15:00:33 +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 |
|
Vicent Llopis
|
21448a84dd
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges
|
2023-05-30 10:16:34 +02:00 |
|
Vicent Llopis
|
7d59c6ec0c
|
refs #5468 feat: eliminado acl nativo y añadido a salix.ACL
gitea/salix/pipeline/head Build queued...
Details
|
2023-05-30 10:07:17 +02:00 |
|
Vicent Llopis
|
81a8f383aa
|
refs #5468 feat: no depender del modulo worker
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-30 10:00:05 +02:00 |
|
Vicent Llopis
|
ea1c860a18
|
refs #5468 refactor: modificado acl directamente sin necesidad de crear una nueva ruta
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-30 09:13:47 +02:00 |
|
Alexandre Riera
|
ba850415be
|
refs #5137 moved sql
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-29 12:56:54 +02: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
|
f37d93b469
|
refs #5488 correct folder
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-26 14:04:00 +02: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
|
ce211b436d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5252-canRefund_withOutWarehouse2
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-25 13:00:11 +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 |
|
Alex Moreno
|
256f30987f
|
refs #5730 new version 232401
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-25 09:46:39 +02:00 |
|
Alex Moreno
|
33928aa406
|
refs #5730 correct folder
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-25 09:29:46 +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
|
a99b7cd4f1
|
Merge branch 'dev' into 5297-newWorker_iban_not_required
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-24 08:02:33 +00:00 |
|
Carlos Satorres
|
6294fc0435
|
refs #5297 back&e2e fix changes
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-24 10:02:02 +02:00 |
|
Alex Moreno
|
6a6d28efa0
|
Merge branch 'dev' into 5488-use_checkAccessAcl
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-24 05:40:11 +00:00 |
|
Vicent Llopis
|
2c7473b064
|
refs #5252 feat: permite crear un abono con o sin almacén
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-23 15:06:38 +02:00 |
|
Carlos Satorres
|
0dda7791f6
|
Merge branch 'dev' into 5639-seccionesFormaPagoYPais(MOROSOS)
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-23 12:51:10 +00: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 |
|
Vicent Llopis
|
91207c5a3c
|
refs #5468 fix: test e2e
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-23 13:33:27 +02:00 |
|
Carlos Satorres
|
2d06f42493
|
refs #5639 defaulterView
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-23 13:33:06 +02:00 |
|
Vicent Llopis
|
0702e4ef43
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-23 13:08:19 +02:00 |
|
Vicent Llopis
|
940ed29dfc
|
refs #5468 feat: comprobacion de acl en el back en 'Reenvío de correo'
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-23 12:21:35 +02:00 |
|
Vicent Llopis
|
96163cb07f
|
refs #5468 feat: update acls
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-23 10:43:46 +02:00 |
|
Vicent Llopis
|
aea39dd0b7
|
refs #5468 feat: modificalos acl de VnUser
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-23 08:45:03 +02:00 |
|
Vicent Llopis
|
3b7b31deb1
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-23 08:31:52 +02:00 |
|
Alex Moreno
|
dc244b5567
|
refs #5488 remove State_seeFilteredEditableStates
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-23 08:23:52 +02:00 |
|
Carlos Satorres
|
ee8685329f
|
Merge branch 'dev' into 5599-ticketColors
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-23 06:23:19 +00: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 |
|
Carlos Satorres
|
a7c59f51b9
|
Merge branch 'dev' into 5599-ticketColors
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-22 13:51:35 +00:00 |
|
Alex Moreno
|
c42400a637
|
Merge branch 'dev' into 5579-db-export
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-22 12:43:57 +00:00 |
|
Alex Moreno
|
c6c15d7c69
|
refs #5472 feat: changePassword with passExpired
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-19 14:44:19 +02:00 |
|
Juan Ferrer
|
6b0fd99eb8
|
refs #5667 Fixes: Style, translations, fixtures, UI
|
2023-05-19 10:56:15 +02:00 |
|
Alex Moreno
|
bbc34f04ff
|
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-05-19 07:35:23 +02:00 |
|
Alexandre Riera
|
37b2920157
|
refs #5513 moved sql
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-18 14:49:40 +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
|
ca9d76db77
|
refs #5137 moved sql
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-18 14:47:41 +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
|
2ef922e80c
|
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-18 08:10:10 +02:00 |
|
Alex Moreno
|
36205e75be
|
feat(232201): new version
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-18 07:55:43 +02:00 |
|
Alex Moreno
|
e17b9a32b9
|
add schema
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-18 07:46:51 +02:00 |
|
Alex Moreno
|
ba763abc26
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 232001_test_to_dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-18 07:17:31 +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
|
b1bbc22afc
|
Merge branch 'dev' into 5579-db-export
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-17 11:15:39 +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 |
|
Vicent Llopis
|
eaaa860e97
|
Merge branch 'dev' into 5594-sendPdf_whenMakeInvoice
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-17 07:27:46 +00: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
|
08fcbebbaf
|
refs #5488 polish specifics acls
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-15 14:14:08 +02:00 |
|
Vicent Llopis
|
9ce3e79e00
|
refs #5594 eliminado archivo ducplicado
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-15 11:50:51 +02:00 |
|
Vicent Llopis
|
d5f5115980
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5594-sendPdf_whenMakeInvoice
|
2023-05-15 11:50:09 +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 |
 Pablo Natek
|
8419c76b12
|
refs #5153 worker sin tr
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-12 12:51:07 +02:00 |
|
Carlos Satorres
|
943e8b09c1
|
refs #5599 DELIMITER
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-12 11:15:47 +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 |
|
Carlos Satorres
|
0dea1dfd9e
|
Merge branch 'dev'
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-11 15:52:35 +02:00 |
|
Carlos Satorres
|
fd85cd2d98
|
refs #5599 replace
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-11 15:48:31 +02:00 |
|
Vicent Llopis
|
b10f90fbe1
|
refs #5468 a la seccion privileges se le pasa el parametro user
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-11 15:25:37 +02:00 |
|
Alex Moreno
|
1d6a541b02
|
test into master
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-11 15:07:02 +02:00 |
|
Carlos Satorres
|
43ab07d954
|
refs move reports views
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-11 11:57:13 +02:00 |
|
Carlos Satorres
|
2111ca0993
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5599-ticketColors
|
2023-05-10 14:49:37 +02:00 |
|
Carlos Satorres
|
e258e779b3
|
refs #5599 ticketFuture
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-10 14:49:19 +02:00 |
|
Carlos Satorres
|
9a813c075c
|
refs #5599 procedure y colorClass
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-10 14:43:08 +02:00 |
|
Alex Moreno
|
a345265a89
|
refs #5488 specifics acls
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-10 14:09:06 +02:00 |
|
Carlos Satorres
|
c59915f951
|
refs #5599 procedure
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-10 13:55:36 +02:00 |
|
Vicent Llopis
|
74ea0ce9fd
|
refs #5468 actualizados acls
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-10 13:44:51 +02:00 |
|
Alex Moreno
|
29e0562c8b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl
|
2023-05-10 13:33:52 +02:00 |
|
Alexandre Riera
|
3166a9e420
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5137-aviso-impresora
|
2023-05-10 13:23:10 +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 |
|
Alex Moreno
|
49e2c38ddd
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test_to_dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-10 12:30:56 +02:00 |
|
Vicent Llopis
|
62dd64eb89
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-10 11:56:50 +02:00 |
|
Alex Moreno
|
706c62f624
|
typo
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-10 09:26:33 +02:00 |
|
Alex Moreno
|
3b8cafc783
|
fix(ticketConfigSql): correct folder
gitea/salix/pipeline/head Build queued...
Details
|
2023-05-10 09:22:33 +02:00 |
|
Alex Moreno
|
8c0deb6cfa
|
test(e2e_order): fiter optimized
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-10 09:16:19 +02:00 |
|
Alex Moreno
|
ca8373d7f7
|
feat(acl): add specifics acls to ticket, claim, state and worker
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-09 14:04:39 +02:00 |
|
Vicent Llopis
|
313c641cd7
|
move chages sql
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-09 12:26:29 +02:00 |
|
Vicent Llopis
|
461966d73e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5594-sendPdf_whenMakeInvoice
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-09 11:33:28 +02:00 |