Labels Milestones

Resolve "Задачи проекта" #201

Merged

a.vasin merged 1 commits from 98-project-tasks into dev 5 years ago

Conversation 32 Commits 1 Files Changed 1

a.vasin commented 5 years ago (Migrated from gitlab.com)

Closes #98

Closes #98

a.vasin commented 5 years ago (Migrated from gitlab.com)

changed milestone to %3

changed milestone to %3

a.vasin commented 5 years ago (Migrated from gitlab.com)

added 54 commits

• 4dd0a6c2...2dff1836 - 53 commits from branch dev
• ee55e08f - #98 project tasks deadline edited

Compare with previous version

added 54 commits <ul><li>4dd0a6c2...2dff1836 - 53 commits from branch <code>dev</code></li><li>ee55e08f - #98 project tasks deadline edited</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/74/diffs?diff_id=41219836&start_sha=4dd0a6c2107f981b31ca49cf5b5167880022ed63)

a.vasin commented 5 years ago (Migrated from gitlab.com)

added 1 commit

• 4bab980f - #98 deadline model and service edited

Compare with previous version

added 1 commit <ul><li>4bab980f - #98 deadline model and service edited</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/74/diffs?diff_id=41241800&start_sha=ee55e08feee4ea20dfa52403996f0659cd42f1d8)

a.vasin commented 5 years ago (Migrated from gitlab.com)

added 1 commit

• 4025aa67 - #98 project completion added

Compare with previous version

added 1 commit <ul><li>4025aa67 - #98 project completion added</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/74/diffs?diff_id=41249809&start_sha=4bab980f624d8ac8ec24400aa544b2e5daeb48dd)

a.vasin commented 5 years ago (Migrated from gitlab.com)

added 10 commits

• 8fbce550 - #86 projects main page
• 92a0674b - Merge branch 'dev' of https://gitlab.com/romanov73/ng-tracker into dev
• 6469ddcd - Merge branch 'dev' of https://gitlab.com/romanov73/ng-tracker into dev
• 70920cc6 - Merge branch 'dev' of https://gitlab.com/romanov73/ng-tracker into dev
• 2d6de6b5 - Merge branch 'dev' of https://gitlab.com/romanov73/ng-tracker into dev
• b2d4d526 - Merge remote-tracking branch 'origin/dev' into dev
• 83f3f7d6 - Merge branch 'dev' of https://gitlab.com/romanov73/ng-tracker into dev
• 82ab40a6 - Merge branch 'dev' of https://gitlab.com/romanov73/ng-tracker into dev
• 52ae197f - Merge branch 'dev' into 98-project-tasks
• 241c489b - #98 deadline edited

Compare with previous version

added 10 commits <ul><li>8fbce550 - #86 projects main page</li><li>92a0674b - Merge branch &#39;dev&#39; of https://gitlab.com/romanov73/ng-tracker into dev</li><li>6469ddcd - Merge branch &#39;dev&#39; of https://gitlab.com/romanov73/ng-tracker into dev</li><li>70920cc6 - Merge branch &#39;dev&#39; of https://gitlab.com/romanov73/ng-tracker into dev</li><li>2d6de6b5 - Merge branch &#39;dev&#39; of https://gitlab.com/romanov73/ng-tracker into dev</li><li>b2d4d526 - Merge remote-tracking branch &#39;origin/dev&#39; into dev</li><li>83f3f7d6 - Merge branch &#39;dev&#39; of https://gitlab.com/romanov73/ng-tracker into dev</li><li>82ab40a6 - Merge branch &#39;dev&#39; of https://gitlab.com/romanov73/ng-tracker into dev</li><li>52ae197f - Merge branch &#39;dev&#39; into 98-project-tasks</li><li>241c489b - #98 deadline edited</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/74/diffs?diff_id=41250832&start_sha=4025aa67ca1720d75cdda18dcf4221868470f162)

a.vasin commented 5 years ago (Migrated from gitlab.com)

added 57 commits

• 241c489b...19a6b45c - 56 commits from branch dev
• 097f7827 - #98 db edited

Compare with previous version

