Anton Romanov
|
59e2c9b544
|
edit deadlines
|
2018-12-17 13:46:08 +04:00 |
|
Anton Romanov
|
54ea705890
|
Merge branch 'master' into 46-mvc
# Conflicts:
# src/main/java/ru/ulstu/paper/controller/PaperController.java
# src/main/java/ru/ulstu/paper/model/Paper.java
# src/main/java/ru/ulstu/paper/model/PaperDto.java
# src/main/resources/public/js/papers.js
# src/main/resources/templates/papers/paper.html
# src/main/resources/templates/papers/papers.html
|
2018-12-14 16:00:46 +04:00 |
|
Anton Romanov
|
ac569ed9a9
|
Merge branch 'master' into 46-mvc
# Conflicts:
# src/main/java/ru/ulstu/paper/controller/PaperController.java
# src/main/java/ru/ulstu/paper/model/Paper.java
# src/main/java/ru/ulstu/paper/model/PaperDto.java
# src/main/resources/public/js/papers.js
# src/main/resources/templates/papers/paper.html
# src/main/resources/templates/papers/papers.html
|
2018-12-14 16:00:33 +04:00 |
|
Anton Romanov
|
932cb71e71
|
Merge branch '36-' into 'master'
Resolve "Создать модель грантов"
Closes #36
See merge request romanov73/ng-tracker!21
|
2018-12-11 11:14:21 +00:00 |
|
Anton Romanov
|
d71a8d2c83
|
move classes, add deadline to entities, fix db changelogs
|
2018-12-11 15:08:35 +04:00 |
|
T-Midnight
|
590cd16abe
|
Create model for grant, deadline and project
|
2018-12-08 23:53:38 +04:00 |
|
Anton Romanov
|
35a08ab451
|
save authors
|
2018-12-05 18:08:47 +04:00 |
|
Anton Romanov
|
54bf5735e5
|
fix create paper
|
2018-12-05 16:51:26 +04:00 |
|
Anton Romanov
|
67f440ac8a
|
add rest controller
|
2018-12-05 06:00:33 +00:00 |
|
Anton Romanov
|
3d4a7b09f3
|
show status
|
2018-12-04 14:48:39 +04:00 |
|
Anton Romanov
|
dfe44ab842
|
add validation
|
2018-12-04 14:13:01 +04:00 |
|
Anton Romanov
|
f9670ad0a5
|
pass values for paper
|
2018-12-04 11:35:51 +04:00 |
|
Anton Romanov
|
f376fedc64
|
load paper
|
2018-11-26 23:07:14 +04:00 |
|
Anton Romanov
|
5fa5d670a5
|
show paper list in mvc
|
2018-11-23 16:45:40 +04:00 |
|
Elena
|
8fc6d3b569
|
задача 10(new)
|
2018-11-23 14:05:23 +04:00 |
|
Anton Romanov
|
4163276da3
|
add paper status
|
2018-11-22 21:06:58 +04:00 |
|
Anton Romanov
|
29586c9313
|
close failed papers
|
2018-11-21 15:40:20 +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 |
|
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
|
2d78753b06
|
show events
|
2018-11-17 11:56:52 +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 |
|
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
|
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
|
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 |
|
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 |
|
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 |
|
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
|
4c43776528
|
add config parameter
|
2018-11-08 20:08:26 +04:00 |
|
Anton Romanov
|
bd78be93ab
|
add paper create strategy
|
2018-11-08 19:36:50 +04:00 |
|
Anton Romanov
|
42fb1a1537
|
fix imports
|
2018-11-01 12:53:19 +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
|
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
|
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 |
|
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 |
|
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
|
e163529d66
|
load paper statuses
|
2018-10-11 10:03:44 +04:00 |
|
Anton Romanov
|
dd5ab38c40
|
add example for file uploading
|
2018-10-01 13:54:11 +04:00 |
|
Anton Romanov
|
550cc4cdf3
|
some refactor
|
2018-09-27 10:35:22 +04:00 |
|
Anton Romanov
|
0ce90e2780
|
Merge branch 'master' into 4-show-time-line
|
2018-09-08 09:54:14 +04:00 |
|
Anton Romanov
|
e9d81fef48
|
sort papers
|
2018-09-05 14:50:49 +04:00 |
|
Anton Romanov
|
e27e56aa9b
|
fix time
|
2018-06-10 01:53:32 +04:00 |
|
Anton Romanov
|
da1fbc3124
|
send notification
|
2018-06-10 01:49:38 +04:00 |
|
Anton Romanov
|
aa919906aa
|
add event controller
|
2018-06-10 01:12:28 +04:00 |
|
Anton Romanov
|
2fda487555
|
add paper authors
|
2018-05-05 14:49:34 +04:00 |
|
Anton Romanov
|
e465651eb2
|
add paper status
|
2018-05-05 11:17:13 +04:00 |
|
Anton Romanov
|
3bede5f561
|
fix papers delete
|
2018-05-05 11:14:37 +04:00 |
|
Anton Romanov
|
b140a61a9b
|
fix papers crud
|
2018-05-05 10:57:02 +04:00 |
|
Anton Romanov
|
7d286c0d76
|
fix paper controller
|
2018-05-05 00:39:18 +04:00 |
|
Anton Romanov
|
d8fa601103
|
add file uploading
|
2018-05-05 00:24:48 +04:00 |
|
Anton Romanov
|
896d23948f
|
add paper controller
|
2018-05-04 18:04:09 +04:00 |
|
Anton Romanov
|
671cfdd486
|
add java code
|
2018-05-04 17:08:20 +04:00 |
|