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

Labels Milestones

Resolve "Приглашение нового пользователя" #222

Merged
arefiev1997 merged 6 commits from 87-inviting-user into dev 5 years ago
Conversation 22 Commits 6 Files Changed 7
arefiev1997 commented 5 years ago (Migrated from gitlab.com)

Closes #87

Closes #87
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 4 commits

Compare with previous version

added 4 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></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/95/diffs?diff_id=42092260&start_sha=51851baa48157a5a67da3b172ae9ab2bd20d3b77)
arefiev1997 commented 5 years ago (Migrated from gitlab.com)

unmarked as a Work In Progress

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

assigned to @romanov73

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

added 2 commits

Compare with previous version

added 2 commits <ul><li>48a18a3a - 87 fixed imports</li><li>3226cc39 - 87 fixed UserControllerV2 logger</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/95/diffs?diff_id=42188977&start_sha=d88f67ce00a8e85d2ed8f90fa678979d8549cbcb)
arefiev1997 commented 5 years ago (Migrated from gitlab.com)

added 1 commit

  • d50673f5 - 87-inviting-user small fix in mail template, and changed default user name

Compare with previous version

added 1 commit <ul><li>d50673f5 - 87-inviting-user small fix in mail template, and changed default user name</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/95/diffs?diff_id=42198173&start_sha=3226cc3971bd7ab8d0c665ec6c9df67731372355)
romanov73 commented 5 years ago (Migrated from gitlab.com)

Контроллеры должны иметь осмысленные названия: UserRestController и UserMvcController (или просто UserController)

Контроллеры должны иметь осмысленные названия: `UserRestController` и `UserMvcController` (или просто `UserController`)
romanov73 commented 5 years ago (Migrated from gitlab.com)

Завел дефект #124

Завел дефект #124
romanov73 commented 5 years ago (Migrated from gitlab.com)

еще логина не хватает

еще логина не хватает
arefiev1997 commented 5 years ago (Migrated from gitlab.com)

changed this line in version 4 of the diff

changed this line in [version 4 of the diff](https://gitlab.com/romanov73/ng-tracker/merge_requests/95/diffs?diff_id=42323184&start_sha=d50673f5fa5eec40dea9e7dbb55c16c2d94b73a8#7302eb5841cd253beeb6283181f60a0d268c1877_32_0)
arefiev1997 commented 5 years ago (Migrated from gitlab.com)

added 1 commit

Compare with previous version

added 1 commit <ul><li>728fa429 - 87 error handling</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/95/diffs?diff_id=42323184&start_sha=d50673f5fa5eec40dea9e7dbb55c16c2d94b73a8)
arefiev1997 commented 5 years ago (Migrated from gitlab.com)

added 9 commits

  • ca3159a6 - Merge branch '87-inviting-user' into 88-change-password
  • f8f501b8 - 88-change-password base
  • 33f62c04 - Merge branch '87-inviting-user' into 88-change-password
  • c47d4f8a - #88 removed unused imports
  • 4fc8bc37 - Merge branch '87-inviting-user' into 88-change-password
  • 052e4a1a - 88 rest changePassword + ajax
  • fbd618a6 - 88 changed error text to russian
  • b9748905 - Merge branch '88-change-password' into 87-inviting-user
  • 6a62e61c - 87 error handling + ajax + rest

Compare with previous version

added 9 commits <ul><li>ca3159a6 - Merge branch &#39;87-inviting-user&#39; into 88-change-password</li><li>f8f501b8 - 88-change-password base</li><li>33f62c04 - Merge branch &#39;87-inviting-user&#39; into 88-change-password</li><li>c47d4f8a - #88 removed unused imports</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><li>b9748905 - Merge branch &#39;88-change-password&#39; into 87-inviting-user</li><li>6a62e61c - 87 error handling + ajax + rest</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/95/diffs?diff_id=42330900&start_sha=728fa4297278be50a17d55e2036d828cc940b27a)
arefiev1997 commented 5 years ago (Migrated from gitlab.com)

added 1 commit

Compare with previous version

added 1 commit <ul><li>76d3adb4 - 87 small fix whitespace</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/95/diffs?diff_id=42338941&start_sha=6a62e61caf9ad45a28f527fccd1fc02c66881879)
romanov73 commented 5 years ago (Migrated from gitlab.com)

в core.js есть нормальные нотификации

в core.js есть нормальные нотификации
arefiev1997 commented 5 years ago (Migrated from gitlab.com)

added 2 commits

Compare with previous version

added 2 commits <ul><li>7163937a - 87 using showFeedBackMessage</li><li>b8281c52 - 87 removed unused imports</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/95/diffs?diff_id=42358113&start_sha=76d3adb4649cb3de9fb0d378e74794d3d740d6e5)
romanov73 commented 5 years ago (Migrated from gitlab.com)

changed this line in version 8 of the diff

changed this line in version 8 of the diff
arefiev1997 commented 5 years ago (Migrated from gitlab.com)

changed this line in version 9 of the diff

changed this line in [version 9 of the diff](https://gitlab.com/romanov73/ng-tracker/merge_requests/95/diffs?diff_id=42375366&start_sha=b8281c527a858acaa75685a0a1644b167db65e82#a37a337e55014bed3b1298227fc87314add7b460_7_7)
arefiev1997 commented 5 years ago (Migrated from gitlab.com)

added 31 commits

  • b8281c52...3dbf635f - 30 commits from branch dev
  • 532e007b - 87 merged with dev

Compare with previous version

added 31 commits <ul><li>b8281c52...3dbf635f - 30 commits from branch <code>dev</code></li><li>532e007b - 87 merged with dev</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/95/diffs?diff_id=42375366&start_sha=b8281c527a858acaa75685a0a1644b167db65e82)
romanov73 commented 5 years ago (Migrated from gitlab.com)

resolved all discussions

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

enabled an automatic merge when the pipeline for 532e007b0b succeeds

enabled an automatic merge when the pipeline for 532e007b0b8067ef44e1437a9a6eb4eba85738e3 succeeds
romanov73 commented 5 years ago (Migrated from gitlab.com)

mentioned in commit 56f083e757

mentioned in commit 56f083e757b8cc14c00e10e469f520caeef85b8d
romanov73 commented 5 years ago (Migrated from gitlab.com)

merged

merged
The pull request has been merged as 56f083e757.
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 87-inviting-user dev
git pull origin 87-inviting-user

Step 2:

Merge the changes and update on Gitea.
git checkout dev
git merge --no-ff 87-inviting-user
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#222
Write Preview
Loading…
Cancel
Save
There is no content yet.
Delete Branch '87-inviting-user'

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

No
Yes