verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity

#6434 - SignIn issue_improve-signInLogMethod #1848

Closed
jsegarra wants to merge 65 commits from 6434-improve-signInLog into test
pull from: 6434-improve-signInLog
merge into: verdnatura:test
Conversation 0 Commits 65 Files Changed 83 +516 -383
jsegarra commented 2023-11-21 07:08:26 +00:00
Member
Copy Link
No description provided.
jsegarra added 5 commits 2023-11-21 07:08:26 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
66bf95975a refs #6434 fix: console.log
gitea/salix/pipeline/head There was a failure building this commit Details
891738bd57 refs #6434 perf: new db field to save boolean
gitea/salix/pipeline/head There was a failure building this commit Details
a3076e4fa1 refs #6434 perf: search and compare user from req
gitea/salix/pipeline/head There was a failure building this commit Details
a7be577e92 refs #6434 perf: use rawSql instead query
jsegarra added 1 commit 2023-11-21 07:12:42 +00:00
gitea/salix/pipeline/head This commit looks good Details
d71e7a4b41 refs #64634 perf: linter
jsegarra changed title from WIP: 6434-SignIn issue_improve-signInLogMethod to 6434-SignIn issue_improve-signInLogMethod 2023-11-21 08:11:58 +00:00
jsegarra requested review from alexm 2023-11-21 08:12:04 +00:00
alexm requested changes 2023-11-23 07:55:49 +00:00
alexm left a comment
Member
Copy Link

Tens tb un conflicte

