verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 60 Releases Wiki Activity
19,715 Commits 273 Branches 0 Tags 112 MiB
Commit Graph

19715 Commits

Author SHA1 Message Date
Guillermo Bonet 8da36569f7 refactor: refs #4502 zoneEstimatedDelivery
gitea/salix/pipeline/head Build queued... Details
2023-11-17 07:44:43 +01:00
Guillermo Bonet 500eb22dc6 Merge branch 'dev' into 4502-zoneEstimatedDelivery
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-17 06:43:58 +00:00
Guillermo Bonet 3d1c69be56 refactor: refs #4502 zoneEstimatedDelivery
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-17 07:43:32 +01:00
Guillermo Bonet 2f611391b9 Revert "refactor: refs #4502 Deleted zoneEstimatedDelivery"
gitea/salix/pipeline/head This commit looks good Details 
This reverts commit bfd6e1f398.
 2023-11-17 07:17:29 +01:00
Juan Ferrer c2e295f777 fix: refs #6432 account sync fixes 2023-11-17 00:08:29 +01:00
Juan Ferrer 14eb14ad3f fix: refs #6432 bookworm upgrade
gitea/salix/pipeline/head This commit looks good Details
2023-11-17 00:00:36 +01:00
Juan Ferrer 6930c2d52e fix: #6432 account sync fixes
gitea/salix/pipeline/head This commit looks good Details
2023-11-16 23:13:16 +01:00
Juan Ferrer ea5a881d1f fix: refs #6432 account sync fixes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-16 23:10:30 +01:00
Juan Ferrer 1937560118 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-16 23:07:30 +01:00
Juan Ferrer 4f5242e3ae fix: refs #6432 account sync fixes 2023-11-16 23:07:26 +01:00
Alex Moreno aea3f7b2b9 refs #6434 fix: use trim
gitea/salix/pipeline/head This commit looks good Details
2023-11-16 15:10:47 +01:00
Alex Moreno 83ae0379b5 refs #6434 fix: console.log
gitea/salix/pipeline/head This commit looks good Details
2023-11-16 12:28:35 +01:00
Javier Segarra adc1cd887b Merge pull request '#6434 - Usuario accede como otro usuario' (!1843) from 6434-signInLog_issue_MASTER into master
gitea/salix/pipeline/head This commit looks good Details 
Reviewed-on: #1843
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2023-11-16 11:06:50 +00:00
Javier Segarra a73453e9ed refs #6434 feat: remove old sql file
gitea/salix/pipeline/head This commit looks good Details
2023-11-16 11:56:59 +01:00
Javier Segarra 9e64939810 refs #6434 feat: add Id property in model 2023-11-16 11:56:48 +01:00
Javier Segarra abf772ae87 refs #6434 feat: check if signIn inserts signInLog
gitea/salix/pipeline/head This commit looks good Details
2023-11-16 10:43:00 +01:00
Javier Segarra 386b556216 refs #6434 feat: new test user signIn with email
gitea/salix/pipeline/head This commit looks good Details
2023-11-16 10:29:57 +01:00
Javier Segarra 579cd832c0 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6434-signInLog_issue_MASTER 2023-11-16 10:08:06 +01:00
Alex Moreno 9c6b594426 hotFix: comment error logIn
gitea/salix/pipeline/head This commit looks good Details
2023-11-16 10:04:34 +01:00
Alex Moreno b8d256e4e4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6335-ticketAdvance_splitOrCreate
gitea/salix/pipeline/head This commit looks good Details
2023-11-16 09:58:51 +01:00
Alex Moreno f677382f96 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-11-16 09:29:53 +01:00
Javier Segarra 67f5be474d refs #6434 perf: rename db/changes current folder
gitea/salix/pipeline/head This commit looks good Details
2023-11-16 09:21:22 +01:00
Javier Segarra e4f7790843 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6434-signInLog_issue_MASTER
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-16 09:15:01 +01:00
Alex Moreno 54e8e6a27d refs #6417 fix(vnUser): toLowerCase
gitea/salix/pipeline/head This commit looks good Details
2023-11-16 09:10:45 +01:00
Javier Segarra 144b26cf4c refs #6434 perf: signInLog table id column AI
gitea/salix/pipeline/head This commit looks good Details
2023-11-16 08:47:08 +01:00
Javier Segarra d032b3a527 refs #6434 perf: add description to signInLog table
gitea/salix/pipeline/head This commit looks good Details
2023-11-16 08:42:17 +01:00
Javier Segarra e73836cbdb refs #6434 feat: remove primary key constraint
gitea/salix/pipeline/head This commit looks good Details
2023-11-16 08:31:01 +01:00
Javier Segarra 3c8ed3ff51 refs #6434 feat: username.toLowerCase() 2023-11-16 08:30:27 +01:00
Javier Segarra c6b5d7f5a4 refs #6434 feat: rename id key by token 2023-11-16 08:30:01 +01:00
Guillermo Bonet bfd6e1f398 refactor: refs #4502 Deleted zoneEstimatedDelivery
gitea/salix/pipeline/head This commit looks good Details
2023-11-16 08:29:00 +01:00
Alex Moreno 5bdf6a7338 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2023-11-16 07:56:23 +01:00
Alex Moreno 301533b0ca Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6434-signInLog_issue_MASTER
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-16 07:30:45 +01:00
Alex Moreno 4896be51ef fix: translation
gitea/salix/pipeline/head This commit looks good Details
2023-11-16 07:27:42 +01:00
Sergio De la torre 9f300de468 Merge pull request 'refs #5652 fix: setVisibleDiscard add parameter null' (!1841) from 5652_warmFix_setVisibleDiscard into test
gitea/salix/pipeline/head This commit looks good Details 
Reviewed-on: #1841
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2023-11-15 15:12:57 +00:00
Javier Segarra 13720291b2 refs #6434 perf: remove unique in token column
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-15 15:18:02 +01:00
Alex Moreno ac3d23579a Merge branch 'master' into 6434-signInLog_issue_MASTER
gitea/salix/pipeline/head This commit looks good Details
2023-11-15 13:50:21 +00:00
Carlos Satorres a62b74dc10 Merge pull request 'hotfix addressFk' (!1835) from hotfix-ticketAddresFk into master
gitea/salix/pipeline/head This commit looks good Details 
Reviewed-on: #1835
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2023-11-15 13:38:27 +00:00
Carlos Satorres 5b587b3449 Merge branch 'master' into hotfix-ticketAddresFk
gitea/salix/pipeline/head This commit looks good Details
2023-11-15 12:56:45 +00:00
Javier Segarra 58edcb9055 refs #6434 feat: save token in db for each login
gitea/salix/pipeline/head This commit looks good Details
2023-11-15 13:50:06 +01:00
Javier Segarra 0a31968cc7 refs #6434 feat: show error for wrong login 2023-11-15 13:49:54 +01:00
Javier Segarra e0f6d08a1e refs #6434 feat: create signInLog table 2023-11-15 13:49:41 +01:00
Sergio De la torre a5d94b3a26 Merge branch 'test' into 5652_warmFix_setVisibleDiscard
gitea/salix/pipeline/head This commit looks good Details
2023-11-15 12:43:58 +00:00
Alex Moreno 89967b8538 fix(workerDescriptor): show account button
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-15 13:16:31 +01:00
Alex Moreno 51f881427d Merge pull request '6434-signInLog_issue' (!1839) from 6434-signInLog_issue into test
gitea/salix/pipeline/head This commit looks good Details 
Reviewed-on: #1839
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2023-11-15 12:12:30 +00:00
Sergio De la torre 692c5eb164 refs #5652 fix: setVisibleDiscard add parameter null
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-15 12:38:08 +01:00
Guillermo Bonet 2847b993d3 Merge branch 'dev' into 6023-changeRol
gitea/salix/pipeline/head This commit looks good Details
2023-11-15 11:30:23 +00:00
Alex Moreno 0d9ee1758b Merge branch 'master' into hotfix-ticketAddresFk
gitea/salix/pipeline/head This commit looks good Details
2023-11-15 11:06:52 +00:00
Javier Segarra f7b0882978 refs #6434 feat: remove forceId property
gitea/salix/pipeline/head This commit looks good Details
2023-11-15 11:50:56 +01:00
Javi Gallego 87bd6c4282 Merge pull request 'fix: refs: #6207 impide facturar si no tienes incoterm' (!1829) from 6207-incoterm-solo-en-serie-world into dev
gitea/salix/pipeline/head This commit looks good Details 
Reviewed-on: #1829
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2023-11-15 09:26:28 +00:00
Javi Gallego a4328e607e Merge branch 'dev' into 6207-incoterm-solo-en-serie-world
gitea/salix/pipeline/head This commit looks good Details
2023-11-15 10:11:05 +01:00