Commit Graph

852 Commits

Author SHA1 Message Date
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
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
Anton Romanov
436c15e727 Merge branch '104-module-tests-grant' into 'dev'
Resolve "Реализовать модульные тесты"

See merge request romanov73/ng-tracker!115
2019-06-08 06:02:09 +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
T-Midnight
51ed732ae8 #104 fix web element in integration test 2019-06-07 20:54:38 +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
Anton Romanov
dc467ec72c Merge branch '112-ping-stats' into 'dev'
#112 fix ping authors in grant

Closes #112

See merge request romanov73/ng-tracker!114
2019-06-05 20:28:47 +00:00
Artem.Arefev
019ac6e0ad #112 fix ping authors in grant 2019-06-06 00:21:19 +04:00
Anton Romanov
1ccec83390 Merge branch '112-ping-stats' into 'dev'
Resolve "Сводка по ping активностей"

Closes #112

See merge request romanov73/ng-tracker!109
2019-06-05 20:04:44 +00:00
Artem.Arefev
4104844b1e #95 merged with dev 2019-06-06 00:01:03 +04:00
Artem.Arefev
c0afabc37c #112 merged with dev 2019-06-05 23:57:33 +04:00
Anton Romanov
624573a47a Merge branch '103-integr-tests-grant' into 'dev'
Resolve "Реализовать интеграционные автотесты для проверки модулей"

See merge request romanov73/ng-tracker!106
2019-06-05 19:46:59 +00:00
T-Midnight
fddc15af5a #103 add tests for authors and description 2019-06-05 23:14:52 +04:00
Artem.Arefev
bdb8fd8ce4 Merge remote-tracking branch 'origin/dev' into 112-ping-stats 2019-06-05 18:12:38 +04:00
T-Midnight
acd58005de #103 merge with 44 2019-06-05 15:52:29 +04:00
T-Midnight
1ff38fc80e #103 merge with dev 2019-06-05 09:36:29 +04:00
T-Midnight
c77702704f #103 merge with dev 2019-06-05 09:34:51 +04:00
Anton Romanov
44824e53b2 Merge branch '103-paper-integr-tests' into 'dev'
Resolve "Реализовать интеграционные автотесты для проверки модулей"

See merge request romanov73/ng-tracker!111
2019-06-05 04:57:33 +00:00
Anton Romanov
bacd3827e3 Merge branch '101-projecgt-timeline' into 'dev'
Resolve "Генерация таймлайна для проекта"

Closes #101

See merge request romanov73/ng-tracker!85
2019-06-05 04:55:15 +00:00