Nightblade73
|
b77619777e
|
#68 added dashboard-card styles depending on the conference.ping count
|
5 years ago |
|
Nightblade73
|
70d260c34b
|
#68 ping but style
|
5 years ago |
|
Nightblade73
|
d4b514a9b0
|
#68 added ping in db
|
5 years ago |
|
Nightblade73
|
d921def09d
|
#68 added ping method
|
5 years ago |
|
Nightblade73
|
f556b969b4
|
#68 added demo version of charts, using highcharts lib
|
5 years ago |
|
Nightblade73
|
b16b3ed2e3
|
#68 added class structure
|
5 years ago |
|
Nightblade73
|
5bff419dbd
|
#68 added ping table
|
5 years ago |
Anton Romanov
|
4dd0a6c210
|
fix merge bug
|
5 years ago |
|
Anton Romanov
|
bb2518e5f4
|
Merge branch '76-students-tags-filter' into 'dev'
Resolve "Фильтр задач по типу (тегам)"
Closes #77, #75, and #76
See merge request romanov73/ng-tracker!61
|
5 years ago |
|
Anton Romanov
|
1e6fbdc1fa
|
Merge branch '64-add-article-conf' into 'dev'
Resolve "Добавить новую статью к конференции"
Closes #64
See merge request romanov73/ng-tracker!70
|
5 years ago |
|
Anton Romanov
|
54c6fe815d
|
Merge branch '113-delete-project' into 'dev'
Resolve "Реализовать удаление проекта"
Closes #113
See merge request romanov73/ng-tracker!71
|
5 years ago |
|
Nightblade73
|
d37c9bda57
|
#64 excluded adding articles with the same name
|
5 years ago |
|
Nightblade73
|
fe55890518
|
#64 more style fixes
|
5 years ago |
|
Nightblade73
|
7eb5dce94e
|
#64 style fixes
|
5 years ago |
ASH
|
7248a84c30
|
#76 adding sorting
|
5 years ago |
Васин Антон
|
02d643727e
|
#113 projects/projects edited
|
5 years ago |
|
Васин Антон
|
50a0f8aa78
|
#113 projects.js added
|
5 years ago |
|
Васин Антон
|
2418e953be
|
#113 line fragment edited
|
5 years ago |
|
Васин Антон
|
e32da7c7c2
|
#113 delete function
|
5 years ago |
|
Anton Romanov
|
8f2f6adc3b
|
#64 show global message
|
5 years ago |
T-Midnight
|
c18ecea13b
|
#115 move method to service
|
5 years ago |
|
T-Midnight
|
bf515a3fcb
|
Merge remote-tracking branch 'remotes/origin/107-attach-article' into 115-follow-up-from-resolve
|
5 years ago |
|
Васин Антон
|
2f3c1addbb
|
#114 unused imports removed
|
5 years ago |
|
Васин Антон
|
c78ea05255
|
#114 update edited
|
5 years ago |
|
T-Midnight
|
26969dba5b
|
#107 merge with dev
|
5 years ago |
|
T-Midnight
|
6df1a87367
|
#107 merge with dev
|
5 years ago |
|
T-Midnight
|
546b0dc323
|
#107 add styles
|
5 years ago |
|
Васин Антон
|
41bd00d645
|
project dashboard edited
|
5 years ago |
|
Nightblade73
|
6d6ea3136d
|
#64 dont show error message
|
5 years ago |
|
T-Midnight
|
d3b8be2cf1
|
#107 add view of the selected papers
|
5 years ago |
|
Васин Антон
|
019fe7c652
|
#97 adding deadlines
|
5 years ago |
|
ASH
|
3698d31bc8
|
#76 fixing conflicts
|
5 years ago |
|
Nightblade73
|
53cc777734
|
#64 delete conference refactor
|
5 years ago |
|
Васин Антон
|
53cc947a17
|
#97 copy from DTO edited
|
5 years ago |
|
Васин Антон
|
ba565746f5
|
#97 dashboard added
|
5 years ago |
|
Васин Антон
|
519dd51446
|
#97 dashboard added
|
5 years ago |
|
Васин Антон
|
349e7373ff
|
#97 save function
|
5 years ago |
|
Nightblade73
|
2767403128
|
#64 added saving in db
|
5 years ago |
|
Nightblade73
|
5bfeaff054
|
#64 added method addPaper
|
5 years ago |
|
Anton Romanov
|
b6ced3ce1a
|
Merge branch '60-sort-conf' into 'dev'
Resolve "Сортировка списка конференций"
Closes #60
See merge request romanov73/ng-tracker!66
|
5 years ago |
|
ASH
|
6876d09557
|
#76 adding style to filters
|
5 years ago |
|
Nightblade73
|
ddd21dab1c
|
#60 added dashboard
|
5 years ago |
|
ASH
|
8400c5d40d
|
Merge remote-tracking branch 'remotes/origin/dev' into 76-students-tags-filter
# Conflicts:
# src/main/resources/templates/students/dashboard.html
|
5 years ago |
|
Nightblade73
|
a4ae42f072
|
#60 added sorting
|
5 years ago |
Семенова Мария
|
a3d1834ab8
|
#110 add paper type
|
5 years ago |
|
Nightblade73
|
a9f4a326c5
|
#59 fixed styles
|
5 years ago |
|
Nightblade73
|
338d7c2e09
|
#59 added begin-end dates in conferenceRow
|
5 years ago |
|
T-Midnight
|
eec739a49f
|
#41 create simple attach of articles
|
5 years ago |
|
T-Midnight
|
f29d31b840
|
#41 create changelog
|
5 years ago |
|
Nightblade73
|
34033fac5f
|
#59 added filtration
|
5 years ago |
|
Nightblade73
|
e2b49689d5
|
#59 changed filterDto
|
5 years ago |
|
Nightblade73
|
9f664b2618
|
#59 add front thymeleaf
|
5 years ago |
|
Anton Romanov
|
21ba06170a
|
Merge branch '106-papers-bug' into 'dev'
Resolve "Bug: не отображается список статей"
Closes #106
See merge request romanov73/ng-tracker!62
|
5 years ago |
|
Anton Romanov
|
9e31bfa7d7
|
#106 add checkstyle rules
|
5 years ago |
|
Anton Romanov
|
2d0f2aeecd
|
Merge branch '69-take-part-conf' into 'dev'
Resolve "Принять участие в конференции пользователю"
Closes #69
See merge request romanov73/ng-tracker!56
|
5 years ago |
|
Nightblade73
|
b623402aa8
|
#69 changed method getConference in controller
|
5 years ago |
|
Nightblade73
|
9edcebb2f5
|
#69 changed isCurrentUserParticipant
|
5 years ago |
|
Nightblade73
|
713e50043e
|
Merge remote-tracking branch 'remotes/origin/dev' into 69-take-part-conf
# Conflicts:
# src/main/resources/db/changelog-master.xml
|
5 years ago |
|
T-Midnight
|
f387b4eb52
|
#41 add link to the grant page
|
5 years ago |
|
Семенова Мария
|
6c8554a0b8
|
#106 change boolean to nullable
|
5 years ago |
|
ASH
|
7bec7b4e44
|
#76 filters added
|
5 years ago |
|
Anton Romanov
|
5a55e3cfc8
|
Merge branch '42--2' into 'dev'
Resolve "Форма добавления и фильтра участников гранта"
Closes #42
See merge request romanov73/ng-tracker!44
|
5 years ago |
|
T-Midnight
|
958a0d461b
|
#42 merge with dev
|
5 years ago |
|
T-Midnight
|
416ad7eeda
|
#42 merge with dev
|
5 years ago |
|
ASH
|
59887e5141
|
#76 delete function added
|
5 years ago |
|
ASH
|
9da227ab34
|
#76 fixing dashboard
|
5 years ago |
|
Семенова Мария
|
6c6a748978
|
#105 danger message type
|
5 years ago |
|
Семенова Мария
|
a2dca6b7c6
|
Merge branch 'dev' into paper-latex-editing
# Conflicts:
# src/main/java/ru/ulstu/paper/model/Paper.java
# src/main/java/ru/ulstu/paper/model/PaperDto.java
# src/main/java/ru/ulstu/paper/service/PaperService.java
# src/main/resources/db/changelog-master.xml
# src/main/resources/templates/papers/paper.html
|
5 years ago |
|
Васин Антон
|
f1f7c1f0f6
|
#97 cancel button edited
|
5 years ago |
|
Nightblade73
|
96431701df
|
#69 added button disabling take part, if cur user already taken part
|
5 years ago |
|
Nightblade73
|
8fd352aaa4
|
#69 added styles
|
5 years ago |
|
Anton Romanov
|
8474fb492f
|
Merge branch '96-edit-project-page' into 'dev'
Resolve "Страница редактирования проекта"
Closes #96
See merge request romanov73/ng-tracker!57
|
5 years ago |
|
Васин Антон
|
d015b02862
|
#96 removed wildcards from imports
|
5 years ago |
|
Васин Антон
|
ced3b0a978
|
#96 database edited
|
5 years ago |
|
T-Midnight
|
e284298200
|
#42 rename variables
|
5 years ago |
|
Васин Антон
|
b722687050
|
#96 edit project page
|
5 years ago |
|
Nightblade73
|
918079ac89
|
#69 fixed not working code, now user can take part in conference and choose participation and deposit
|
5 years ago |
|
Семенова Мария
|
789fda9c98
|
remove nonstopmode from bibtex
|
5 years ago |
|
Anton Romanov
|
5b89ed7284
|
#102 fix code style
|
5 years ago |
|
Anton Romanov
|
cfbe36197b
|
#102 add auto tests
|
5 years ago |
|
Васин Антон
|
e85c814f70
|
#96 project comment added
|
5 years ago |
|
Васин Антон
|
255692d6ea
|
#96 project status added
|
5 years ago |
|
Васин Антон
|
f079e34a57
|
#96 project title added
|
5 years ago |
|
Васин Антон
|
4ea40931eb
|
#96 project status fragment added
|
5 years ago |
|
Васин Антон
|
a89d93a9b0
|
#96 project line fragment added
|
5 years ago |
|
Nightblade73
|
7e4d8d4918
|
#69 added method take part in conference
|
5 years ago |
|
Васин Антон
|
ca3e87a8c5
|
#96 edit project blank page
|
5 years ago |
|
T-Midnight
|
506fa01fab
|
Revert: #42 merge with dev
|
5 years ago |
|
T-Midnight
|
97d7d00098
|
#42 merge with dev
|
5 years ago |
|
T-Midnight
|
1e6b3cba3a
|
#42 delete blank lines, fix js, fix leaderId validation
|
5 years ago |
|
Nightblade73
|
8564f2cf34
|
#69 managed to create a connection through a new entity
|
5 years ago |
|
Anton Romanov
|
487aa578a7
|
Merge branch '86-projects-main-page' into 'dev'
Resolve "Создать страницу списка проектов"
Closes #86
See merge request romanov73/ng-tracker!53
|
5 years ago |
|
Васин Антон
|
f5c1bb940c
|
#86 projects main page
|
5 years ago |
|
Nightblade73
|
14c28050c7
|
#65 changed interface
|
5 years ago |
|
Nightblade73
|
81d07645c2
|
#65 added delete method of article, fixed copyFromDto method
|
5 years ago |
|
Anton Romanov
|
3facc0c26e
|
Merge branch '74-students-add-new-task' into 'dev'
Resolve "Добавление новой задачи"
Closes #78 and #74
See merge request romanov73/ng-tracker!47
|
5 years ago |
|
Anton Romanov
|
d81d1cf72c
|
#74 some code fixes
|
5 years ago |
|
Nightblade73
|
d4b38d314f
|
#66 fixed bug, when attach-article lose what needed to attach after add or remove deadline
|
5 years ago |
anastasia shulga
|
95f70f425a
|
Update2 TagService.java
|
5 years ago |
|
anastasia shulga
|
dbd61ce80c
|
Update TagService.java
|
5 years ago |
|
Nightblade73
|
dca644eba1
|
#66 added handling of adding articles not added to the picker.
|
5 years ago |
|
Nightblade73
|
fbf9a7943b
|
#66 changed from Set to List
|
5 years ago |
|
Nightblade73
|
735cbb5f7b
|
#66 added front-end part
|
5 years ago |
|
Nightblade73
|
909c657c89
|
#58 added delete confirm
|
5 years ago |
|
Nightblade73
|
0cc8de2d32
|
#58 added delete method of conference
|
5 years ago |
|
Nightblade73
|
f88f035e65
|
#55 little fix
|
5 years ago |
|
ASH
|
1f36e04cd3
|
#74 fully adding tags
|
5 years ago |
|
Nightblade73
|
8cfc64ea85
|
#55 added delete input style
|
5 years ago |
|
ASH
|
d6a11a5902
|
#74 fixing codestyle and tags
|
5 years ago |
|
Anton Romanov
|
8b2a559d37
|
#42 fix thymeleaf expressions
|
5 years ago |
|
Anton Romanov
|
34499abd60
|
#62 fix remove deadline in other JPA operation
|
5 years ago |
|
Nightblade73
|
9711febefb
|
#55 added delete deadline
|
5 years ago |
|
T-Midnight
|
1756f29505
|
#42 filter authors by leader and degree
|
5 years ago |
|
Nightblade73
|
b4a2a8086d
|
#62 remove verification of empty deadline list
|
5 years ago |
|
Anton Romanov
|
4955e9a637
|
#4--2 merge with dev
|
5 years ago |
|
Anton Romanov
|
cafb3abcee
|
#4--2 merge with dev
|
5 years ago |
|
T-Midnight
|
bd3513118c
|
#42 this don't work
|
5 years ago |
|
T-Midnight
|
f7d766f02d
|
#42 rename birth_date column
|
5 years ago |
|
ASH
|
5eae7305c4
|
#74 codestyle
|
5 years ago |
|
ASH
|
f019806a8e
|
#74 fixing adding and db everything added except tags
|
5 years ago |
|
T-Midnight
|
e8461e26eb
|
#42 fix birthDate and degree to User
|
5 years ago |
|
T-Midnight
|
51c755ac07
|
#42 method hasErrors didn't work, return to the previous state
|
5 years ago |
|
ASH
|
9b697c6f3f
|
#74 adding models, controllers and services
|
5 years ago |
|
T-Midnight
|
e2e10477ac
|
#42 delete GrantStatusDto
|
5 years ago |
|
Nightblade73
|
c308a5e5af
|
#55 Navigation's method "hasErrors" don't work. it returns String, not redirection.
|
5 years ago |
|
Nightblade73
|
689a7799e3
|
#55 added method in controller
|
5 years ago |
|
Anton Romanov
|
7dca991c2f
|
Merge branch '55-new-conf' into 'dev'
Resolve "Добавление новой конференции"
Closes #55
See merge request romanov73/ng-tracker!43
|
5 years ago |
|
Anton Romanov
|
e350f8b3c1
|
#55 refactor controller navigation, fix conference edit url
|
5 years ago |
|
Nightblade73
|
c49b56916c
|
#55 added initialization of fields in ConferenceDto
|
5 years ago |
|
Nightblade73
|
db43da9ec0
|
#55 added nav controller
|
5 years ago |
|
Nightblade73
|
3e5aeaf290
|
#55 fast fixes
|
5 years ago |
|
Nightblade73
|
926cd02096
|
#55 fixed adding to DB
|
5 years ago |
|
Anton Romanov
|
b9af7c20c7
|
fix grids
|
5 years ago |
|
T-Midnight
|
7465803162
|
#42 add columns 'birth_date'&'degree' to User
|
5 years ago |
|
Anton Romanov
|
e0ca29fbab
|
#83 fix wrong entity
|
5 years ago |
|
Nightblade73
|
eb524d49d0
|
#55 added html side, don't work, because can't parse date, like in deadlines
|
5 years ago |
|
Anton Romanov
|
72add3638b
|
#83 check CI
|
5 years ago |
|
Anton Romanov
|
c7cdbe9044
|
#83 add tasks, modify build script for passing application properties
|
5 years ago |
|
Nightblade73
|
67bfad22f9
|
#55 added create and update methods
|
5 years ago |
|
Anton Romanov
|
54edeb0559
|
#82 fix user abbreviate
|
5 years ago |
|
Anton Romanov
|
91d2168012
|
#82 show paper formatted lines
|
5 years ago |
|
Nightblade73
|
d6b7fe790a
|
#55 added transition to the page new conference
|
5 years ago |
|
Nightblade73
|
9d69f75530
|
#55 fixes
|
5 years ago |
|
Nightblade73
|
2d04b1b43a
|
#55 added findAll method in ConferenceService
|
5 years ago |
|
Nightblade73
|
d189891e8c
|
#55 added ConferenceFilterDto
|
5 years ago |
|
Nightblade73
|
e3bbade40b
|
#55 added ConferenceDto
|
5 years ago |
|
Nightblade73
|
dc12a671d2
|
#55 added setters/getters
|
5 years ago |
|
Nightblade73
|
be2dd291f6
|
#55 added conference model without user's participation and deposit. May be needed new user model.
|
5 years ago |
|
T-Midnight
|
99a8550696
|
#42 merge dev into 42
|
5 years ago |
|
T-Midnight
|
566b7821d1
|
#42 merge dev into 42
|
5 years ago |
|
T-Midnight
|
8a7117d713
|
#42 Add leader and authors
|
5 years ago |
|
Семенова Мария
|
ded0ab482a
|
add nonstopmode
|
5 years ago |
|
Anton Romanov
|
4104aa04cd
|
fixes for wrong build. entities always extends BaseEntity, tables must contains version column
|
5 years ago |
|
Nightblade73
|
0428bad048
|
#57 created classes
|
5 years ago |
|
Anton Romanov
|
5ffb2d547e
|
Merge branch 'dev' into 81-students-create-database
# Conflicts:
# src/main/resources/db/changelog-master.xml
|
5 years ago |
|
Anton Romanov
|
61d4c67aac
|
Merge branch '56-creating-tables-in-DB' into 'dev'
Resolve "Создание таблиц в БД по модулю конференций"
Closes #56
See merge request romanov73/ng-tracker!40
|
5 years ago |
|
Anton Romanov
|
c2dc080d23
|
Merge branch '71-add-task-layout' into 'dev'
Resolve "Верстка страницы добавления новой задачи, ПУ и списка задач"
Closes #71
See merge request romanov73/ng-tracker!29
|
5 years ago |
|
ASH
|
4e89c65c22
|
#81 adding main tables
|
5 years ago |
|
ASH
|
2ad03a5689
|
#71 adding dashboard
|
5 years ago |
|
Nightblade73
|
e93f618779
|
#56 added database schema
|
5 years ago |
|
Anton Romanov
|
76d4c15db5
|
Merge branch '18-paper-timeline' into 'dev'
Resolve "Реализовать добавление в таймлайн событий по дедлайнам статей"
Closes #18
See merge request romanov73/ng-tracker!39
|
5 years ago |
|
Anton Romanov
|
e98445bb48
|
Merge branch '53-vyorstka-stranitsy-spiska-konferentsiy' into 'dev'
Resolve "Вёрстка страницы списка конференций"
Closes #53
See merge request romanov73/ng-tracker!33
|
5 years ago |
|
Семенова Мария
|
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
|
5 years ago |
|
Anton Romanov
|
ba64b7df16
|
Merge branch 'restore-commits-page' into 'dev'
partially restored commits page
See merge request romanov73/ng-tracker!38
|
5 years ago |
|
Anton Romanov
|
103ff05846
|
fix displaying commits
|
5 years ago |
|
Anton Romanov
|
539095c89e
|
partially restored commits page
|
5 years ago |
|
Семенова Мария
|
0c34571354
|
remove JLR library using
|
5 years ago |
|
Anton Romanov
|
7b0b7a041a
|
#80 hide mvc controllers from api
|
5 years ago |
|
Anton Romanov
|
c70c35f4f3
|
#80 add no records message
|
5 years ago |
|
Семенова Мария
|
2f0c461524
|
#18 add paper events
|
5 years ago |
|
Nightblade73
|
01b082c31b
|
#53 changed style like in module "papers"
|
5 years ago |
|
Anton Romanov
|
e74fcb316c
|
#33 small external link
|
5 years ago |
|
ASH
|
af3c0c0faa
|
#71 fixing layout n adding
|
5 years ago |
|
Семенова Мария
|
cf9a7f895f
|
pdf generating
|
5 years ago |
|
Nightblade73
|
79cfd7c0ab
|
#53 added pagination style, css fixes
|
5 years ago |
|
Nightblade73
|
cc1f5c00c5
|
#53 adapted, refactor css
|
5 years ago |
|
Nightblade73
|
99468a0cea
|
#53 added actual.html, css fixes
|
5 years ago |
|
Nightblade73
|
bff824bc06
|
#53 added control panel
|
5 years ago |
|
Семенова Мария
|
10fe7e8a4e
|
paper files list fragment, latex attachs upload
|
5 years ago |
|
Семенова Мария
|
c86f58d1b2
|
tab with latex editing
|
5 years ago |
|
Семенова Мария
|
c21e8afc1f
|
latex text in paper
|
5 years ago |
|
Nightblade73
|
ea4e25aded
|
#53 added years filter forms
|
5 years ago |
|
Nightblade73
|
edd6aee00f
|
#53 fast fix
|
5 years ago |
|
Nightblade73
|
50dbe8cb8f
|
#53 added custom checkboxes, added selection of all conferences
|
5 years ago |
|
Семенова Мария
|
b90e7c054b
|
#33 link in new tab
|
5 years ago |
|
Семенова Мария
|
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
|
5 years ago |
|
Anton Romanov
|
482e74e10e
|
#13 reduce of code
|
5 years ago |
|
Anton Romanov
|
7012c00c5f
|
#13 fix condition
|
5 years ago |
|
Семенова Мария
|
a0b65f341b
|
#13 streams refactoring
|
5 years ago |
|
Семенова Мария
|
5da9de1bab
|
#13 rename 'deleted', move creating fileDto to service
|
5 years ago |
|
Семенова Мария
|
c702e2abb4
|
#13 fileDataDto instead of Object[]
|
5 years ago |
|
Nightblade73
|
9182a71015
|
#53 added ping style
|
5 years ago |
|
Nightblade73
|
d356c21944
|
#53 added buttons, added bottom pagination
|
5 years ago |
|
Nightblade73
|
89e0d1a291
|
#53 customization css styles
|
5 years ago |
|
Nightblade73
|
cb673d8782
|
#53 remake of conference list without table
|
5 years ago |
|
Nightblade73
|
1364e8e84d
|
#53 added multi selection, added selection of all items
|
5 years ago |
|
Семенова Мария
|
3c068df201
|
#13 some refactoring
|
5 years ago |
|
Nightblade73
|
5dc54dda8b
|
#53 added supporting russian language, added linkable row in table
|
5 years ago |
|
Семенова Мария
|
e6bf603edc
|
#33 url in paper
|
5 years ago |
|
Семенова Мария
|
1425cceb63
|
#13 download files
|
5 years ago |