 Javier Segarra
|
035b31d878
|
refs #5666 test: fix e2e tests
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-05 12:00:31 +01:00 |
|
Javier Segarra
|
7a63e527a5
|
refs #5666 perf: remove comments
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-05 07:50:52 +01:00 |
|
Javier Segarra
|
6f32a588bb
|
refs #5666 feat: add role relation to RoleMapping
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-05 07:49:10 +01:00 |
|
Javier Segarra
|
1d92bbf4a2
|
refs #5666 feat: replace base value and add mixins
|
2023-12-05 07:48:56 +01:00 |
|
Javier Segarra
|
b4f4714c0a
|
refs #5666 feat: remove loggable.json
|
2023-12-05 07:47:38 +01:00 |
|
Javier Segarra
|
57add7abf0
|
refs #5666 perf: replace Role by VnRole
|
2023-12-05 07:16:12 +01:00 |
|
Javier Segarra
|
2fe631f078
|
refs #5666 feat: change models permissions
|
2023-12-05 07:15:22 +01:00 |
|
Javier Segarra
|
01e7135224
|
refs #5666 feat: replace Role by VnRole in front
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-30 12:20:05 +01:00 |
|
Javier Segarra
|
16001099b6
|
refs #5666 feat: update ACLs for role and vnRole
|
2023-11-30 12:15:48 +01:00 |
|
Javier Segarra
|
2a2998a8bc
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5666-loggable_to_mixin
|
2023-11-30 12:01:44 +01:00 |
 Javi Gallego
|
69e555e7b4
|
Merge pull request '5652-fixtures-fix' (!1870) from 5652-fixtures-fix into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1870
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2023-11-30 08:13:05 +00:00 |
|
Javi Gallego
|
d246b5f9a8
|
Merge branch 'dev' into 5652-fixtures-fix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-29 15:26:51 +01:00 |
 Guillermo Bonet
|
b3cc020ea7
|
Merge pull request 'refs #6023 Fix change rol bug' (!1727) from 6023-changeRol into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1727
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2023-11-29 11:48:17 +00:00 |
|
Guillermo Bonet
|
5e9a62eac2
|
Merge branch 'dev' into 6023-changeRol
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-29 08:21:23 +00:00 |
 Alex Moreno
|
2e22984e77
|
refs #6197 fix: add salix role in fixtures
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-29 09:13:54 +01:00 |
|
Guillermo Bonet
|
1a5cc67312
|
Merge branch 'dev' into 6023-changeRol
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-28 12:07:50 +01:00 |
|
Javi Gallego
|
2fa56cce4b
|
fix: refs #5652 arreglo fixtures
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-28 09:22:00 +01:00 |
|
Javier Segarra
|
bb9723b65d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5666-loggable_to_mixin
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-28 08:18:11 +01:00 |
|
Javier Segarra
|
f5f2896cbf
|
refs 5666 feat: replace Role model by VnRole model
|
2023-11-28 08:12:16 +01:00 |
|
Javier Segarra
|
50a97693b9
|
refs 5666 feat: remove loggable.js file
|
2023-11-28 07:48:42 +01:00 |
 Juan Ferrer
|
c7291e3367
|
Merge pull request 'test' (!1863) from test into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1863
|
2023-11-27 12:17:11 +00:00 |
|
Juan Ferrer
|
74772472d5
|
Merge pull request 'master' (!1820) from master into test
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1820
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2023-11-27 12:16:42 +00:00 |
 Carlos Satorres
|
23235e2b44
|
Merge pull request 'refs #6506 contract' (!1861) from 6506-hotfixContract into master
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1861
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2023-11-27 12:07:52 +00:00 |
|
Guillermo Bonet
|
8ee8d90eec
|
Merge pull request 'refactor: refs #3222 Expence to expense' (!1860) from 3222-expenceToExpense into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1860
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2023-11-27 09:56:30 +00:00 |
|
Guillermo Bonet
|
3bdb002034
|
Merge branch 'dev' into 3222-expenceToExpense
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-27 09:06:17 +00:00 |
|
Guillermo Bonet
|
aefff68c29
|
refactor: refs #3222 Requested changes
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-27 09:51:56 +01:00 |
|
Alex Moreno
|
3fb1ed9dfe
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6506-hotfixContract
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-27 08:38:17 +01:00 |
 Jorge Penadés
