Commit Graph

475 Commits

Author SHA1 Message Date
Anton Romanov
5a9ccbcfc1 try to fix template resolvers, step 3 2018-12-19 01:00:08 +04:00
Anton Romanov
e8bad4e24e try to fix template resolvers, step 2 2018-12-19 00:44:12 +04:00
Anton Romanov
7089bd6c42 try to fix template resolvers 2018-12-19 00:22:36 +04:00
Anton Romanov
fbaaac3a91 sort filtered papers 2018-12-18 23:02:48 +04:00
Anton Romanov
fa1c4a9c1c add statuses 2018-12-18 22:42:34 +04:00
Anton Romanov
468f440d9d fix filer 2018-12-18 22:15:21 +04:00
Anton Romanov
ec1e3ff052 fix scripts 2018-12-18 19:40:23 +04:00
Anton Romanov
dc5abe1508 show authors 2018-12-18 19:23:15 +04:00
Anton Romanov
c88ce3ac37 confirm delete paper 2018-12-18 18:47:15 +04:00
Anton Romanov
c2c420027b add papers navigation 2018-12-18 18:05:30 +04:00
Anton Romanov
3e8b74f362 fix submit form 2018-12-17 17:56:48 +04:00
Anton Romanov
d5121c895e fix email notification 2018-12-17 17:29:06 +04:00
Anton Romanov
05296bb26e fix route 2018-12-17 17:28:52 +04:00
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
1f264331fa fix npe 2018-12-05 17:36:53 +04:00
Anton Romanov
7b8f7a2047 format dates 2018-12-05 17:06:56 +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
7794738f63 fix js 2018-12-04 14:49:23 +04: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
aee396f686 Merge branch '14-filter-frontend' into 'master'
Resolve "Фильтр статей"

Closes #14

See merge request romanov73/ng-tracker!18
2018-11-23 16:40:15 +00:00
Anton Romanov
13f9081aee fix failed commit 2018-11-23 20:37:24 +04:00
Anton Romanov
5fa5d670a5 show paper list in mvc 2018-11-23 16:45:40 +04:00
Alyona
f5068f8be9 filter 2018-11-23 14:17:16 +04:00
Alyona
a9ea796bbb Merge branch 'master' into 14-filter-frontend 2018-11-23 14:12:37 +04:00
Alyona
df6bc223aa Merge remote-tracking branch 'origin/master' 2018-11-23 14:10:49 +04:00
Alyona
5eff1bac81 Merge branch 'master' of C:\Users\катя\IdeaProjects\ng-tracker with conflicts. 2018-11-23 14:10:36 +04:00
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
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
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
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
Anton Romanov
6aa5f807b7 move styles to body 2018-11-09 15:21:03 +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
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
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
8fe9f6625c changelog 2018-10-31 20:06:27 +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
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
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
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
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
Elena
b1c98aba45 Задача №6 2018-10-10 23:09:45 +04:00
Anton Romanov
0219b0ce28 fix paper view 2018-10-10 17:05:54 +04:00
Elena
31c7c8571e Задача №5 new 2018-10-10 15:30:47 +04:00
Elena
95e366ca20 Merge branch 'master' into 5-Matveeva-Page
# Conflicts:
#	src/main/resources/templates/paper.html
#	src/main/resources/templates/papers.html
2018-10-10 10:09:07 +04:00
Elena
f9f287c190 Задача №5 2018-10-04 10:39:27 +04:00
Anton Romanov
7db839aee9 Merge branch 'master' into 27-file-upload 2018-10-02 11:11:13 +04:00
Anton Romanov
bf73be3b70 add messages 2018-10-02 10:58:41 +04:00
Anton Romanov
dd5ab38c40 add example for file uploading 2018-10-01 13:54:11 +04:00
Anton Romanov
a9f4e51558 minimize scripts 2018-09-29 09:22:48 +04:00
Anton Romanov
4009a5cf2b fix error pages 2018-09-27 21:32:16 +04:00
Anton Romanov
a3668ddcd3 move pages 2018-09-27 12:11:25 +04:00
Anton Romanov
550cc4cdf3 some refactor 2018-09-27 10:35:22 +04:00
Anton Romanov
879f388e66 Merge branch 'master' into 3-ui
# Conflicts:
#	src/main/resources/templates/index.html
#	src/main/resources/templates/papers.html
2018-09-27 10:03:00 +04:00
Anton Romanov
948305e4d9 Merge branch 'master' into 3-ui
# Conflicts:
#	src/main/resources/templates/index.html
#	src/main/resources/templates/papers.html
2018-09-27 10:02:49 +04:00
Alyona
fae5666694 Merge branch 'master' into 5-Page-of-paper
# Conflicts:
#	src/main/resources/templates/papers.html
2018-09-26 16:44:36 +04:00
Alyona
5b16ac785c Merge branch 'master' into 23-dashboard
# Conflicts:
#	src/main/resources/templates/papers.html
2018-09-26 16:41:33 +04:00
Alyona
0814081187 Merge branch 'master' into 23-dashboard
# Conflicts:
#	src/main/resources/templates/papers.html
2018-09-26 16:11:43 +04:00
Alyona
e4e37454ed Merge branch 'master' into 23-dashboard
# Conflicts:
#	src/main/resources/templates/papers.html
2018-09-26 16:11:19 +04:00
Alyona
48d3b57503 add paper page 2018-09-26 16:04:31 +04:00
Alyona
a93a19bcfe Alyona-Test 2018-09-25 17:13:01 +04:00
Elena
5c0e06e6b5 Тестовое задание 2018-09-25 16:45:01 +04:00
Anton Romanov
1af2f9645a change ports 2018-09-08 10:19:21 +04:00
Anton Romanov
d42c6ece7e Merge remote-tracking branch 'origin/4-show-time-line' into 4-show-time-line 2018-09-08 10:07:21 +04:00
Anton Romanov
0ce90e2780 Merge branch 'master' into 4-show-time-line 2018-09-08 09:54:14 +04:00
Anton Romanov
3688423602 path to timeline 2018-09-08 09:53:34 +04:00
Anton Romanov
1259b6ff2b fix papers font 2018-09-08 09:50:13 +04:00
Anton Romanov
09e8618bb3 add timeline page 2018-09-05 21:58:04 +04:00
Anton Romanov
e9d81fef48 sort papers 2018-09-05 14:50:49 +04:00
Anton Romanov
294ed1838a fix paper colors 2018-09-05 13:45:20 +04:00
Anton Romanov
5e4f137dba add method for create paper 2018-09-05 13:31:51 +04:00
Anton Romanov
43e446e871 get paper list 2018-09-05 11:27:22 +04:00
Anton Romanov
1d74a7cab9 add timeline page 2018-06-10 13:43:40 +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
43917c043d remove liquibase 2018-06-09 22:58:32 +04:00
Anton Romanov
9706944515 fix ports 2018-06-09 22:41:00 +04:00
885c553153 delete orphaned files, migrate to webjars, some fixes and refactoring 2018-05-20 08:05:21 +02: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
4eaa7b3f59 add big logo 2018-05-04 18:09:29 +04:00
Anton Romanov
896d23948f add paper controller 2018-05-04 18:04:09 +04:00
Anton Romanov
0a2a8c503c add ci 2018-05-04 17:54:46 +04:00
Anton Romanov
671cfdd486 add java code 2018-05-04 17:08:20 +04:00