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
|
ae0a1f3532
|
fix layout
|
2020-04-24 18:23:34 +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
|
65569732d6
|
show message on delete
|
2020-02-17 13:07:57 +04:00 |
|
Anton Romanov
|
1460e26127
|
remove papers
|
2020-02-17 10:22:26 +04:00 |
|
Anton Romanov
|
10a99d42cf
|
add delete papers button
|
2020-02-17 00:02:58 +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
|
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
|
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 |
|
Anton Romanov
|
268a311a87
|
add filter
|
2019-11-26 23:02:02 +04:00 |
|
Anton Romanov
|
5ee1f33de1
|
add papers dashboard
|
2019-11-26 22:34:24 +04:00 |
|
Anton Romanov
|
d741bd019a
|
display authors
|
2019-11-24 20:55:16 +04:00 |
|
Anton Romanov
|
5755cf2f92
|
save paper
|
2019-11-23 10:26:05 +04:00 |
|
Anton Romanov
|
7587ff7a51
|
show paper type
|
2019-11-23 09:27:15 +04:00 |
|
Anton Romanov
|
6c220355ee
|
display some of paper
|
2019-11-22 23:47:59 +04:00 |
|
Anton Romanov
|
48955b9cfd
|
show paper statuses
|
2019-11-21 11:30:09 +04:00 |
|
Anton Romanov
|
9665653234
|
show paper list
|
2019-11-21 10:54:48 +04:00 |
|
Anton Romanov
|
1be74769bf
|
fix ports and dependencies
|
2019-11-21 09:35:50 +04:00 |
|
Anton Romanov
|
2cdec4bcda
|
jsf initial
|
2019-11-21 08:37:37 +04:00 |
|
Anton Romanov
|
9e6993f136
|
Merge branch 'move-to-jdk11' into 'dev'
update versions
Closes #73
See merge request romanov73/ng-tracker!34
|
2019-11-08 10:48:03 +00:00 |
|
Anton Romanov
|
41c4ee7997
|
fix htmlunit js errors
|
2019-10-26 11:47:32 +04:00 |
|
Anton Romanov
|
9d3ee273f6
|
fix spring boot version
|
2019-06-24 14:53:55 +04:00 |
|
Anton Romanov
|
3267138524
|
fix warnings
|
2019-06-22 13:50:15 +04:00 |
|
Anton Romanov
|
df1bf873ff
|
fix warnings
|
2019-06-22 13:31:53 +04:00 |
|
Anton Romanov
|
36c4e52e37
|
Merge branch 'dev' into move-to-jdk11
# Conflicts:
# src/main/java/ru/ulstu/conference/service/ConferenceService.java
# src/main/java/ru/ulstu/grant/model/Grant.java
# src/main/java/ru/ulstu/grant/service/GrantService.java
# src/main/java/ru/ulstu/paper/model/Paper.java
# src/main/java/ru/ulstu/paper/service/PaperService.java
# src/main/java/ru/ulstu/project/model/Project.java
# src/main/java/ru/ulstu/project/model/ProjectDto.java
# src/main/java/ru/ulstu/students/model/Task.java
# src/main/java/ru/ulstu/students/service/TaskService.java
# src/main/java/ru/ulstu/timeline/model/Event.java
# src/main/java/ru/ulstu/timeline/model/EventDto.java
# src/main/java/ru/ulstu/timeline/service/EventService.java
# src/main/java/ru/ulstu/user/service/UserService.java
# src/main/resources/application.properties
# src/main/resources/db/changelog-master.xml
# src/main/resources/public/css/conference.css
# src/main/resources/public/js/conference.js
# src/main/resources/public/js/tasks.js
# src/main/resources/templates/conferences/conference.html
# src/main/resources/templates/grants/grant.html
# src/main/resources/templates/papers/paper.html
|
2019-06-21 04:22:06 +04:00 |
|
Anton Romanov
|
ff19001f1f
|
fix grant doubling cause date comparison
|
2019-06-11 22:09:30 +04:00 |
|
Anton Romanov
|
2012a58fc2
|
show active grants
|
2019-06-10 12:15:01 +04:00 |
|
Anton Romanov
|
098f70ede6
|
Merge remote-tracking branch 'origin/dev' into dev
|
2019-06-08 14:37:07 +04:00 |
|
Anton Romanov
|
d84b1fcbdc
|
use HtmlUnit instead of selenium webdriver for grants loading
|
2019-06-08 14:36:12 +04:00 |
|
Anton Romanov
|
b44bbaec75
|
Merge branch '95-block-user' into 'dev'
Resolve "Блокировка пользователя"
Closes #95
See merge request romanov73/ng-tracker!110
|
2019-06-08 08:29:44 +00:00 |
|
T-Midnight
|
e4f5bede2a
|
#104 add 3 more tests
|
2019-06-07 22:39:20 +04:00 |
|
T-Midnight
|
888fecf687
|
#104 add unit tests
|
2019-06-07 20:55:59 +04:00 |
|
Anton Romanov
|
18bb0b85ac
|
sout driver path
|
2019-06-07 15:53:09 +04:00 |
|
Anton Romanov
|
615c70d12a
|
sout driver path
|
2019-06-07 15:35:15 +04:00 |
|
Artem.Arefev
|
96d166d031
|
#95 block user html
|
2019-06-07 12:23:03 +04:00 |
|
Artem.Arefev
|
fb23f182de
|
#95 merged with dev
|
2019-06-07 11:39:44 +04:00 |
|
Anton Romanov
|
f8c1e52ca4
|
add kias loader to rest
|
2019-06-07 09:48:07 +04:00 |
|
Anton Romanov
|
59e52aaf4a
|
different drivers
|
2019-06-06 17:07:25 +04:00 |
|