Anton Romanov
|
06864c7ec8
|
read dashboard
|
2018-11-14 15:15:23 +04:00 |
|
Alyona
|
02f762b4f1
|
filter
|
2018-11-14 08:55:46 +04:00 |
|
Anton Romanov
|
eaf03daba3
|
Merge branch '14-DB-filter' into 'master'
Resolve "Метод чтения из БД для фильтра статей"
See merge request romanov73/ng-tracker!19
|
2018-11-13 11:46:25 +00:00 |
|
Anton Romanov
|
2a76acc7ad
|
filter papers
|
2018-11-13 15:41:18 +04:00 |
|
Anton Romanov
|
4c0ccbe285
|
Merge remote-tracking branch 'origin/master'
|
2018-11-11 14:28:51 +04:00 |
|
Anton Romanov
|
9380b74f67
|
move class
|
2018-11-11 12:43:27 +04:00 |
|
Anton Romanov
|
600d58d416
|
Merge branch '20-' into 'master'
Resolve "Реализовать периодические события"
Closes #20
See merge request romanov73/ng-tracker!15
|
2018-11-10 21:44:36 +00:00 |
|
Anton Romanov
|
190591c031
|
fix scheduler
|
2018-11-11 01:31:27 +04:00 |
|
Anton Romanov
|
f0ac06c900
|
refactor and db changes
|
2018-11-11 01:29:06 +04:00 |
|
Anton Romanov
|
7cffbef9e2
|
delete paper
|
2018-11-10 23:15:35 +04:00 |
|
T-Midnight
|
4da039f9b0
|
Create dashboard for grants
|
2018-11-10 21:55:09 +04:00 |
|
Anton Romanov
|
e3b248778c
|
add route
|
2018-11-10 21:43:52 +04:00 |
|
Alyona
|
376c820b44
|
fix
|
2018-11-10 20:28:17 +04:00 |
|
Alyona
|
e76e7ad864
|
fix
|
2018-11-09 15:43:42 +04:00 |
|
Elena
|
2db572f284
|
Задача №10
|
2018-11-09 15:43:25 +04:00 |
|
Anton Romanov
|
d5f9a81b46
|
remove styles from email template
|
2018-11-09 15:37:58 +04:00 |
|
Alyona
|
7efb9a2926
|
Merge remote-tracking branch 'origin/master'
|
2018-11-09 15:29:48 +04:00 |
|
Anton Romanov
|
6aa5f807b7
|
move styles to body
|
2018-11-09 15:21:03 +04:00 |
|
Anton Romanov
|
f5e80d7e3c
|
Merge branch '21-Event-status' into 'master'
Resolve "Добавить статус события"
Closes #21
See merge request romanov73/ng-tracker!14
|
2018-11-09 11:15:00 +00:00 |
|
Anton Romanov
|
1b53debc88
|
Merge branch 'master' into 21-Event-status
# Conflicts:
# src/main/resources/db/changelog-master.xml
|
2018-11-09 15:08:10 +04:00 |
|
Anton Romanov
|
5c54817fc6
|
fix styles
|
2018-11-09 15:05:39 +04:00 |
|
Anton Romanov
|
1211b0db29
|
add styles in email templates
|
2018-11-09 14:53:24 +04:00 |
|
Alyona
|
392b2a9657
|
added period event
|
2018-11-09 14:51:19 +04:00 |
|
Alyona
|
25707db6cd
|
added period event
|
2018-11-09 14:48:21 +04:00 |
|
Elena
|
0f9bbc13cc
|
Merge branch 'master' into 10-savePaper
|
2018-11-09 13:43:08 +04:00 |
|
Elena
|
65d788512b
|
Задача №10
|
2018-11-09 13:42:28 +04:00 |
|
Alyona
|
f449eeb999
|
Merge remote-tracking branch 'origin/master'
|
2018-11-09 13:30:31 +04:00 |
|
Anton Romanov
|
67881262be
|
add notification templates
|
2018-11-09 10:04:50 +04:00 |
|
Anton Romanov
|
2bf84dc286
|
move to notification service
|
2018-11-09 09:16:24 +04:00 |
|
Anton Romanov
|
34d7927d30
|
fix scheduler code to use service
|
2018-11-09 08:39:00 +04:00 |
|
Anton Romanov
|
cd09cf6d60
|
add toolbar
|
2018-11-08 21:58:10 +04:00 |
|
Anton Romanov
|
e554f9ea4c
|
fix paths
|
2018-11-08 20:34:09 +04:00 |
|
Anton Romanov
|
4c43776528
|
add config parameter
|
2018-11-08 20:08:26 +04:00 |
|
Anton Romanov
|
1958e01d01
|
Merge remote-tracking branch 'origin/master'
|
2018-11-08 19:39:22 +04:00 |
|
Anton Romanov
|
bd78be93ab
|
add paper create strategy
|
2018-11-08 19:36:50 +04:00 |
|
Anton Romanov
|
6c492fa955
|
Update README.md
|
2018-11-06 10:39:25 +00:00 |
|
Anton Romanov
|
def4f97784
|
fix ci
|
2018-11-06 14:10:00 +04:00 |
|
Anton Romanov
|
42fb1a1537
|
fix imports
|
2018-11-01 12:53:19 +04:00 |
|
Alyona
|
8fe9f6625c
|
changelog
|
2018-10-31 20:06:27 +04:00 |
|
Alyona
|
0b2824cee6
|
Merge branch 'master' into 21-Event-status
|
2018-10-31 19:35:23 +04:00 |
|
Alyona
|
0341a823d2
|
Merge branch 'master' of C:\Users\катя\IdeaProjects\ng-tracker with conflicts.
|
2018-10-31 19:33:21 +04:00 |
|
Alyona
|
92d3067dd3
|
added event status
|
2018-10-30 23:59:42 +04:00 |
|
Anton Romanov
|
9013baa209
|
Merge branch '4-show-time-line' into 'master'
Resolve "Список периодических событий"
Closes #4
See merge request romanov73/ng-tracker!2
|
2018-10-30 19:32:00 +00:00 |
|
Anton Romanov
|
d721907c24
|
Merge branch 'master' into 4-show-time-line
# Conflicts:
# src/main/resources/db/changelog-master.xml
|
2018-10-30 23:29:18 +04:00 |
|
Anton Romanov
|
02499c0aae
|
fix db
|
2018-10-30 23:26:55 +04:00 |
|
Anton Romanov
|
128b147bf2
|
Revert "remove liquibase"
This reverts commit 43917c0
|
2018-10-30 23:07:01 +04:00 |
|
Anton Romanov
|
679756b02b
|
Merge remote-tracking branch 'origin/4-show-time-line' into 4-show-time-line
|
2018-10-30 23:04:49 +04:00 |
|
Anton Romanov
|
4e7c0259d4
|
Revert "remove liquibase"
This reverts commit 43917c0
|
2018-10-30 23:04:21 +04:00 |
|
Anton Romanov
|
5766bdadbc
|
Merge branch '11-Message-about-deadlines' into 'master'
Resolve "Реализовать уведомления о дедлайне статьи"
Closes #11
See merge request romanov73/ng-tracker!12
|
2018-10-27 21:00:43 +00:00 |
|
Anton Romanov
|
40c668905f
|
Merge branch '12-' into 'master'
Resolve "Реализовать уведомление о смене статуса статьи"
Closes #12
See merge request romanov73/ng-tracker!13
|
2018-10-27 21:00:01 +00:00 |
|