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 |
|
Alyona
|
5af8cb1bd3
|
fix
|
2018-10-28 00:33:00 +04:00 |
|
Alyona
|
b3f8b334ef
|
fix
|
2018-10-28 00:26:09 +04:00 |
|
Alyona
|
d1e6e80f87
|
fix
|
2018-10-28 00:17:16 +04:00 |
|
Alyona
|
450cb92d01
|
fix
|
2018-10-28 00:15:42 +04:00 |
|
Alyona
|
d0f40da30e
|
fix
|
2018-10-27 23:50:12 +04:00 |
|
Alyona
|
92f86e70c9
|
fix
|
2018-10-27 23:46:49 +04:00 |
|
Anton Romanov
|
afd854e0cb
|
- make scheduler as a service
- reformat code
- fix cyrillic letter
|
2018-10-27 23:25:27 +04:00 |
|
Anton Romanov
|
7388b2cb27
|
add database column
|
2018-10-27 23:16:14 +04:00 |
|
Alyona
|
7f54394b44
|
class for send messages about update paper
|
2018-10-27 23:11:07 +04:00 |
|
Alyona
|
61c19e5b87
|
add deadlineSсheduler
|
2018-10-27 22:32:51 +04:00 |
|
Alyona
|
43740981f2
|
add deadlineDate to models
|
2018-10-27 22:24:10 +04:00 |
|
Anton Romanov
|
5e7cff8ac6
|
some fix
|
2018-10-25 10:27:57 +04:00 |
|
Anton Romanov
|
ed2554216d
|
Merge branch '8-' into 'master'
Resolve "Добавить дедлайны"
Closes #8
See merge request romanov73/ng-tracker!8
|
2018-10-25 04:59:51 +00:00 |
|
Alyona
|
75c33bb065
|
finish deadline
|
2018-10-25 08:53:48 +04:00 |
|
Alyona
|
4f49e7ae32
|
finish deadline
|
2018-10-25 08:53:29 +04:00 |
|
Alyona
|
92b807f6b9
|
Merge branch 'master' into 8-Deadline
|
2018-10-25 08:44:25 +04:00 |
|
Alyona
|
cd6b82f892
|
partially add deadline
|
2018-10-25 08:41:37 +04:00 |
|
Anton Romanov
|
5c0de4bcf4
|
Merge branch '7-dates-Matveeva' into 'master'
Resolve "Отображать даты создания и изменения статей"
Closes #7
See merge request romanov73/ng-tracker!10
|
2018-10-18 07:25:58 +00:00 |
|
Anton Romanov
|
275348563d
|
use html5 datetime pickers
|
2018-10-18 11:21:26 +04:00 |
|
Elena
|
29f836fcc8
|
Задача №7
|
2018-10-18 10:38:04 +04:00 |
|
Anton Romanov
|
f9c977177a
|
Merge branch '6-authors-list-Matveeva' into 'master'
Resolve "Список авторов для статьи"
Closes #6
See merge request romanov73/ng-tracker!9
|
2018-10-18 04:49:10 +00:00 |
|
Anton Romanov
|
76666912d7
|
fix buttons size
|
2018-10-11 19:49:16 +04:00 |
|
Anton Romanov
|
47e906fddc
|
fix styles
|
2018-10-11 15:39:57 +04:00 |
|
Anton Romanov
|
e163529d66
|
load paper statuses
|
2018-10-11 10:03:44 +04:00 |
|
Anton Romanov
|
2464915b62
|
fix progress background
|
2018-10-11 09:05:41 +04:00 |
|