Elena
|
8fc6d3b569
|
задача 10(new)
|
2018-11-23 14:05:23 +04:00 |
|
Elena
|
51e84e22a6
|
задача 10
|
2018-11-23 13:53:20 +04:00 |
|
Elena
|
fe6e52a19c
|
Merge branch 'master' into 10-savePaper
|
2018-11-23 12:39:36 +04:00 |
|
Anton Romanov
|
e84e542309
|
fix colors
|
2018-11-22 21:48:36 +04:00 |
|
Anton Romanov
|
7f1fb168e1
|
fix colors
|
2018-11-22 21:31:41 +04:00 |
|
Anton Romanov
|
4163276da3
|
add paper status
|
2018-11-22 21:06:58 +04:00 |
|
Anton Romanov
|
1b2db5b5d4
|
Merge remote-tracking branch 'origin/master'
|
2018-11-22 11:20:08 +04:00 |
|
Anton Romanov
|
ccd07305ec
|
add mertica
|
2018-11-22 11:19:50 +04:00 |
|
Anton Romanov
|
724dd6a78a
|
remove empty page
|
2018-11-21 15:47:26 +04:00 |
|
Anton Romanov
|
161fab55de
|
add toolbar
|
2018-11-21 15:47:14 +04:00 |
|
Anton Romanov
|
0aec0c3c8e
|
Merge remote-tracking branch 'origin/master'
|
2018-11-21 15:42:20 +04:00 |
|
Anton Romanov
|
908bf814ce
|
Merge branch '31-' into 'master'
Resolve "Создать страницу гранта"
Closes #31
See merge request romanov73/ng-tracker!20
|
2018-11-21 11:42:47 +00:00 |
|
Anton Romanov
|
29586c9313
|
close failed papers
|
2018-11-21 15:40:20 +04:00 |
|
T-Midnight
|
f6647d6752
|
Create grant page
|
2018-11-21 15:28:41 +04:00 |
|
Anton Romanov
|
4e3e882f76
|
Merge branch '30-main-grants-page' into 'master'
Resolve "Создать страницу грантов"
Closes #30
See merge request romanov73/ng-tracker!17
|
2018-11-21 08:51:11 +00:00 |
|
Anton Romanov
|
ef32bba684
|
Merge remote-tracking branch 'origin/master'
|
2018-11-21 12:46:42 +04:00 |
|
Anton Romanov
|
6314ca6ec5
|
notify if paper deadline in future
|
2018-11-21 12:46:27 +04:00 |
|
T-Midnight
|
d13644d67d
|
Update dashboard for grants
|
2018-11-19 12:16:39 +04:00 |
|
Anton Romanov
|
58299d749d
|
fix for remove event
|
2018-11-19 08:21:22 +04:00 |
|
Anton Romanov
|
2dc0b4e27c
|
fix event create conditions
|
2018-11-19 07:46:02 +04:00 |
|
Anton Romanov
|
6adc96761b
|
fix delete button
|
2018-11-18 14:29:41 +04:00 |
|
Anton Romanov
|
9a0fa5a170
|
fix delete button
|
2018-11-17 12:31:22 +04:00 |
|
Anton Romanov
|
2d78753b06
|
show events
|
2018-11-17 11:56:52 +04:00 |
|
Anton Romanov
|
c774820d95
|
fix build script for netbeans
|
2018-11-14 17:14:56 +04:00 |
|
Anton Romanov
|
ec9009be10
|
show toolbar buttons
|
2018-11-14 17:04:40 +04:00 |
|
Anton Romanov
|
74d9c5cd20
|
show toolbar buttons
|
2018-11-14 17:04:29 +04:00 |
|
Anton Romanov
|
863991953c
|
show paper status
|
2018-11-14 17:04:13 +04:00 |
|
Anton Romanov
|
f587f80eb6
|
fix code
|
2018-11-14 17:03:22 +04:00 |
|
Anton Romanov
|
112958a70b
|
fix code
|
2018-11-14 15:18:22 +04:00 |
|
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 |
|