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
|
04f545db1c
|
show paper list
|
2019-11-21 10:18:39 +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
|
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
|
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
|
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 |
|
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
|
59e52aaf4a
|
different drivers
|
2019-06-06 17:07:25 +04:00 |
|
Artem.Arefev
|
019ac6e0ad
|
#112 fix ping authors in grant
|
2019-06-06 00:21:19 +04: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 |
|
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 |
|
T-Midnight
|
0cd8003dd7
|
#103 add tests for deadline
|
2019-06-04 16:26:42 +04:00 |
|
Artem.Arefev
|
22abf6a27d
|
#95 blocking user
|
2019-06-03 02:11:35 +04:00 |
|
Artem.Arefev
|
abea3c7dad
|
#112 ping model changed
|
2019-06-02 21:53:51 +04:00 |
|
Семенова Мария
|
23d4e5602f
|
#103 integration auto tests
|
2019-06-01 23:16:39 +04:00 |
|
Artem.Arefev
|
3898dcf1c1
|
#112 changed mapping
|
2019-06-01 12:57:20 +04:00 |
|
Artem.Arefev
|
2d230afa35
|
#112changed mapping
|
2019-06-01 12:56:37 +04:00 |
|
a.vasin
|
e6dc2abdd9
|
#101 event service edited
|
2019-06-01 12:23:52 +04:00 |
|
a.vasin
|
ae8dc58a9d
|
#101 event service edited
|
2019-06-01 12:16:59 +04:00 |
|
a.vasin
|
267bd5b0f3
|
#101 event service edited
|
2019-06-01 11:44:41 +04:00 |
|
a.vasin
|
291f4e1e33
|
#101 db edited
|
2019-06-01 09:44:25 +04:00 |
|
Artem.Arefev
|
53307c6add
|
#95 init
|
2019-05-31 22:42:59 +04:00 |
|
Artem.Arefev
|
a405267092
|
merged with dev
|
2019-05-31 22:42:19 +04:00 |
|
a.vasin
|
9388302a47
|
#101 project tests
|
2019-05-31 01:08:40 +04:00 |
|
Artem.Arefev
|
e680aa30c4
|
#112 ping activity
|
2019-05-31 00:33:21 +04:00 |
|
a.vasin
|
632c6299b7
|
#101 files attach modified
|
2019-05-30 00:08:13 +04:00 |
|
a.vasin
|
9013d79228
|
#101 grant attach
|
2019-05-29 23:40:30 +04:00 |
|
a.vasin
|
192adbfa0b
|
#101 no projects message
|
2019-05-29 18:40:14 +04:00 |
|
a.vasin
|
eceb8ec528
|
#101 project model edited
|
2019-05-29 17:52:15 +04:00 |
|
Васин Антон
|
c25392337a
|
#98 project deadlines edited
|
2019-05-28 16:16:41 +03:00 |
|
a.vasin
|
3b0a2dd964
|
#98 executors list added
|
2019-05-28 11:12:27 +04:00 |
|
a.vasin
|
8d1e410e83
|
Merge branch 'dev' of gitlab.com:romanov73/ng-tracker into 98-project-tasks
|
2019-05-28 00:41:15 +04:00 |
|
a.vasin
|
eb87c6d52f
|
#98 project statuses edited
|
2019-05-28 00:40:36 +04:00 |
|
Artem.Arefev
|
a35bcfce1b
|
#112 merged with dev
|
2019-05-27 22:47:01 +04:00 |
|
Artem.Arefev
|
c4b35ddf6a
|
#91 merged with dev
|
2019-05-27 21:53:55 +04:00 |
|
Васин Антон
|
7388e12e3f
|
#98 edited project executors
|
2019-05-27 18:19:31 +03:00 |
|