Labels Milestones

Resolve "Добавление новой конференции" #170

Merged

VladimirZarayskiy merged 1 commits from 55-new-conf into dev 5 years ago

Conversation 30 Commits 1 Files Changed 6

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

Closes #55, #63, #67

Closes #55, #63, #67

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

changed milestone to %5

changed milestone to %5

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

added 1 commit

• be2dd291 - #55 added conference model without user's participation and deposit. May be needed new user model.

Compare with previous version

added 1 commit <ul><li>be2dd291 - #55 added conference model without user&#39;s participation and deposit. May be needed new user model.</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/43/diffs?diff_id=38414444&start_sha=4104aa04cd99a48eaaa60d38fa7136d095e15407)

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

added 1 commit

• dc12a671 - #55 added setters/getters

Compare with previous version

added 1 commit <ul><li>dc12a671 - #55 added setters/getters</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/43/diffs?diff_id=38414811&start_sha=be2dd291f69111144da7a1a32ffcc6f4db1e60ec)

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

added 1 commit

• e3bbade4 - #55 added ConferenceDto

Compare with previous version

added 1 commit <ul><li>e3bbade4 - #55 added ConferenceDto</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/43/diffs?diff_id=38453927&start_sha=dc12a671d247e0a9f820f21f7410624368534eaa)

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

added 1 commit

• d189891e - #55 added ConferenceFilterDto

Compare with previous version

added 1 commit <ul><li>d189891e - #55 added ConferenceFilterDto</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/43/diffs?diff_id=38455346&start_sha=e3bbade40bb1552277e19130a526df5c9ad68cdc)

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

added 1 commit

• 2d04b1b4 - #55 added findAll method in ConferenceService

Compare with previous version

added 1 commit <ul><li>2d04b1b4 - #55 added findAll method in ConferenceService</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/43/diffs?diff_id=38457417&start_sha=d189891e8c01622bae211331918575a92819e799)

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

added 1 commit

• 9d69f755 - #55 fixes

Compare with previous version

added 1 commit <ul><li>9d69f755 - #55 fixes</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/43/diffs?diff_id=38479291&start_sha=2d04b1b43ac89fdd22f41744b78e617c02b8f18f)

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

added 1 commit

• d6b7fe79 - #55 added transition to the page new conference

Compare with previous version

added 1 commit <ul><li>d6b7fe79 - #55 added transition to the page new conference</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/43/diffs?diff_id=38541574&start_sha=9d69f75530618750de2db7a38aa8c91c00e783ec)

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

added 1 commit

• 67bfad22 - #55 added create and update methods

Compare with previous version

added 1 commit <ul><li>67bfad22 - #55 added create and update methods</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/43/diffs?diff_id=38564006&start_sha=d6b7fe790a46be285659f2066f5a71eac208d104)

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

added 1 commit

• eb524d49 - #55 added html side, don't work, because can't parse date, like in deadlines

Compare with previous version

added 1 commit <ul><li>eb524d49 - #55 added html side, don&#39;t work, because can&#39;t parse date, like in deadlines</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/43/diffs?diff_id=38575926&start_sha=67bfad22f9c8183f8873f95fa88197042ee581eb)

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

added 1 commit

• 926cd020 - #55 fixed adding to DB

Compare with previous version

added 1 commit <ul><li>926cd020 - #55 fixed adding to DB</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/43/diffs?diff_id=38621851&start_sha=eb524d49d055dc436f47803f6dcacf6a7975ba96)

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

added 1 commit

• 3e5aeaf2 - #55 fast fixes

Compare with previous version

added 1 commit <ul><li>3e5aeaf2 - #55 fast fixes</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/43/diffs?diff_id=38631439&start_sha=926cd02096ebb358765be277e677189b057f3abf)

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

Пока что отсутствуют проверки на пустые поля, прикрепление и добавление статей, принятие участия пользователей. Будут реализованы в дальнейших задачах.

Пока что отсутствуют проверки на пустые поля, прикрепление и добавление статей, принятие участия пользователей. Будут реализованы в дальнейших задачах.

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

assigned to @romanov73

assigned to @romanov73

VladimirZarayskiy 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)

Посмотрите, как здесь в контроллере реализована навигация

Посмотрите, как [здесь](https://gitlab.com/romanov73/ng-tracker/merge_requests/32/diffs) в контроллере реализована навигация

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

чтобы NPE не было лучше тоже сразу проинициализировать

чтобы NPE не было лучше тоже сразу проинициализировать

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

changed this line in version 12 of the diff

changed this line in [version 12 of the diff](https://gitlab.com/romanov73/ng-tracker/merge_requests/43/diffs?diff_id=38657581&start_sha=3e5aeaf29062aadc44b68aba3b8d477e09c8673a#ffd2d92a659641c319b215743e9f95cb233117c3_54_59)

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

added 1 commit

• db43da9e - #55 added nav controller

Compare with previous version

added 1 commit <ul><li>db43da9e - #55 added nav controller</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/43/diffs?diff_id=38657581&start_sha=3e5aeaf29062aadc44b68aba3b8d477e09c8673a)

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

changed this line in version 13 of the diff

changed this line in [version 13 of the diff](https://gitlab.com/romanov73/ng-tracker/merge_requests/43/diffs?diff_id=38657640&start_sha=db43da9ec0e4b5806f65052cbaf2e6221f62b39a#8c90213033806f97fa5bf9fe705ddd1cc8a7c690_40_41)

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

added 1 commit

• c49b5691 - #55 added initialization of fields in ConferenceDto

Compare with previous version

added 1 commit <ul><li>c49b5691 - #55 added initialization of fields in ConferenceDto</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/43/diffs?diff_id=38657640&start_sha=db43da9ec0e4b5806f65052cbaf2e6221f62b39a)

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

Добавлен NavigationController, изменены строчки с редиректами

Добавлен NavigationController, изменены строчки с редиректами

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

в классе ConferenceDto инициализированы все поля

в классе ConferenceDto инициализированы все поля

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

added 1 commit

• e350f8b3 - #55 refactor controller navigation, fix conference edit url

Compare with previous version

added 1 commit <ul><li>e350f8b3 - #55 refactor controller navigation, fix conference edit url</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/43/diffs?diff_id=38696225&start_sha=c49b56916c14ac493440522767d49d04e49fb677)

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 e350f8b3c1 succeeds

enabled an automatic merge when the pipeline for e350f8b3c161ca4f23445100b6b2a333e726d808 succeeds

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

mentioned in commit 7dca991c2f

mentioned in commit 7dca991c2f0b768413f5b134ea0064431c062b94

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

merged

merged

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

changed the description

changed the description

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

changed the description

changed the description

The pull request has been merged as 7dca991c2f.

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 55-new-conf dev

git pull origin 55-new-conf

Step 2:

Merge the changes and update on Gitea.

git checkout dev

git merge --no-ff 55-new-conf

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

Write Preview

Loading…

Cancel

Save

There is no content yet.