Tens tb un conflicte
back/models/vn-user.js Outdated
@ -133,3 +140,3 @@
};
Self.validateLogin = async function(user, password) {
Self.validateLogin = async function(user, password, ctx = null) {
alexm commented 2023-11-21 08:59:11 +00:00
Member
Copy Link

Pq el = null? sino el pases seria undefined que tame te val no?

Pq el = null? sino el pases seria undefined que tame te val no?
jsegarra marked this conversation as resolved
jsegarra added 23 commits 2023-11-24 11:45:40 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
639d5963a3 refs #6028 get_routes
gitea/salix/pipeline/head There was a failure building this commit Details
707173d618 refs #5890 fix: getTickets
gitea/salix/pipeline/head This commit looks good Details
a27bb53089 refs #5835 getTotals fixed
gitea/salix/pipeline/head There was a failure building this commit Details
e146c0ea46 Merge branch 'dev' into 6028_route_getRouteByWorker
gitea/salix/pipeline/head There was a failure building this commit Details
e856de0cfd feat: refs #6028 test
gitea/salix/pipeline/head There was a failure building this commit Details
800d12e0f2 Merge branch 'dev' into 5890_collection_getTickets
gitea/salix/pipeline/head This commit looks good Details
217aa1ac77 refs #6491 deploy(2350) init version
gitea/salix/pipeline/head There was a failure building this commit Details
1277bec801 Merge branch 'dev' into 5890_collection_getTickets
gitea/salix/pipeline/head There was a failure building this commit Details
f44424dbcf test: refs #6028 test
gitea/salix/pipeline/head This commit looks good Details
5b145a57e6 error: refs 6028 test front quitado
gitea/salix/pipeline/head This commit looks good Details
6b2c1e09de refs #5835 refactor
gitea/salix/pipeline/head Build queued... Details
756e55f5c2 Merge pull request 'refs #5890 fix: getTickets' (!1852) from 5890_collection_getTickets into dev 
Reviewed-on: #1852
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
f4a1d09ef8 Merge branch 'dev' into 5835-fixGetTotals
gitea/salix/pipeline/head This commit looks good Details
4a62588464 Merge pull request '6028_route_getRouteByWorker' (!1857) from 6028_route_getRouteByWorker into dev 
Reviewed-on: #1857
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
74dd64126a Merge pull request '#5835 getTotals fixed' (!1854) from 5835-fixGetTotals into dev 
Reviewed-on: #1854
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
jsegarra changed title from 6434-SignIn issue_improve-signInLogMethod to refs #6434-SignIn issue_improve-signInLogMethod 2023-11-24 11:47:06 +00:00
jsegarra changed title from refs #6434-SignIn issue_improve-signInLogMethod to #6434 - SignIn issue_improve-signInLogMethod 2023-11-24 11:47:41 +00:00
jsegarra requested review from alexm 2023-11-28 06:44:47 +00:00
alexm requested changes 2023-11-28 07:08:07 +00:00
alexm left a comment
Member
Copy Link

HAs hecho la rama apartir de dev (es como si estuviseses haciendo un dev + tus cambios → test)

HAs hecho la rama apartir de dev (es como si estuviseses haciendo un dev + tus cambios → test)
jsegarra added 2 commits 2023-11-28 10:47:38 +00:00
jsegarra added 22 commits 2023-11-28 10:50:16 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
900dffbbba refs #5811 delete viaexpress expeditions included
gitea/salix/pipeline/head There was a failure building this commit Details
2e67ef4f5d refs #5811 refactor deleteExpeditions
gitea/salix/pipeline/head This commit looks good Details
db15285858 refs #5811 test updated
gitea/salix/pipeline/head This commit looks good Details
eeef279483 refs #5811 replace decription
gitea/salix/pipeline/head There was a failure building this commit Details
8ac3887d80 refs #5811 rename methods
gitea/salix/pipeline/head This commit looks good Details
2be1639e9f refactor: refs #3222 Expence to expense
gitea/salix/pipeline/head This commit looks good Details
d075cb97ad Merge pull request 'refs #5811 feat: al borrar expedicion borrar de viaexpress' (!1754) from 5811-ticket.expedition_deleteViaexpress into dev 
Reviewed-on: #1754
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
gitea/salix/pipeline/head There was a failure building this commit Details
aefff68c29 refactor: refs #3222 Requested changes
gitea/salix/pipeline/head This commit looks good Details
3bdb002034 Merge branch 'dev' into 3222-expenceToExpense
gitea/salix/pipeline/head This commit looks good Details
8ee8d90eec Merge pull request 'refactor: refs #3222 Expence to expense' (!1860) from 3222-expenceToExpense into dev 
Reviewed-on: #1860
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
c7291e3367 Merge pull request 'test' (!1863) from test into dev 
Reviewed-on: #1863
jsegarra added 2 commits 2023-11-28 10:57:23 +00:00
jsegarra added 2 commits 2023-11-28 11:04:43 +00:00
jsegarra added 1 commit 2023-11-28 11:14:52 +00:00
jsegarra added 2 commits 2023-11-28 11:22:53 +00:00
jsegarra changed title from #6434 - SignIn issue_improve-signInLogMethod to #6434 - SignIn issue_improve-signInLogMethod 2023-11-28 11:23:42 +00:00
jsegarra changed target branch from test to dev 2023-11-28 11:23:43 +00:00
jsegarra changed title from #6434 - SignIn issue_improve-signInLogMethod to #6434 - SignIn issue_improve-signInLogMethod 2023-11-28 11:24:02 +00:00
jsegarra changed target branch from dev to master 2023-11-28 11:24:02 +00:00
jsegarra added 2 commits 2023-11-28 11:26:21 +00:00
gitea/salix/pipeline/head This commit looks good Details
37555cbb63 refs #6335 warmFix(ticketAdvance): correct properties
gitea/salix/pipeline/head This commit looks good Details
81b3b22e55 Merge branch 'test' into 6434-improve-signInLog
jsegarra added 1 commit 2023-11-28 11:28:50 +00:00
gitea/salix/pipeline/head Build queued... Details
c23c10dd5a Revert "revert merge from dev" 
This reverts commit e026d487c7.
jsegarra changed title from #6434 - SignIn issue_improve-signInLogMethod to #6434 - SignIn issue_improve-signInLogMethod 2023-11-28 11:33:23 +00:00
jsegarra changed target branch from master to test 2023-11-28 11:33:24 +00:00
jsegarra closed this pull request 2023-11-28 11:34:34 +00:00
jsegarra reopened this pull request 2023-11-28 11:39:57 +00:00
jsegarra added 1 commit 2023-11-28 11:48:46 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
563781ee57 fix: refs: #6207 impide facturar si no tienes incoterm
jsegarra closed this pull request 2023-11-28 11:50:11 +00:00
Some checks are pending
gitea/salix/pipeline/head There was a failure building this commit
Details
gitea/salix/pipeline/pr-*
Required

Pull request closed

Please reopen this pull request to perform a merge.
Sign in to join this conversation.
Reviewers
No reviewers
alexm
Labels
Clear labels   
CR / Tests passed

Unit tests and e2e passed

  
e2e

Implement e2e

  
Missing tests

Missing tests

  
Needs refactor

   
Simple

Simple check / No CR needed

No Label
CR / Tests passed
e2e
Missing tests
Needs refactor
Simple
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: verdnatura/salix#1848
No description provided.
Delete Branch "6434-improve-signInLog"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?