|
d075cb97ad
|
Merge pull request 'refs #5811 feat: al borrar expedicion borrar de viaexpress' (!1754) from 5811-ticket.expedition_deleteViaexpress into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1754
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2023-11-27 07:36:28 +00:00 |
|
Carlos Satorres
|
f9d5cad412
|
refs #6506 contract
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-27 07:57:18 +01:00 |
|
Guillermo Bonet
|
2be1639e9f
|
refactor: refs #3222 Expence to expense
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-24 12:42:25 +01:00 |
|
Jorge Penadés
|
53c8e87b5b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5811-ticket.expedition_deleteViaexpress
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-24 10:57:32 +01:00 |
|
Jorge Penadés
|
74dd64126a
|
Merge pull request '#5835 getTotals fixed' (!1854) from 5835-fixGetTotals into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1854
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2023-11-24 09:56:21 +00:00 |
|
Jorge Penadés
|
8ac3887d80
|
refs #5811 rename methods
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-24 10:53:38 +01:00 |
|
Jorge Penadés
|
c56588a472
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5811-ticket.expedition_deleteViaexpress
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-24 10:18:47 +01:00 |
|
Jorge Penadés
|
b3584d9db5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5835-fixGetTotals
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-24 10:12:45 +01:00 |
|
Carlos Satorres
|
461cb3d2ba
|
Merge pull request 'hotfix-undefinedContract' (!1859) from hotfix-undefinedContract into master
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1859
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2023-11-24 08:06:41 +00:00 |
|
Carlos Satorres
|
5d18c211a0
|
refs #6507 state
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-24 08:40:06 +01:00 |
|
Carlos Satorres
|
8a568f180a
|
refs #6506 fix e2e, refactor business
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-24 07:47:57 +01:00 |
|
Carlos Satorres
|
ebe467f721
|
refs #6506 hotfix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-24 07:04:55 +01:00 |
|
Javi Gallego
|
4a62588464
|
Merge pull request '6028_route_getRouteByWorker' (!1857) from 6028_route_getRouteByWorker into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1857
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2023-11-23 14:01:53 +00:00 |
|
Jorge Penadés
|
1f9030c36d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5811-ticket.expedition_deleteViaexpress
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-23 13:35:46 +01:00 |
|
Jorge Penadés
|
eeef279483
|
refs #5811 replace decription
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-23 13:34:29 +01:00 |
|
Jorge Penadés
|
5f09907c98
|
Merge branch '5835-fixGetTotals' of https://gitea.verdnatura.es/verdnatura/salix into 5835-fixGetTotals
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-23 13:21:09 +01:00 |
|
Jorge Penadés
|
025e4f3f87
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5835-fixGetTotals
|
2023-11-23 13:21:00 +01:00 |
|
Jorge Penadés
|
f4a1d09ef8
|
Merge branch 'dev' into 5835-fixGetTotals
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-23 12:04:05 +00:00 |
 Sergio De la torre
|
756e55f5c2
|
Merge pull request 'refs #5890 fix: getTickets' (!1852) from 5890_collection_getTickets into dev
gitea/salix/pipeline/head Build queued...
Details
Reviewed-on: #1852
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2023-11-23 11:23:15 +00:00 |
|
Alex Moreno
|
4735307f5d
|
refs #5890: fix(Collection/getTickets): accepts iss.quantity nulls
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-23 11:49:00 +01:00 |
|
Jorge Penadés
|
6b2c1e09de
|
refs #5835 refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-23 11:31:00 +01:00 |
|
Javi Gallego
|
5b145a57e6
|
error: refs 6028 test front quitado
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-23 11:29:53 +01:00 |
|
Jorge Penadés
|
048e3089cd
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5835-fixGetTotals
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-23 11:26:41 +01:00 |