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 |
|
Anton Romanov
|
ab20b3843f
|
fix font size
|
2019-11-26 23:09:50 +04:00 |
|
Anton Romanov
|
268a311a87
|
add filter
|
2019-11-26 23:02:02 +04:00 |
|
Anton Romanov
|
a67eb23714
|
send all developer letters to romanov73
|
2019-11-26 22:36:57 +04:00 |
|
Anton Romanov
|
5ee1f33de1
|
add papers dashboard
|
2019-11-26 22:34:24 +04:00 |
|
Anton Romanov
|
107ddb90ac
|
add side commands
|
2019-11-24 23:22:05 +04:00 |
|
Anton Romanov
|
ac6bd13c6c
|
show label for paper status
|
2019-11-24 22:54:55 +04:00 |
|
Anton Romanov
|
e7061f4545
|
fix columns
|
2019-11-24 20:58:07 +04:00 |
|
Anton Romanov
|
d741bd019a
|
display authors
|
2019-11-24 20:55:16 +04:00 |
|
Anton Romanov
|
846d94bb46
|
display paper comment
|
2019-11-23 10:48:44 +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
|
779f286988
|
add some menu
|
2019-11-22 08:38:44 +04:00 |
|
Anton Romanov
|
7753dd104c
|
show paper page
|
2019-11-21 14:36:25 +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
|
04f545db1c
|
show paper list
|
2019-11-21 10:18:39 +04:00 |
|
Anton Romanov
|
746f443931
|
fix primefaces repo
|
2019-11-21 09:37:09 +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
|
a17dac55e2
|
fix jdk
|
2019-11-08 16:36:53 +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
|
0647438bfb
|
#73 fix jdk
|
2019-11-08 14:29:16 +04: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
|
24f447aed7
|
fix tests
|
2019-06-22 11:58:01 +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
|
529db0442c
|
fix grant dashboard indicators
|
2019-06-13 14:50:21 +04:00 |
|
Anton Romanov
|
db97892af2
|
fix grant indicators
|
2019-06-13 14:48:02 +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
|
9ba4476f80
|
restore dependencies
|
2019-06-08 14:43:08 +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 |
|