T-Midnight
|
8a7117d713
|
#42 Add leader and authors
|
2019-04-04 09:38:18 +04:00 |
|
Anton Romanov
|
4104aa04cd
|
fixes for wrong build. entities always extends BaseEntity, tables must contains version column
|
2019-04-03 10:39:55 +04:00 |
|
Anton Romanov
|
5ffb2d547e
|
Merge branch 'dev' into 81-students-create-database
# Conflicts:
# src/main/resources/db/changelog-master.xml
|
2019-04-01 09:42:40 +04:00 |
|
Anton Romanov
|
61d4c67aac
|
Merge branch '56-creating-tables-in-DB' into 'dev'
Resolve "Создание таблиц в БД по модулю конференций"
Closes #56
See merge request romanov73/ng-tracker!40
|
2019-04-01 05:27:43 +00:00 |
|
Anton Romanov
|
c2dc080d23
|
Merge branch '71-add-task-layout' into 'dev'
Resolve "Верстка страницы добавления новой задачи, ПУ и списка задач"
Closes #71
See merge request romanov73/ng-tracker!29
|
2019-04-01 05:17:39 +00:00 |
|
ASH
|
4e89c65c22
|
#81 adding main tables
|
2019-03-31 18:58:57 +04:00 |
|
ASH
|
2ad03a5689
|
#71 adding dashboard
|
2019-03-31 13:47:15 +04:00 |
|
Nightblade73
|
e93f618779
|
#56 added database schema
|
2019-03-31 13:12:43 +04:00 |
|
Anton Romanov
|
76d4c15db5
|
Merge branch '18-paper-timeline' into 'dev'
Resolve "Реализовать добавление в таймлайн событий по дедлайнам статей"
Closes #18
See merge request romanov73/ng-tracker!39
|
2019-03-30 07:12:26 +00:00 |
|
Anton Romanov
|
e98445bb48
|
Merge branch '53-vyorstka-stranitsy-spiska-konferentsiy' into 'dev'
Resolve "Вёрстка страницы списка конференций"
Closes #53
See merge request romanov73/ng-tracker!33
|
2019-03-30 07:10:47 +00:00 |
|
Семенова Мария
|
030e1a3afb
|
Merge branch 'dev' into 18-paper-timeline
# Conflicts:
# src/main/java/ru/ulstu/paper/model/Paper.java
# src/main/resources/db/changelog-master.xml
|
2019-03-28 18:32:44 +04:00 |
|
Anton Romanov
|
ba64b7df16
|
Merge branch 'restore-commits-page' into 'dev'
partially restored commits page
See merge request romanov73/ng-tracker!38
|
2019-03-28 11:58:02 +00:00 |
|
Anton Romanov
|
103ff05846
|
fix displaying commits
|
2019-03-28 15:53:31 +03:00 |
|
Anton Romanov
|
539095c89e
|
partially restored commits page
|
2019-03-28 14:59:35 +04:00 |
|
Anton Romanov
|
c70c35f4f3
|
#80 add no records message
|
2019-03-28 14:36:58 +04:00 |
|
Семенова Мария
|
2f0c461524
|
#18 add paper events
|
2019-03-28 12:40:10 +04:00 |
|
Nightblade73
|
01b082c31b
|
#53 changed style like in module "papers"
|
2019-03-28 10:15:15 +04:00 |
|
Anton Romanov
|
e74fcb316c
|
#33 small external link
|
2019-03-27 13:27:49 +04:00 |
|
ASH
|
af3c0c0faa
|
#71 fixing layout n adding
|
2019-03-26 10:49:26 +04:00 |
|
Nightblade73
|
79cfd7c0ab
|
#53 added pagination style, css fixes
|
2019-03-25 11:41:36 +04:00 |
|
Nightblade73
|
cc1f5c00c5
|
#53 adapted, refactor css
|
2019-03-24 16:17:26 +04:00 |
|
Nightblade73
|
99468a0cea
|
#53 added actual.html, css fixes
|
2019-03-24 13:48:34 +04:00 |
|
Nightblade73
|
bff824bc06
|
#53 added control panel
|
2019-03-24 12:46:15 +04:00 |
|
Nightblade73
|
ea4e25aded
|
#53 added years filter forms
|
2019-03-23 15:19:48 +04:00 |
|
Nightblade73
|
edd6aee00f
|
#53 fast fix
|
2019-03-23 12:52:52 +04:00 |
|
Nightblade73
|
50dbe8cb8f
|
#53 added custom checkboxes, added selection of all conferences
|
2019-03-23 12:39:53 +04:00 |
|
Семенова Мария
|
b90e7c054b
|
#33 link in new tab
|
2019-03-23 12:23:30 +04:00 |
|
Семенова Мария
|
c228f5aee0
|
Merge branch 'dev' into 33-paper-url
# Conflicts:
# src/main/java/ru/ulstu/paper/model/Paper.java
# src/main/java/ru/ulstu/paper/service/PaperService.java
# src/main/resources/db/changelog-master.xml
|
2019-03-23 12:04:51 +04:00 |
|
Семенова Мария
|
5da9de1bab
|
#13 rename 'deleted', move creating fileDto to service
|
2019-03-22 09:32:21 +04:00 |
|
Семенова Мария
|
c702e2abb4
|
#13 fileDataDto instead of Object[]
|
2019-03-21 18:26:28 +04:00 |
|
Nightblade73
|
9182a71015
|
#53 added ping style
|
2019-03-21 11:30:28 +04:00 |
|
Nightblade73
|
d356c21944
|
#53 added buttons, added bottom pagination
|
2019-03-21 09:55:38 +04:00 |
|
Nightblade73
|
89e0d1a291
|
#53 customization css styles
|
2019-03-20 21:15:45 +04:00 |
|
Nightblade73
|
cb673d8782
|
#53 remake of conference list without table
|
2019-03-20 18:33:15 +04:00 |
|
Nightblade73
|
1364e8e84d
|
#53 added multi selection, added selection of all items
|
2019-03-20 16:48:55 +04:00 |
|
Семенова Мария
|
3c068df201
|
#13 some refactoring
|
2019-03-19 17:59:19 +04:00 |
|
Nightblade73
|
5dc54dda8b
|
#53 added supporting russian language, added linkable row in table
|
2019-03-19 15:08:45 +04:00 |
|
Семенова Мария
|
e6bf603edc
|
#33 url in paper
|
2019-03-18 23:31:33 +04:00 |
|
Семенова Мария
|
1425cceb63
|
#13 download files
|
2019-03-18 21:02:26 +04:00 |
|
Семенова Мария
|
8dc5eec35c
|
#13 add files to db
|
2019-03-18 19:17:28 +04:00 |
|
Nightblade73
|
fd22aecd22
|
#53 added supporting bootstrap style
|
2019-03-18 18:41:59 +04:00 |
|
Семенова Мария
|
4fb8061653
|
#13 addNewFile js function
|
2019-03-18 18:39:15 +04:00 |
|
Семенова Мария
|
e609b27518
|
Merge branch 'dev' into 13-paper-files
# Conflicts:
# src/main/java/ru/ulstu/paper/model/PaperDto.java
|
2019-03-18 16:13:22 +04:00 |
|
Семенова Мария
|
cb394edf90
|
#13 file list on paper page
|
2019-03-18 16:02:55 +04:00 |
|
Семенова Мария
|
0764d961fa
|
#13 add fileDataDto
|
2019-03-18 13:00:34 +04:00 |
|
Семенова Мария
|
7b601c744f
|
#13 change model, schema
|
2019-03-18 11:07:30 +04:00 |
|
Nightblade73
|
6296b661a9
|
#53 added conference js file
|
2019-03-16 14:44:34 +04:00 |
|
Nightblade73
|
a236fc50bc
|
#53 added datatables lib support
|
2019-03-16 14:39:56 +04:00 |
|
T-Midnight
|
c25c17d8ba
|
Rename title
|
2019-03-15 12:19:25 +04:00 |
|
Anton Romanov
|
90bb94d864
|
add patronymic
|
2019-03-12 14:44:11 +04:00 |
|
Anton Romanov
|
48894b2176
|
display user in filter
|
2019-03-12 13:40:48 +04:00 |
|
Anton Romanov
|
20ecb47867
|
add timetable link
|
2019-03-12 12:35:09 +03:00 |
|
ASH
|
bd975c53f3
|
#71 adding pages and layout
|
2019-03-11 22:46:51 +04:00 |
|
Anton Romanov
|
3169551968
|
Merge branch '54-view-conference' into 'dev'
Resolve "Вёрстка страницы просмотра информации о конференции"
Closes #54
See merge request romanov73/ng-tracker!26
|
2019-03-11 10:49:07 +00:00 |
|
Nightblade73
|
5cb865eb70
|
#54 deleted edit btn
|
2019-03-11 14:43:32 +04:00 |
|
Nightblade73
|
2fec35264c
|
#54 add back link, css fixes
|
2019-03-11 12:58:40 +04:00 |
|
Nightblade73
|
f90d92b19d
|
#54 add custom paper-list
|
2019-03-11 11:36:00 +04:00 |
|
Nightblade73
|
d332282e03
|
#54 add custom deadline-list, add edit-button, add edit and delete icons
|
2019-03-10 22:15:09 +04:00 |
|
Nightblade73
|
7fff337c3a
|
#54 add member list
|
2019-03-07 22:50:37 +04:00 |
|
Nightblade73
|
76ec5add30
|
#54 part of make-up
|
2019-03-06 20:51:46 +04:00 |
|
Nightblade73
|
c21a65a075
|
#54 add transitions
|
2019-03-06 16:48:51 +04:00 |
|
Anton Romanov
|
42fdb51337
|
fix login
|
2019-03-06 16:40:33 +04:00 |
|
Nightblade73
|
93e68b1929
|
#50 creating html page, changing href
|
2019-03-06 16:27:25 +04:00 |
|
Anton Romanov
|
cb73340c3f
|
fix css
|
2019-03-06 16:19:43 +04:00 |
|
Anton Romanov
|
4226be6406
|
fix props
|
2019-03-06 14:36:46 +03:00 |
|
Anton Romanov
|
dd90bd24a9
|
fix props
|
2019-03-06 14:35:09 +03:00 |
|
user
|
285b43c63c
|
header fix
|
2019-03-06 14:25:02 +03:00 |
|
Anton Romanov
|
0fccbdc973
|
add links to papers
|
2019-03-01 11:22:25 +04:00 |
|
Anton Romanov
|
39c25c7b20
|
add links to papers
|
2019-03-01 11:21:25 +04:00 |
|
Anton Romanov
|
779bc3eafc
|
fix failed conditions
|
2019-01-17 00:57:34 +04:00 |
|
Anton Romanov
|
ffb3c65118
|
fix notifications
|
2019-01-05 08:01:07 +04:00 |
|
Anton Romanov
|
cec13bb677
|
some layout fix
|
2018-12-30 19:23:11 +04:00 |
|
Anton Romanov
|
2cac98be50
|
fix enum field name
|
2018-12-29 09:58:37 +04:00 |
|
Anton Romanov
|
ce78f8ad66
|
some refactor
|
2018-12-28 13:57:20 +04:00 |
|
T-Midnight
|
816d115cc8
|
Hide button "Add Project" when project already exists (not perfect)
|
2018-12-25 02:44:50 +04:00 |
|
T-Midnight
|
18ad291e82
|
Made button "delete grant" visible
|
2018-12-25 00:14:38 +04:00 |
|
T-Midnight
|
fcbd91760d
|
Rename table grant to grants
|
2018-12-24 23:39:19 +04:00 |
|
T-Midnight
|
2f68339ba2
|
Add thymeleaf template
|
2018-12-24 15:18:52 +04:00 |
|
T-Midnight
|
307b640e8e
|
Create js for grants
|
2018-12-24 11:07:02 +04:00 |
|
T-Midnight
|
25278bcdd8
|
Create html fragments
|
2018-12-24 11:03:03 +04:00 |
|
Anton Romanov
|
6e14860c34
|
fix paper status template
|
2018-12-20 23:30:25 +04:00 |
|
Anton Romanov
|
468f440d9d
|
fix filer
|
2018-12-18 22:15:21 +04:00 |
|
Anton Romanov
|
ec1e3ff052
|
fix scripts
|
2018-12-18 19:40:23 +04:00 |
|
Anton Romanov
|
dc5abe1508
|
show authors
|
2018-12-18 19:23:15 +04:00 |
|
Anton Romanov
|
c88ce3ac37
|
confirm delete paper
|
2018-12-18 18:47:15 +04:00 |
|
Anton Romanov
|
c2c420027b
|
add papers navigation
|
2018-12-18 18:05:30 +04:00 |
|
Anton Romanov
|
d5121c895e
|
fix email notification
|
2018-12-17 17:29:06 +04:00 |
|
Anton Romanov
|
59e2c9b544
|
edit deadlines
|
2018-12-17 13:46:08 +04:00 |
|
Anton Romanov
|
54ea705890
|
Merge branch 'master' into 46-mvc
# Conflicts:
# src/main/java/ru/ulstu/paper/controller/PaperController.java
# src/main/java/ru/ulstu/paper/model/Paper.java
# src/main/java/ru/ulstu/paper/model/PaperDto.java
# src/main/resources/public/js/papers.js
# src/main/resources/templates/papers/paper.html
# src/main/resources/templates/papers/papers.html
|
2018-12-14 16:00:46 +04:00 |
|
Anton Romanov
|
ac569ed9a9
|
Merge branch 'master' into 46-mvc
# Conflicts:
# src/main/java/ru/ulstu/paper/controller/PaperController.java
# src/main/java/ru/ulstu/paper/model/Paper.java
# src/main/java/ru/ulstu/paper/model/PaperDto.java
# src/main/resources/public/js/papers.js
# src/main/resources/templates/papers/paper.html
# src/main/resources/templates/papers/papers.html
|
2018-12-14 16:00:33 +04:00 |
|
Anton Romanov
|
932cb71e71
|
Merge branch '36-' into 'master'
Resolve "Создать модель грантов"
Closes #36
See merge request romanov73/ng-tracker!21
|
2018-12-11 11:14:21 +00:00 |
|
Anton Romanov
|
d71a8d2c83
|
move classes, add deadline to entities, fix db changelogs
|
2018-12-11 15:08:35 +04:00 |
|
T-Midnight
|
590cd16abe
|
Create model for grant, deadline and project
|
2018-12-08 23:53:38 +04:00 |
|
Anton Romanov
|
35a08ab451
|
save authors
|
2018-12-05 18:08:47 +04:00 |
|
Anton Romanov
|
1f264331fa
|
fix npe
|
2018-12-05 17:36:53 +04:00 |
|
Anton Romanov
|
7b8f7a2047
|
format dates
|
2018-12-05 17:06:56 +04:00 |
|
Anton Romanov
|
54bf5735e5
|
fix create paper
|
2018-12-05 16:51:26 +04:00 |
|
Anton Romanov
|
7794738f63
|
fix js
|
2018-12-04 14:49:23 +04:00 |
|
Anton Romanov
|
3d4a7b09f3
|
show status
|
2018-12-04 14:48:39 +04:00 |
|
Anton Romanov
|
dfe44ab842
|
add validation
|
2018-12-04 14:13:01 +04:00 |
|