Alyona
|
7efb9a2926
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
Anton Romanov
|
6aa5f807b7
|
move styles to body
|
6 years ago |
|
Anton Romanov
|
f5e80d7e3c
|
Merge branch '21-Event-status' into 'master'
Resolve "Добавить статус события"
Closes #21
See merge request romanov73/ng-tracker!14
|
6 years ago |
|
Anton Romanov
|
1b53debc88
|
Merge branch 'master' into 21-Event-status
# Conflicts:
# src/main/resources/db/changelog-master.xml
|
6 years ago |
|
Anton Romanov
|
5c54817fc6
|
fix styles
|
6 years ago |
|
Anton Romanov
|
1211b0db29
|
add styles in email templates
|
6 years ago |
|
Alyona
|
392b2a9657
|
added period event
|
6 years ago |
|
Alyona
|
25707db6cd
|
added period event
|
6 years ago |
Elena
|
0f9bbc13cc
|
Merge branch 'master' into 10-savePaper
|
6 years ago |
|
Elena
|
65d788512b
|
Задача №10
|
6 years ago |
|
Alyona
|
f449eeb999
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
|
Anton Romanov
|
67881262be
|
add notification templates
|
6 years ago |
|
Anton Romanov
|
2bf84dc286
|
move to notification service
|
6 years ago |
|
Anton Romanov
|
34d7927d30
|
fix scheduler code to use service
|
6 years ago |
|
Anton Romanov
|
cd09cf6d60
|
add toolbar
|
6 years ago |
|
Anton Romanov
|
e554f9ea4c
|
fix paths
|
6 years ago |
|
Anton Romanov
|
4c43776528
|
add config parameter
|
6 years ago |
|
Anton Romanov
|
1958e01d01
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
|
Anton Romanov
|
bd78be93ab
|
add paper create strategy
|
6 years ago |
|
Anton Romanov
|
6c492fa955
|
Update README.md
|
6 years ago |
|
Anton Romanov
|
def4f97784
|
fix ci
|
6 years ago |
|
Anton Romanov
|
42fb1a1537
|
fix imports
|
6 years ago |
|
Alyona
|
8fe9f6625c
|
changelog
|
6 years ago |
|
Alyona
|
0b2824cee6
|
Merge branch 'master' into 21-Event-status
|
6 years ago |
|
Alyona
|
0341a823d2
|
Merge branch 'master' of C:\Users\катя\IdeaProjects\ng-tracker with conflicts.
|
6 years ago |
|
Alyona
|
92d3067dd3
|
added event status
|
6 years ago |
|
Anton Romanov
|
9013baa209
|
Merge branch '4-show-time-line' into 'master'
Resolve "Список периодических событий"
Closes #4
See merge request romanov73/ng-tracker!2
|
6 years ago |
|
Anton Romanov
|
d721907c24
|
Merge branch 'master' into 4-show-time-line
# Conflicts:
# src/main/resources/db/changelog-master.xml
|
6 years ago |
|
Anton Romanov
|
02499c0aae
|
fix db
|
6 years ago |
|
Anton Romanov
|
128b147bf2
|
Revert "remove liquibase"
This reverts commit 43917c0
|
6 years ago |
|
Anton Romanov
|
679756b02b
|
Merge remote-tracking branch 'origin/4-show-time-line' into 4-show-time-line
|
6 years ago |
|
Anton Romanov
|
4e7c0259d4
|
Revert "remove liquibase"
This reverts commit 43917c0
|
6 years ago |
|
Anton Romanov
|
5766bdadbc
|
Merge branch '11-Message-about-deadlines' into 'master'
Resolve "Реализовать уведомления о дедлайне статьи"
Closes #11
See merge request romanov73/ng-tracker!12
|
6 years ago |
|
Anton Romanov
|
40c668905f
|
Merge branch '12-' into 'master'
Resolve "Реализовать уведомление о смене статуса статьи"
Closes #12
See merge request romanov73/ng-tracker!13
|
6 years ago |
|
Alyona
|
5af8cb1bd3
|
fix
|
6 years ago |
|
Alyona
|
b3f8b334ef
|
fix
|
6 years ago |
|
Alyona
|
d1e6e80f87
|
fix
|
6 years ago |
|
Alyona
|
450cb92d01
|
fix
|
6 years ago |
|
Alyona
|
d0f40da30e
|
fix
|
6 years ago |
|
Alyona
|
92f86e70c9
|
fix
|
6 years ago |
|
Anton Romanov
|
afd854e0cb
|
- make scheduler as a service
- reformat code
- fix cyrillic letter
|
6 years ago |
|
Anton Romanov
|
7388b2cb27
|
add database column
|
6 years ago |
|
Alyona
|
7f54394b44
|
class for send messages about update paper
|
6 years ago |
|
Alyona
|
61c19e5b87
|
add deadlineSсheduler
|
6 years ago |
|
Alyona
|
43740981f2
|
add deadlineDate to models
|
6 years ago |
|
Anton Romanov
|
5e7cff8ac6
|
some fix
|
6 years ago |
|
Anton Romanov
|
ed2554216d
|
Merge branch '8-' into 'master'
Resolve "Добавить дедлайны"
Closes #8
See merge request romanov73/ng-tracker!8
|
6 years ago |
|
Alyona
|
75c33bb065
|
finish deadline
|
6 years ago |
|
Alyona
|
4f49e7ae32
|
finish deadline
|
6 years ago |
|
Alyona
|
92b807f6b9
|
Merge branch 'master' into 8-Deadline
|
6 years ago |