Labels Milestones

Resolve "Форма добавления и фильтра участников гранта" #171

Merged

tatyana_belousova merged 1 commits from 42--2 into dev 5 years ago

Conversation 24 Commits 1 Files Changed 1

tatyana_belousova commented 5 years ago (Migrated from gitlab.com)

Closes #42

Closes #42

tatyana_belousova commented 5 years ago (Migrated from gitlab.com)

changed milestone to %4

changed milestone to %4

tatyana_belousova commented 5 years ago (Migrated from gitlab.com)

added 1 commit

• 74658031 - #42 add columns 'birth_date'&'degree' to User

Compare with previous version

added 1 commit <ul><li>74658031 - #42 add columns &#39;birth_date&#39;&amp;&#39;degree&#39; to User</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/44/diffs?diff_id=38600665&start_sha=99a8550696c6c8dd627db26c59109a9762718645)

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

birth date лучше с типом date

birth date лучше с типом date

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

Эти аннотации не нужны, Odin на страницах не используем

Эти аннотации не нужны, Odin на страницах не используем

tatyana_belousova commented 5 years ago (Migrated from gitlab.com)

changed this line in version 3 of the diff

changed this line in [version 3 of the diff](https://gitlab.com/romanov73/ng-tracker/merge_requests/44/diffs?diff_id=38963197&start_sha=7465803162b6ecad6771c5ef60122f9c4abedb07#cc637cbd2a42a0f44ee7bdd62882852e632d0323_90_88)

tatyana_belousova commented 5 years ago (Migrated from gitlab.com)

changed this line in version 3 of the diff

changed this line in [version 3 of the diff](https://gitlab.com/romanov73/ng-tracker/merge_requests/44/diffs?diff_id=38963197&start_sha=7465803162b6ecad6771c5ef60122f9c4abedb07#8b3eebcb67ebbadc25a10e019c42476baf345d6c_73_74)

tatyana_belousova commented 5 years ago (Migrated from gitlab.com)

added 3 commits

• e2e10477 - #42 delete GrantStatusDto
• 51c755ac - #42 method hasErrors didn't work, return to the previous state
• e8461e26 - #42 fix birthDate and degree to User

Compare with previous version

added 3 commits <ul><li>e2e10477 - #42 delete GrantStatusDto</li><li>51c755ac - #42 method hasErrors didn&#39;t work, return to the previous state</li><li>e8461e26 - #42 fix birthDate and degree to User</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/44/diffs?diff_id=38963197&start_sha=7465803162b6ecad6771c5ef60122f9c4abedb07)

tatyana_belousova commented 5 years ago (Migrated from gitlab.com)

added 2 commits

• f7d766f0 - #42 rename birth_date column
• bd351311 - #42 this don't work

Compare with previous version

added 2 commits <ul><li>f7d766f0 - #42 rename birth_date column</li><li>bd351311 - #42 this don&#39;t work</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/44/diffs?diff_id=39170433&start_sha=e8461e26eb4554189e27ca9f48803eedae6711d3)

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

added 1 commit

• cafb3abc - #4--2 merge with dev

Compare with previous version

added 1 commit <ul><li>cafb3abc - #4--2 merge with dev</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/44/diffs?diff_id=39173530&start_sha=bd3513118c3804fad2fb7cbea0045e6104c1c5c6)

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

added 35 commits

• cafb3abc...d1813f65 - 34 commits from branch dev
• 4955e9a6 - #4--2 merge with dev

Compare with previous version

added 35 commits <ul><li>cafb3abc...d1813f65 - 34 commits from branch <code>dev</code></li><li>4955e9a6 - #4--2 merge with dev</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/44/diffs?diff_id=39173675&start_sha=cafb3abcee2255bb97c2b5270abc4642b9d940d0)

tatyana_belousova commented 5 years ago (Migrated from gitlab.com)

added 1 commit

• 1756f295 - #42 filter authors by leader and degree

Compare with previous version

added 1 commit <ul><li>1756f295 - #42 filter authors by leader and degree</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/44/diffs?diff_id=39318071&start_sha=4955e9a637e1afc1d9f9e7f131b2f447f83c2428)

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

added 1 commit

• 8b2a559d - #42 fix thymeleaf expressions

Compare with previous version

added 1 commit <ul><li>8b2a559d - #42 fix thymeleaf expressions</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/44/diffs?diff_id=39333084&start_sha=1756f29505810ea8c65bd9ff41d7ae705f1f78da)

tatyana_belousova commented 5 years ago (Migrated from gitlab.com)

added 1 commit

• 1e6b3cba - #42 delete blank lines, fix js, fix leaderId validation

Compare with previous version

added 1 commit <ul><li>1e6b3cba - #42 delete blank lines, fix js, fix leaderId validation</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/44/diffs?diff_id=39629963&start_sha=8b2a559d37452070792e049844fd32beac257f1e)

tatyana_belousova commented 5 years ago (Migrated from gitlab.com)

added 26 commits

• 1e6b3cba...7491d7e9 - 25 commits from branch dev
• 97d7d000 - #42 merge with dev

Compare with previous version

added 26 commits <ul><li>1e6b3cba...7491d7e9 - 25 commits from branch <code>dev</code></li><li>97d7d000 - #42 merge with dev</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/44/diffs?diff_id=39630526&start_sha=1e6b3cba3acc74c7777e27ef43f4cfe2e5509c12)

tatyana_belousova commented 5 years ago (Migrated from gitlab.com)

added 1 commit

• 506fa01f - Revert: #42 merge with dev

Compare with previous version

added 1 commit <ul><li>506fa01f - Revert: #42 merge with dev</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/44/diffs?diff_id=39631825&start_sha=97d7d00098ced96b7e9784d27b264193d7029def)

tatyana_belousova commented 5 years ago (Migrated from gitlab.com)

resolved all discussions

resolved all discussions

tatyana_belousova commented 5 years ago (Migrated from gitlab.com)

resolved all discussions

resolved all discussions

tatyana_belousova commented 5 years ago (Migrated from gitlab.com)

added 1 commit

• e2842982 - #42 rename variables

Compare with previous version

added 1 commit <ul><li>e2842982 - #42 rename variables</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/44/diffs?diff_id=39735962&start_sha=506fa01fabb266d645e5389f2dcdbb81e2a30de4)

tatyana_belousova commented 5 years ago (Migrated from gitlab.com)

assigned to @romanov73

assigned to @romanov73

tatyana_belousova commented 5 years ago (Migrated from gitlab.com)

unmarked as a Work In Progress

unmarked as a **Work In Progress**

tatyana_belousova commented 5 years ago (Migrated from gitlab.com)

added 20 commits

• e2842982...8474fb49 - 19 commits from branch dev
• 416ad7ee - #42 merge with dev

Compare with previous version

added 20 commits <ul><li>e2842982...8474fb49 - 19 commits from branch <code>dev</code></li><li>416ad7ee - #42 merge with dev</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/44/diffs?diff_id=39807159&start_sha=e2842982005f2cf05ce62d9199c78a220df0d20b)

tatyana_belousova commented 5 years ago (Migrated from gitlab.com)

added 1 commit

• 958a0d46 - #42 merge with dev

Compare with previous version

added 1 commit <ul><li>958a0d46 - #42 merge with dev</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/44/diffs?diff_id=39807183&start_sha=416ad7eeda5b9e4191cefc1bd46edb417bb9dadf)

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

mentioned in commit 5a55e3cfc8

mentioned in commit 5a55e3cfc84bab43bd99c08082a872fd739d9813

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

merged

merged

The pull request has been merged as 5a55e3cfc8.

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 42--2 dev

git pull origin 42--2

Step 2:

Merge the changes and update on Gitea.

git checkout dev

git merge --no-ff 42--2

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

Subscribe

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#171

Write Preview

Loading…

Cancel

Save

There is no content yet.