verdnatura/salix
verdnatura
/
salix
3
5
Fork 2
Code Issues Pull Requests 72 Releases Wiki Activity
18,477 Commits 300 Branches 0 Tags 130 MiB
Commit Graph

18477 Commits

Author SHA1 Message Date
Guillermo Bonet 2f611391b9 Revert "refactor: refs #4502 Deleted zoneEstimatedDelivery" 
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 2023-11-17 00:00:36 +01:00
Juan Ferrer 6930c2d52e fix: #6432 account sync fixes 2023-11-16 23:13:16 +01:00
Juan Ferrer ea5a881d1f fix: refs #6432 account sync fixes 2023-11-16 23:10:30 +01:00
Juan Ferrer 1937560118 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix 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 2023-11-16 15:10:47 +01:00
Javier Segarra 091de1931d Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 5739-dockerRefactor 2023-11-16 12:42:19 +01:00
Alex Moreno 83ae0379b5 refs #6434 fix: console.log 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 
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 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 2023-11-16 10:43:00 +01:00
Javier Segarra 386b556216 refs #6434 feat: new test user signIn with email 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 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 2023-11-16 09:58:51 +01:00
Alex Moreno f677382f96 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2023-11-16 09:29:53 +01:00
Javier Segarra 67f5be474d refs #6434 perf: rename db/changes current folder 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 2023-11-16 09:15:01 +01:00
Alex Moreno 54e8e6a27d refs #6417 fix(vnUser): toLowerCase 2023-11-16 09:10:45 +01:00
Javier Segarra 144b26cf4c refs #6434 perf: signInLog table id column AI 2023-11-16 08:47:08 +01:00
Javier Segarra d032b3a527 refs #6434 perf: add description to signInLog table 2023-11-16 08:42:17 +01:00
Javier Segarra e73836cbdb refs #6434 feat: remove primary key constraint 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 2023-11-16 08:29:00 +01:00
Alex Moreno 5bdf6a7338 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test 2023-11-16 07:56:23 +01:00
Alex Moreno b2254236b0 Merge branch '5739-dockerRefactor' of https://gitea.verdnatura.es/verdnatura/salix into 5739-dockerRefactor 2023-11-16 07:34:08 +01:00
Alex Moreno 301533b0ca Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6434-signInLog_issue_MASTER 2023-11-16 07:30:45 +01:00
Alex Moreno 4896be51ef fix: translation 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 
Reviewed-on: #1841
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2023-11-15 15:12:57 +00:00
Javier Segarra c5c2252a74 refs #5739 perf: same network 2023-11-15 15:47:59 +01:00
Javier Segarra 13720291b2 refs #6434 perf: remove unique in token column 2023-11-15 15:18:02 +01:00
Alex Moreno ac3d23579a Merge branch 'master' into 6434-signInLog_issue_MASTER 2023-11-15 13:50:21 +00:00
Carlos Satorres a62b74dc10 Merge pull request 'hotfix addressFk' (!1835) from hotfix-ticketAddresFk into master 
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 2023-11-15 12:56:45 +00:00
Alex Moreno f39c7bf88e Merge branch '5739-dockerRefactor' of https://gitea.verdnatura.es/verdnatura/salix into 5739-dockerRefactor 2023-11-15 13:56:29 +01:00
Javier Segarra 58edcb9055 refs #6434 feat: save token in db for each login 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 2023-11-15 12:43:58 +00:00
Javier Segarra cbcab64f8b refs #5739 perf print/package-lock.json 2023-11-15 13:38:34 +01:00
Alex Moreno db363d8b88 Merge branch '5739-dockerRefactor' of https://gitea.verdnatura.es/verdnatura/salix into 5739-dockerRefactor 2023-11-15 13:37:05 +01:00
Javier Segarra 0167a55f61 refs #5739 feat: new docker-compose local exec 2023-11-15 13:36:00 +01:00
Alex Moreno 89967b8538 fix(workerDescriptor): show account button 2023-11-15 13:16:31 +01:00
Alex Moreno 51f881427d Merge pull request '6434-signInLog_issue' (!1839) from 6434-signInLog_issue into test 
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 2023-11-15 12:38:08 +01:00
Guillermo Bonet 2847b993d3 Merge branch 'dev' into 6023-changeRol 2023-11-15 11:30:23 +00:00