romanov73
/
ng-tracker
1
0
Fork 0
Code Issues 18 Pull Requests 4 Projects Releases Wiki Activity

Labels Milestones

Resolve "Смена пароля" #223

Merged
arefiev1997 merged 1 commits from 88-change-password into dev 5 years ago
Conversation 13 Commits 1 Files Changed 1
arefiev1997 commented 5 years ago (Migrated from gitlab.com)

Closes #88

Closes #88
arefiev1997 commented 5 years ago (Migrated from gitlab.com)

changed milestone to %6

changed milestone to %6
arefiev1997 commented 5 years ago (Migrated from gitlab.com)

added 11 commits

  • 95fc9da4 - lk base, created from dev
  • 3d02f551 - Merge branch 'lk_v2' into 87-inviting-user
  • 11ef644e - 88 inviting user base
  • d88f67ce - 87 transactional inviting
  • 48a18a3a - 87 fixed imports
  • 3226cc39 - 87 fixed UserControllerV2 logger
  • ca3159a6 - Merge branch '87-inviting-user' into 88-change-password
  • f8f501b8 - 88-change-password base
  • d50673f5 - 87-inviting-user small fix in mail template, and changed default user name
  • 33f62c04 - Merge branch '87-inviting-user' into 88-change-password
  • c47d4f8a - #88 removed unused imports

Compare with previous version

added 11 commits <ul><li>95fc9da4 - lk base, created from dev</li><li>3d02f551 - Merge branch &#39;lk_v2&#39; into 87-inviting-user</li><li>11ef644e - 88 inviting user base</li><li>d88f67ce - 87 transactional inviting</li><li>48a18a3a - 87 fixed imports</li><li>3226cc39 - 87 fixed UserControllerV2 logger</li><li>ca3159a6 - Merge branch &#39;87-inviting-user&#39; into 88-change-password</li><li>f8f501b8 - 88-change-password base</li><li>d50673f5 - 87-inviting-user small fix in mail template, and changed default user name</li><li>33f62c04 - Merge branch &#39;87-inviting-user&#39; into 88-change-password</li><li>c47d4f8a - #88 removed unused imports</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/96/diffs?diff_id=42198880&start_sha=51851baa48157a5a67da3b172ae9ab2bd20d3b77)
arefiev1997 commented 5 years ago (Migrated from gitlab.com)

assigned to @romanov73

assigned to @romanov73
arefiev1997 commented 5 years ago (Migrated from gitlab.com)

unmarked as a Work In Progress

unmarked as a **Work In Progress**
romanov73 commented 5 years ago (Migrated from gitlab.com)

При возникновении ошибок они не обрабатываются, например если пароли не совпадают, то на странице отображается exception
{"data":null,"error":{"data":null,"code":104,"message":"User passwords is not valid or not match"}}

При возникновении ошибок они не обрабатываются, например если пароли не совпадают, то на странице отображается exception `{"data":null,"error":{"data":null,"code":104,"message":"User passwords is not valid or not match"}}`
arefiev1997 commented 5 years ago (Migrated from gitlab.com)

changed this line in version 2 of the diff

changed this line in [version 2 of the diff](https://gitlab.com/romanov73/ng-tracker/merge_requests/96/diffs?diff_id=42329705&start_sha=c47d4f8a05d4a3f573d87f269a9be31fd1a80398#7302eb5841cd253beeb6283181f60a0d268c1877_63_0)
arefiev1997 commented 5 years ago (Migrated from gitlab.com)

added 4 commits

  • 728fa429 - 87 error handling
  • 4fc8bc37 - Merge branch '87-inviting-user' into 88-change-password
  • 052e4a1a - 88 rest changePassword + ajax
  • fbd618a6 - 88 changed error text to russian

Compare with previous version

added 4 commits <ul><li>728fa429 - 87 error handling</li><li>4fc8bc37 - Merge branch &#39;87-inviting-user&#39; into 88-change-password</li><li>052e4a1a - 88 rest changePassword + ajax</li><li>fbd618a6 - 88 changed error text to russian</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/96/diffs?diff_id=42329705&start_sha=c47d4f8a05d4a3f573d87f269a9be31fd1a80398)
arefiev1997 commented 5 years ago (Migrated from gitlab.com)

added 1 commit

  • 64357c25 - 88 fixed changePassword request data

Compare with previous version

added 1 commit <ul><li>64357c25 - 88 fixed changePassword request data</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/96/diffs?diff_id=42330933&start_sha=fbd618a6d0711a59886805b65d06f2e2dbb25b4d)
arefiev1997 commented 5 years ago (Migrated from gitlab.com)

added 1 commit

  • 740adc53 - 88 js using showFeedbackMessage

Compare with previous version

added 1 commit <ul><li>740adc53 - 88 js using showFeedbackMessage</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/96/diffs?diff_id=42358570&start_sha=64357c250877bd2f72a022de427ade3fbd27c8c2)
arefiev1997 commented 5 years ago (Migrated from gitlab.com)

added 1 commit

  • 3da37432 - 88 replacing all alerts in users.js

Compare with previous version

added 1 commit <ul><li>3da37432 - 88 replacing all alerts in users.js</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/96/diffs?diff_id=42372861&start_sha=740adc5318c639f76338e3a2d164f261e3c9893b)
romanov73 commented 5 years ago (Migrated from gitlab.com)

resolved all discussions

resolved all discussions
romanov73 commented 5 years ago (Migrated from gitlab.com)

mentioned in commit 3dbf635fb6

mentioned in commit 3dbf635fb67ec2e7f54c7d7211fcace48f1980e2
romanov73 commented 5 years ago (Migrated from gitlab.com)

merged

merged
The pull request has been merged as 3dbf635fb6.
You can also view command line instructions.

Step 1:

From your project repository, check out a new branch and test the changes.
git checkout -b 88-change-password dev
git pull origin 88-change-password

Step 2:

Merge the changes and update on Gitea.
git checkout dev
git merge --no-ff 88-change-password
git push origin dev
Sign in to join this conversation.
Reviewers
Request review
No reviewers
Labels
Apply labels
Clear labels   
backend
   
bug
   
frontend
   
выполнить первой
   
выполняется
   
конференции
   
события
   
статьи
No Label
backend
bug
frontend
выполнить первой
выполняется
конференции
события
статьи
Milestone
Set milestone
Clear milestone
No items
No Milestone
Личный кабинет
Projects
Set Project
Clear projects
No project
Assignees
Assign users
Clear assignees
No Assignees
1 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: romanov73/ng-tracker#223
Write Preview
Loading…
Cancel
Save
There is no content yet.
Delete Branch '88-change-password'

Deleting a branch is permanent. It CANNOT be undone. Continue?

No
Yes