Labels Milestones

Resolve "Оповещения о дедлайнах конференции" #203

Merged

VladimirZarayskiy merged 1 commits from 70-notification-conf into dev 5 years ago

Conversation 25 Commits 1 Files Changed 1

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

Closes #70

Closes #70

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

• c489ebbf - #70 added create notification for all users about new conference

Compare with previous version

added 1 commit <ul><li>c489ebbf - #70 added create notification for all users about new conference</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/76/diffs?diff_id=40364640&start_sha=88ec35faa0a241d9fde3278ce2fe835f8eb7b38f)

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

added 1 commit

• 16e9bf1f - #70 added update notification for all participants

Compare with previous version

added 1 commit <ul><li>16e9bf1f - #70 added update notification for all participants</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/76/diffs?diff_id=40377810&start_sha=c489ebbf9149da82f7ab1364b52c883131c02c24)

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

added 1 commit

• 34925b81 - #70 added schedule for deadline of conference

Compare with previous version

added 1 commit <ul><li>34925b81 - #70 added schedule for deadline of conference</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/76/diffs?diff_id=40392309&start_sha=16e9bf1fb56c092e6a57fc7afa45306f18a6f406)

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

added 1 commit

• 51877023 - #70 added new column to event

Compare with previous version

added 1 commit <ul><li>51877023 - #70 added new column to event</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/76/diffs?diff_id=40455756&start_sha=34925b81ffc1fc03cbfa7ca5c798921483447b7d)

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

added 1 commit

• dbcdb96d - #70 added event method, don't work, because trying to find null entity

Compare with previous version

added 1 commit <ul><li>dbcdb96d - #70 added event method, don&#39;t work, because trying to find null entity</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/76/diffs?diff_id=40485568&start_sha=51877023d122a5ea98198ce254ef57af5d4f245f)

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

added 1 commit

• e178cd16 - #70 added checking empty fields of deadline, fix bug on EventDto

Compare with previous version

added 1 commit <ul><li>e178cd16 - #70 added checking empty fields of deadline, fix bug on EventDto</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/76/diffs?diff_id=40561250&start_sha=dbcdb96dbf066655ebe4ff30048a7c38321902cc)

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**

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

added 1 commit

• 0e8752e4 - #70 style fixes

Compare with previous version

added 1 commit <ul><li>0e8752e4 - #70 style fixes</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/76/diffs?diff_id=40574455&start_sha=e178cd163909119693001cf225a96dc8eee71bc3)

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

added 1 commit

• 9edcf353 - #70 added ping notification

Compare with previous version

added 1 commit <ul><li>9edcf353 - #70 added ping notification</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/76/diffs?diff_id=40727216&start_sha=0e8752e4607dbf4b2561668b8e657be57df37495)

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

added 1 commit

• 0e062f13 - #70 fast fix

Compare with previous version

added 1 commit <ul><li>0e062f13 - #70 fast fix</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/76/diffs?diff_id=40731364&start_sha=9edcf353389d453389dcc5e897564a822fb2cbb5)

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)

страшный метод, надо порефекторить: никаких флагов, они только запутывают, поля отдельно сравнивать не надо, есть переопределение equals

страшный метод, надо порефекторить: никаких флагов, они только запутывают, поля отдельно сравнивать не надо, есть переопределение equals

VladimirZarayskiy 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/76/diffs?diff_id=40927393&start_sha=0e062f133707716faa6843f73164f415adf8d34e#ffd2d92a659641c319b215743e9f95cb233117c3_81_77)

VladimirZarayskiy 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/76/diffs?diff_id=40927393&start_sha=0e062f133707716faa6843f73164f415adf8d34e#4507aa768a06337c46539c4bab2e3f780d6dc7b5_246_255)

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

added 1 commit

• 60bdd9d2 - #70 fixes

Compare with previous version

added 1 commit <ul><li>60bdd9d2 - #70 fixes</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/76/diffs?diff_id=40927393&start_sha=0e062f133707716faa6843f73164f415adf8d34e)

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

added 8 commits

• 60bdd9d2...a6f21771 - 7 commits from branch dev
• 6820c617 - #70 remove conflicts

Compare with previous version

added 8 commits <ul><li>60bdd9d2...a6f21771 - 7 commits from branch <code>dev</code></li><li>6820c617 - #70 remove conflicts</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/76/diffs?diff_id=40928010&start_sha=60bdd9d233292b7f778b271d10cfa95b1fb70ddf)

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

всё исправил

всё исправил

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

added 1 commit

• 6350e1c0 - #70 add hashCode for deadline

Compare with previous version

added 1 commit <ul><li>6350e1c0 - #70 add hashCode for deadline</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/76/diffs?diff_id=40929668&start_sha=6820c617f3b6bac7d70ae941b54b4c47258a0d17)

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 6eed8591b4

mentioned in commit 6eed8591b470634a84a6cea22838f4f144841e52

The pull request has been merged as 6eed8591b4.

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 70-notification-conf dev

git pull origin 70-notification-conf

Step 2:

Merge the changes and update on Gitea.

git checkout dev

git merge --no-ff 70-notification-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#203

Write Preview

Loading…

Cancel

Save

There is no content yet.