Commit Graph

1036 Commits

Author SHA1 Message Date
Javier Segarra 5f93b8c440 refs #6434 fix: bad merge
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-13 12:01:18 +01:00
Javier Segarra 5b3645a641 refs #6434 fix: bad merge
gitea/salix/pipeline/head Build queued... Details
2023-12-13 11:59:00 +01:00
Javier Segarra d69b59b63e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6434-signIn_issue
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-13 11:54:28 +01:00
Carlos Satorres 2393625a48 refs #5925 Tablet
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-13 08:22:58 +01:00
Javier Segarra 074bb2b980 Merge branch 'dev' into 5666-loggable_to_mixin
gitea/salix/pipeline/head This commit looks good Details
2023-12-13 06:30:14 +00:00
Javier Segarra d44cdcbd13 Merge branch 'dev' into 6264-renewToken
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-13 06:14:55 +00:00
Javier Segarra 8441877f36 refs #6264 perf: remove field's query
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-12 19:43:32 +01:00
Carlos Satorres 412cac7e94 refs #5925 models table docuware
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-12 14:42:36 +01:00
Javier Segarra 6334431d2b refs #2051 feat: uploadFile approach 2023-12-12 14:00:35 +01:00
Javier Segarra ae76776245 refs #2051 feat: removeFile approach 2023-12-12 12:09:06 +01:00
Carlos Satorres 2def2d9ebd Merge branch 'dev' into 6085-ACLsMail
gitea/salix/pipeline/head This commit looks good Details
2023-12-11 13:50:11 +00:00
Carlos Satorres 6ac5d28c40 refs #6085 fix back
gitea/salix/pipeline/head This commit looks good Details
2023-12-11 09:59:09 +01:00
Carlos Satorres 866ad7a9f9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6085-ACLsMail 2023-12-11 08:20:19 +01:00
Javier Segarra b86c73777f Update back/tests.js
gitea/salix/pipeline/head This commit looks good Details
2023-12-07 19:05:54 +00:00
Javier Segarra a7c48b6ddc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5666-loggable_to_mixin
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-05 13:02:34 +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 a8b0a7a5b3 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-12-04 14:46:21 +01:00
Javier Segarra 5656ed7a2b refs #6264 perf: use functions extracted previously 2023-12-04 14:46:05 +01:00
Javier Segarra b9671c0b67 refs #6264 perf: remove files related to token 2023-12-04 14:44:50 +01:00
Carlos Satorres 051c93a42c remove fdescribe
gitea/salix/pipeline/head This commit looks good Details
2023-12-04 09:41:24 +01:00
Carlos Satorres c0ce7e542f refs #6085 solve testback
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-04 09:40:57 +01:00
Carlos Satorres 6d486fbec9 refs #6085 trad, remove front, back test
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-01 13:58:45 +01: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
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 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 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
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
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 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
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
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
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
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 900dffbbba refs #5811 delete viaexpress expeditions included
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-23 10:26:28 +01:00
Javi Gallego f44424dbcf test: refs #6028 test
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-23 09:44:47 +01:00
Sergio De la torre 707173d618 refs #5890 fix: getTickets
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-22 07:04:33 +01:00
Jorge Penadés 3f8d1ff617 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-21 10:17:31 +01:00
Alex Moreno e25ca914a0 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-11-20 10:13:02 +01:00
Alex Moreno 7951b874a6 Merge branch 'dev' into 6264-renewToken
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-20 06:39:50 +00: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 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 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
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 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
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
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 11352798f0 refs #6434 feat: save token in db for each login
gitea/salix/pipeline/head Build queued... Details
2023-11-15 09:41:12 +01:00
Javier Segarra e25b7d0a12 refs #6434 feat: show error for wrong login 2023-11-15 09:39:51 +01:00
Javier Segarra add3a81032 refs #6434 feat: remove recursively fn
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-15 09:29:26 +01:00
Javier Segarra 7f82243ce6 refs #6434 feat: create signInLog table
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-14 15:00:03 +01:00
Javier Segarra 5c777c705f refs #6434 feat: add new error message
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-14 13:00:20 +01:00
Alex Moreno 1a66987cd0 refs #5979 fix(vn-user): resetPassword url
gitea/salix/pipeline/head This commit looks good Details
2023-11-13 12:26:31 +01:00
Javier Segarra 384b5eb7c7 refs #5666 remove old file
gitea/salix/pipeline/head This commit looks good Details
2023-11-13 09:56:16 +01:00
Javier Segarra aab88dc7de refs #5666 perf: use use loggable as mixin
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-13 09:54:12 +01:00
Javier Segarra 3c5af184bb refs #5666 feat: use mixin for this models
gitea/salix/pipeline/head This commit looks good Details
2023-11-10 15:12:49 +01:00
Javier Segarra cf3cc37d97 refs #5666 feat: create mixin 2023-11-10 15:12:24 +01:00
Javier Segarra 5dbfe31a60 refs #5666 feat: define VnRole 2023-11-10 15:12:03 +01:00
Javier Segarra bcccd1894c refs #6264 test: init test
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-10 13:13:17 +01:00
Alex Moreno 204323ac69 test(notification_getList): fix
gitea/salix/pipeline/head This commit looks good Details
2023-11-08 14:57:07 +01:00
Alex Moreno 0de5bc5109 refs #4797 refactor: getList & notificationSubscription method 2023-11-08 14:56:47 +01:00
Javier Segarra 784f5bb7f9 refs #6264 perf: replace now with vnNew
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-07 23:23:02 +01:00
Javier Segarra 67faf076d2 refs '#6264' feat: memoization accessTokenConfig 2023-11-04 16:51:25 +01:00
Javier Segarra 8c6eab23e5 handle expired token and return new token 2023-11-04 14:39:26 +01:00
Alex Moreno d06810b1b9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4797-worker-notification-selector
gitea/salix/pipeline/head This commit looks good Details
2023-11-03 14:58:55 +01:00
Alex Moreno 03e2f57306 refs #6067 fix: emailVerify url
gitea/salix/pipeline/head This commit looks good Details
2023-11-02 10:57:50 +01:00
Alex Moreno 30895f444f Merge branch 'dev' into 5811-ticket.expedition_deleteViaexpress
gitea/salix/pipeline/head This commit looks good Details
2023-10-26 12:14:31 +00:00
Alex Moreno ae27aa5b1e fix: test to dev
gitea/salix/pipeline/head This commit looks good Details
2023-10-23 10:08:26 +02:00
Alex Moreno dc00b85bec Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-23 08:31:37 +02:00
Alex Moreno 2edfacb91c refs #5979 fix(sendCheckingPresence)!
gitea/salix/pipeline/head This commit looks good Details
2023-10-23 07:33:52 +02:00
Pablo Natek 0237517f0c Merge branch 'master' into 5979-getAppOrigin
gitea/salix/pipeline/head This commit looks good Details
2023-10-20 10:55:30 +00:00
Pablo Natek 5c69d9c7f0 fix: add await in async functions refs #5979 2023-10-20 12:53:54 +02:00
Alex Moreno ef1ddfd484 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-10-20 09:28:37 +02:00
Alex Moreno cadec7d01f Merge branch 'dev' into 6067-vnUser_privileges_and_verifyEmail
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 11:36:14 +00:00
Guillermo Bonet 5c51d7fb04 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 13:22:33 +02:00
Alex Moreno d9ab607126 refs #6199 feat(sale): increase quantity if newPrice is higher
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 13:03:11 +02:00
Alex Moreno 1ea6b87266 Merge branch 'dev' into 6067-vnUser_privileges_and_verifyEmail
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-19 10:48:51 +00:00
Alex Moreno 3294937b54 Merge branch 'dev' into 6067-vnUser_privileges_and_verifyEmail
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 08:50:29 +00:00
Jorge Penadés 5b1e5743b5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6138-setPassword
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 09:35:37 +02:00
Pablo Natek f1b11fdca2 Merge branch 'master' into 5979-getAppOrigin
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-19 06:51:50 +00:00
Pablo Natek f8889df903 remove(console.log): se quitan console.log que se utilizaron para dbuggear refs #5979
gitea/salix/pipeline/head Build queued... Details
2023-10-19 08:40:25 +02:00
Pablo Natek 488181e1b6 feat(getUrl): se añade el metodo getUrl refs #5979
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-19 08:37:28 +02:00
Alex Moreno b1c931a510 remove console.log
gitea/salix/pipeline/head This commit looks good Details
2023-10-18 08:52:17 +02:00
Alex Moreno b3c7511e59 refs #6067 feat(url): getByUser 2023-10-18 08:52:06 +02:00
Alex Moreno 6871ce4b15 Merge branch '6067-vnUser_privileges_and_verifyEmail' of https://gitea.verdnatura.es/verdnatura/salix into 6067-vnUser_privileges_and_verifyEmail 2023-10-18 07:29:03 +02:00
Alex Moreno a916007314 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6067-vnUser_privileges_and_verifyEmail 2023-10-18 07:20:34 +02:00