added 57 commits <ul><li>241c489b...19a6b45c - 56 commits from branch <code>dev</code></li><li>097f7827 - #98 db edited</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/74/diffs?diff_id=42344121&start_sha=241c489b21a5fb5f1624aaccfbdd78eaa883b982)

a.vasin commented 5 years ago (Migrated from gitlab.com)

added 1 commit

• f960d4de - #98 deadline model edited

Compare with previous version

added 1 commit <ul><li>f960d4de - #98 deadline model edited</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/74/diffs?diff_id=42348312&start_sha=097f7827b0eded8a5c789a6369bafe9d169864c8)

a.vasin commented 5 years ago (Migrated from gitlab.com)

added 92 commits

• f960d4de...336a16ff - 88 commits from branch dev
• 50314246 - Merge branch 'dev' of https://gitlab.com/romanov73/ng-tracker into dev
• 4213524d - Merge branch 'dev' into 98-project-tasks
• 4eeb79ab - #98 changelog edited
• 4bb4fd6b - #98 changelog edited

Compare with previous version

added 92 commits <ul><li>f960d4de...336a16ff - 88 commits from branch <code>dev</code></li><li>50314246 - Merge branch &#39;dev&#39; of https://gitlab.com/romanov73/ng-tracker into dev</li><li>4213524d - Merge branch &#39;dev&#39; into 98-project-tasks</li><li>4eeb79ab - #98 changelog edited</li><li>4bb4fd6b - #98 changelog edited</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/74/diffs?diff_id=43219934&start_sha=f960d4de1b78cd9a8cd01ea43bdd6304fcc7d844)

a.vasin commented 5 years ago (Migrated from gitlab.com)

added 1 commit

• 7388e12e - #98 edited project executors

Compare with previous version

added 1 commit <ul><li>7388e12e - #98 edited project executors</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/74/diffs?diff_id=43276941&start_sha=4bb4fd6bca7b1c9bf6f7106e1d9d8636ceaad4bc)

a.vasin commented 5 years ago (Migrated from gitlab.com)

added 1 commit

• eb87c6d5 - #98 project statuses edited

Compare with previous version

added 1 commit <ul><li>eb87c6d5 - #98 project statuses edited</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/74/diffs?diff_id=43306567&start_sha=7388e12e3f5d50ab6278f99e96ff0d49046b9ea7)

a.vasin 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)

тут должен быть List<User> executors;

тут должен быть `List<User> executors;`

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

не говорящее сокращение, нужно понятнее называть переменные

не говорящее сокращение, нужно понятнее называть переменные

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

зачем здесь эти два поля?

зачем здесь эти два поля?

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

тут индекс в массиве и id перепутаны?

тут индекс в массиве и id перепутаны?

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

тут не нужна такая фильтрация

тут не нужна такая фильтрация

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

У поля должен быть тип integer и оно должно быть внешним ключом на users. А вообще здесь many-to-many, так что должна быть промежуточная таблица

У поля должен быть тип integer и оно должно быть внешним ключом на `users`. А вообще здесь many-to-many, так что должна быть промежуточная таблица

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

второй файл не обязательно создавать, пока открыт МР можно в один писать

второй файл не обязательно создавать, пока открыт МР можно в один писать

a.vasin commented 5 years ago (Migrated from gitlab.com)

marked as a Work In Progress

marked as a **Work In Progress**

a.vasin commented 5 years ago (Migrated from gitlab.com)

changed this line in version 10 of the diff

