verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 59 Releases Wiki Activity
18,189 Commits 261 Branches 0 Tags 124 MiB
Commit Graph

18189 Commits

Author SHA1 Message Date
Pablo Natek 72283005b8 remove(console.log): refs #3271 remove console.log
gitea/salix/pipeline/head This commit looks good Details
2023-11-30 14:43:14 +01:00
David Domenech 8ab981907d refactor(ticketTracking.userFk): refs #6398 workerFk to userFk
gitea/salix/pipeline/head This commit looks good Details
2023-11-30 14:25:00 +01:00
Pablo Natek c457b5c4d2 Merge branch 'test' into 3271-zoneGetFilterdFix
gitea/salix/pipeline/head This commit looks good Details
2023-11-30 12:39:26 +00:00
Alex Moreno ee7dd66ce9 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-11-30 12:49:42 +01:00
Alex Moreno 35e74a7635 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2023-11-30 12:48:27 +01:00
Alex Moreno ab69dcd4fe refs #6524 fix: fixtures and feat: new changelog format
gitea/salix/pipeline/head This commit looks good Details
2023-11-30 12:32:41 +01:00
Javier Segarra b241efc961 Merge pull request 'refs #6434 feat: improve signIn method' (!1867) from 6434-signInLog_improve_test into test
gitea/salix/pipeline/head This commit looks good Details 
Reviewed-on: #1867
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2023-11-30 11:20:57 +00:00
Alex Moreno 016e4ae37c Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix 2023-11-30 12:20:50 +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
Pablo Natek 3f22f48df7 fix(getFiltered): refs #3271 fix to event filter
gitea/salix/pipeline/head This commit looks good Details
2023-11-30 12:13:12 +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
Carlos Satorres e7d3ef0763 Merge pull request 'refs #6065 remove workcenter' (!1871) from hotfix-hoursFetch into master
gitea/salix/pipeline/head This commit looks good Details 
Reviewed-on: #1871
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2023-11-30 09:20:26 +00:00
Jorge Penadés 6121eeaa3a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5835-summaryRate
gitea/salix/pipeline/head This commit looks good Details
2023-11-30 09:44:05 +01:00
Carlos Satorres 9cdb7c3cca refs #6065 remove workcenter
gitea/salix/pipeline/head This commit looks good Details
2023-11-30 09:18:00 +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
Javier Segarra 7611acb8f2 refs #6434 perf rename version folder for sql file
gitea/salix/pipeline/head This commit looks good Details
2023-11-30 08:34:10 +01:00
Javier Segarra 80f8037f58 refs #6434 perf remove version folder for sql file
gitea/salix/pipeline/head This commit looks good Details
2023-11-30 08:23:14 +01:00
Javier Segarra 58855a7cdd refs #6434 perf: remove bad characters method description
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-30 08:14:56 +01:00
Javier Segarra 6b354a20ad refs #6434 perf: add sql table description
gitea/salix/pipeline/head Build queued... Details
2023-11-30 08:13:28 +01:00
Javier Segarra 138d11b7b0 refs #6434 perf new version folder for sql file
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-30 08:10:32 +01:00
Javier Segarra d4cd23853f refs #6264 perf: try to remove jasmine.clock()
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-30 07:32:16 +01:00
Javier Segarra 97d7f8356f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6264-renewToken 2023-11-30 07:08:23 +01:00
Javier Segarra 1576ab992d refs #6434 perf: new field in SignInLog table
gitea/salix/pipeline/head This commit looks good Details
2023-11-29 19:36:30 +00:00
Javier Segarra 46774b2e73 refs #6434 perf: new field in SignInLog table
gitea/salix/pipeline/head Build queued... Details
2023-11-29 19:35:37 +00:00
Javier Segarra 9176cdb4cb refs #6434 perf: new field in SignInLog table
gitea/salix/pipeline/head This commit looks good Details
2023-11-29 19:34:00 +00:00
Javier Segarra ed6c0924d7 refs #6434 perf: remove console.error
gitea/salix/pipeline/head Build queued... Details
2023-11-29 19:33:04 +00:00
Javier Segarra 48b82b02ca refs #6434 change param type for signInValidate
gitea/salix/pipeline/head This commit looks good Details
2023-11-29 19:32:10 +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
Javier Segarra 63533459b0 refs #6434 feat: improve signIn method
gitea/salix/pipeline/head This commit looks good Details
2023-11-28 13:22:17 +01:00
Jorge Penadés f2673c3818 refs #5835 rate added
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-28 12:12:42 +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
Alex Moreno 37555cbb63 refs #6335 warmFix(ticketAdvance): correct properties
gitea/salix/pipeline/head This commit looks good Details
2023-11-27 15:10:00 +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
Javier Segarra 9da5fb9a14 refs #6264 other: rename camel-case variable
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-27 10:24:25 +01: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
Javier Segarra 901a44cc62 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6264-renewToken
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-27 09:48:31 +01:00
Javier Segarra 81be3b18f7 refs #6264 test: validate-token and renew-token 2023-11-27 09:48:15 +01:00
Javier Segarra 72a0932e35 refs #6264 other: rename camel-case variable 2023-11-27 09:46:27 +01:00