Commit Graph

912 Commits

Author SHA1 Message Date
Anton Romanov
3f16c8a078 fix user date 2020-04-25 23:51:14 +04:00
Anton Romanov
e3da8c710f fix sout 2020-04-25 23:17:47 +04:00
Anton Romanov
54b992a7f3 try to fix grants kias 2020-04-25 22:46:35 +04:00
Anton Romanov
e20fb468f9 fix 2020-04-25 22:08:28 +04:00
Anton Romanov
1a3ffb7bab fix params and hrefs 2020-04-25 21:42:15 +04:00
Anton Romanov
d29416fb76 fix deploy script 2020-04-25 21:24:58 +04:00
Anton Romanov
37053d853b Merge branch 'jsf' into 'dev'
Jsf

See merge request romanov73/ng-tracker!119
2020-04-25 16:52:19 +00:00
Anton Romanov
b961c8e3dc fix checkstyle 2020-04-25 20:43:48 +04:00
Anton Romanov
3dd6210f42 fix checkstyle 2020-04-25 20:39:44 +04:00
Anton Romanov
5520f19357 show grants 2020-04-25 20:34:35 +04:00
Anton Romanov
2cc3008dc5 complete dashboard 2020-04-25 18:45:12 +04:00
Anton Romanov
708a1a6d32 add dynamic deadlines 2020-04-25 01:30:27 +04:00
Anton Romanov
751195bf96 some layout fixes 2020-04-25 00:48:21 +04:00
Anton Romanov
6adb3fec71 Merge remote-tracking branch 'origin/jsf' into jsf
# Conflicts:
#	src/main/resources/META-INF/resources/admin/user.xhtml
2020-04-24 22:51:45 +04:00
Anton Romanov
ae0a1f3532 fix layout 2020-04-24 18:23:34 +04:00
Anton Romanov
e167a68bc6 add conference button 2020-04-24 13:48:28 +04:00
Anton Romanov
6b717f26d3 fix selection 2020-04-24 13:06:06 +04:00
Anton Romanov
b20ab96b55 fix check unique name of grant 2020-03-28 11:20:29 +04:00
Anton Romanov
2c55293e0e fix check unique name of grant 2020-03-28 10:46:35 +04:00
Anton Romanov
a14735699c fix date parsing 2020-03-28 10:27:47 +04:00
Anton Romanov
9f21850767 move patronymic field 2020-02-24 13:53:33 +04:00
Anton Romanov
abde7f311c fix user page 2020-02-22 17:21:48 +04:00
Anton Romanov
5333258c62 login field 2020-02-22 17:19:35 +04:00
Anton Romanov
2149dfd32f save user 2020-02-22 10:20:59 +04:00
Anton Romanov
34c5e79cbb edit user 2020-02-22 09:03:18 +04:00
Anton Romanov
2110c21be7 fix editor 2020-02-17 23:16:13 +04:00
Anton Romanov
30e06335e9 fix logo 2020-02-17 15:55:16 +04:00
Anton Romanov
c528711431 fix logo 2020-02-17 15:15:31 +04:00
Anton Romanov
0bb9768bda create on submit 2020-02-17 14:40:53 +04:00
Anton Romanov
52d6210875 hide pagination 2020-02-17 14:38:36 +04:00
Anton Romanov
65569732d6 show message on delete 2020-02-17 13:07:57 +04:00
Anton Romanov
1d0c90d932 confirm delete 2020-02-17 13:07:39 +04:00
Anton Romanov
440def2b71 fix layout 2020-02-17 12:56:19 +04:00
Anton Romanov
1460e26127 remove papers 2020-02-17 10:22:26 +04:00
Anton Romanov
1f5cde4b66 relax checkstyle 2020-02-17 00:06:00 +04:00
Anton Romanov
10a99d42cf add delete papers button 2020-02-17 00:02:58 +04:00
Anton Romanov
90c11c6946 show details 2020-02-15 10:16:56 +04:00
Anton Romanov
134f75666c Merge remote-tracking branch 'origin/jsf' into jsf 2020-02-14 09:35:42 +04:00
Anton Romanov
b8d492724c image 2020-02-14 09:35:34 +04:00
Anton Romanov
bc48a486ee quick add paper 2020-02-13 23:44:48 +04:00
Anton Romanov
c36876f7e7 style 2020-02-10 10:45:43 +04:00
Anton Romanov
a136acb0b4 show users 2019-11-28 10:33:36 +04:00
Anton Romanov
7d1f5e9059 fix codestyle 2019-11-28 07:58:38 +04:00
Anton Romanov
4c4c1b2015 fix template 2019-11-28 07:52:42 +04:00
Anton Romanov
6b90d7b0c0 fix messages 2019-11-27 23:36:48 +04:00
Anton Romanov
fa03edf32d fix messages 2019-11-27 23:36:33 +04:00
Anton Romanov
4e1d99392a fix dependency 2019-11-27 21:48:53 +04:00
Anton Romanov
ac55481bc6 add oauth2 google 2019-11-27 19:41:10 +04:00
Anton Romanov
71448364d7 fix login / logout 2019-11-27 13:31:08 +04:00
Anton Romanov
c57914db7c auth 2019-11-27 08:49:01 +04:00