changed this line in [version 10 of the diff](https://gitlab.com/romanov73/ng-tracker/merge_requests/74/diffs?diff_id=43336387&start_sha=eb87c6d52ffb8de49290699056960c904fd93c2f#718742a7f97570341fe6298aac1f2a9f9a129eed_23_23)

a.vasin commented 5 years ago (Migrated from gitlab.com)

changed this line in version 10 of the diff

changed this line in [version 10 of the diff](https://gitlab.com/romanov73/ng-tracker/merge_requests/74/diffs?diff_id=43336387&start_sha=eb87c6d52ffb8de49290699056960c904fd93c2f#b83608172d1140157f6ddda487985c789674ba97_30_30)

a.vasin commented 5 years ago (Migrated from gitlab.com)

added 9 commits

• eb87c6d5...6258e7b6 - 7 commits from branch dev
• 8d1e410e - Merge branch 'dev' of gitlab.com:romanov73/ng-tracker into 98-project-tasks
• 3b0a2dd9 - #98 executors list added

Compare with previous version

added 9 commits <ul><li>eb87c6d5...6258e7b6 - 7 commits from branch <code>dev</code></li><li>8d1e410e - Merge branch &#39;dev&#39; of gitlab.com:romanov73/ng-tracker into 98-project-tasks</li><li>3b0a2dd9 - #98 executors list added</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/74/diffs?diff_id=43336387&start_sha=eb87c6d52ffb8de49290699056960c904fd93c2f)

a.vasin commented 5 years ago (Migrated from gitlab.com)

changed this line in version 11 of the diff

changed this line in [version 11 of the diff](https://gitlab.com/romanov73/ng-tracker/merge_requests/74/diffs?diff_id=43384087&start_sha=3b0a2dd964c60fc53c4ec9ac64fedcedb4dc7594#9c24b7c026cdf1ae6d4af55faca2e14dad649df5_34_34)

a.vasin commented 5 years ago (Migrated from gitlab.com)

changed this line in version 11 of the diff

changed this line in [version 11 of the diff](https://gitlab.com/romanov73/ng-tracker/merge_requests/74/diffs?diff_id=43384087&start_sha=3b0a2dd964c60fc53c4ec9ac64fedcedb4dc7594#c3f667bb9531a7f3568d24691d06fdb7f2d8c261_113_113)

a.vasin commented 5 years ago (Migrated from gitlab.com)

changed this line in version 11 of the diff

changed this line in [version 11 of the diff](https://gitlab.com/romanov73/ng-tracker/merge_requests/74/diffs?diff_id=43384087&start_sha=3b0a2dd964c60fc53c4ec9ac64fedcedb4dc7594#c3f667bb9531a7f3568d24691d06fdb7f2d8c261_124_124)

a.vasin commented 5 years ago (Migrated from gitlab.com)

added 1 commit

• c2539233 - #98 project deadlines edited

Compare with previous version

added 1 commit <ul><li>c2539233 - #98 project deadlines edited</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/74/diffs?diff_id=43384087&start_sha=3b0a2dd964c60fc53c4ec9ac64fedcedb4dc7594)

a.vasin commented 5 years ago (Migrated from gitlab.com)

added 3 commits

• 308da411 - 1 commit from branch dev
• e967e2bf - Merge branch 'dev' of https://gitlab.com/romanov73/ng-tracker into 98-project-tasks
• 8ffafd66 - #98 deadline imports edited

Compare with previous version

added 3 commits <ul><li>308da411 - 1 commit from branch <code>dev</code></li><li>e967e2bf - Merge branch &#39;dev&#39; of https://gitlab.com/romanov73/ng-tracker into 98-project-tasks</li><li>8ffafd66 - #98 deadline imports edited</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/74/diffs?diff_id=43388456&start_sha=c25392337a3ababebf34e4c3404f277ab945b184)

a.vasin commented 5 years ago (Migrated from gitlab.com)

added 1 commit

• 77ce908d - #98 deadline edited

Compare with previous version

added 1 commit <ul><li>77ce908d - #98 deadline edited</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/74/diffs?diff_id=43389601&start_sha=8ffafd669328c16d759e37d91fb04cfe32cb07ec)

a.vasin 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)

resolved all discussions

resolved all discussions

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

merged

merged

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

mentioned in commit 330ffc4df1

mentioned in commit 330ffc4df1393916906ed1a17f52551ff1ea6adf

The pull request has been merged as 330ffc4df1.

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 98-project-tasks dev

git pull origin 98-project-tasks

Step 2:

Merge the changes and update on Gitea.

git checkout dev

git merge --no-ff 98-project-tasks

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

Write Preview

Loading…

Cancel

Save

There is no content yet.