Artem.Arefev
|
019ac6e0ad
|
#112 fix ping authors in grant
|
5 years ago |
|
Artem.Arefev
|
4104844b1e
|
#95 merged with dev
|
5 years ago |
|
Artem.Arefev
|
c0afabc37c
|
#112 merged with dev
|
5 years ago |
|
Artem.Arefev
|
bdb8fd8ce4
|
Merge remote-tracking branch 'origin/dev' into 112-ping-stats
|
5 years ago |
T-Midnight
|
acd58005de
|
#103 merge with 44
|
5 years ago |
|
T-Midnight
|
1ff38fc80e
|
#103 merge with dev
|
5 years ago |
|
T-Midnight
|
c77702704f
|
#103 merge with dev
|
5 years ago |
Anton Romanov
|
44824e53b2
|
Merge branch '103-paper-integr-tests' into 'dev'
Resolve "Реализовать интеграционные автотесты для проверки модулей"
See merge request romanov73/ng-tracker!111
|
5 years ago |
|
T-Midnight
|
0cd8003dd7
|
#103 add tests for deadline
|
5 years ago |
Васин Антон
|
482964fe53
|
#101 EventService edited
|
5 years ago |
|
Artem.Arefev
|
22abf6a27d
|
#95 blocking user
|
5 years ago |
|
Artem.Arefev
|
abea3c7dad
|
#112 ping model changed
|
5 years ago |
Семенова Мария
|
23d4e5602f
|
#103 integration auto tests
|
5 years ago |
a.vasin
|
bde4ac5f1c
|
#101 event service edited
|
5 years ago |
|
Artem.Arefev
|
3898dcf1c1
|
#112 changed mapping
|
5 years ago |
|
Artem.Arefev
|
2d230afa35
|
#112changed mapping
|
5 years ago |
|
a.vasin
|
db3252d822
|
#101 event service edited
|
5 years ago |
|
a.vasin
|
e6dc2abdd9
|
#101 event service edited
|
5 years ago |
|
a.vasin
|
ae8dc58a9d
|
#101 event service edited
|
5 years ago |
|
a.vasin
|
7edb9d2aa3
|
#101 event service edited
|
5 years ago |
|
a.vasin
|
961a6a318e
|
#101 event service edited
|
5 years ago |
|
a.vasin
|
267bd5b0f3
|
#101 event service edited
|
5 years ago |
|
a.vasin
|
a5ac2bcbc2
|
Merge branch 'dev' of gitlab.com:romanov73/ng-tracker into 101-projecgt-timeline
|
5 years ago |
|
a.vasin
|
291f4e1e33
|
#101 db edited
|
5 years ago |
|
Artem.Arefev
|
53307c6add
|
#95 init
|
5 years ago |
|
Artem.Arefev
|
a405267092
|
merged with dev
|
5 years ago |
|
Anton Romanov
|
a878f8c22c
|
fix remove older events
|
5 years ago |
|
Anton Romanov
|
d2ce6d604e
|
fix merging collection
|
5 years ago |
|
Anton Romanov
|
b4b7b9087e
|
fix npe
|
5 years ago |
|
a.vasin
|
a7b48e1534
|
#101 project tests
|
5 years ago |
|
a.vasin
|
9388302a47
|
#101 project tests
|
5 years ago |
|
Artem.Arefev
|
e680aa30c4
|
#112 ping activity
|
5 years ago |
|
a.vasin
|
632c6299b7
|
#101 files attach modified
|
5 years ago |
|
a.vasin
|
9013d79228
|
#101 grant attach
|
5 years ago |
|
a.vasin
|
192adbfa0b
|
#101 no projects message
|
5 years ago |
|
a.vasin
|
eb30d07d10
|
#101 project deadlines on timeline
|
5 years ago |
|
a.vasin
|
eceb8ec528
|
#101 project model edited
|
5 years ago |
|
Васин Антон
|
77ce908d58
|
#98 deadline edited
|
5 years ago |
|
Васин Антон
|
8ffafd6693
|
#98 deadline imports edited
|
5 years ago |
|
Васин Антон
|
e967e2bfee
|
Merge branch 'dev' of https://gitlab.com/romanov73/ng-tracker into 98-project-tasks
|
5 years ago |
|
Васин Антон
|
c25392337a
|
#98 project deadlines edited
|
5 years ago |
|
a.vasin
|
3b0a2dd964
|
#98 executors list added
|
5 years ago |
|
a.vasin
|
8d1e410e83
|
Merge branch 'dev' of gitlab.com:romanov73/ng-tracker into 98-project-tasks
|
5 years ago |
|
a.vasin
|
eb87c6d52f
|
#98 project statuses edited
|
5 years ago |
|
Artem.Arefev
|
a35bcfce1b
|
#112 merged with dev
|
5 years ago |
|
Artem.Arefev
|
c4b35ddf6a
|
#91 merged with dev
|
5 years ago |
|
Васин Антон
|
7388e12e3f
|
#98 edited project executors
|
5 years ago |
|
Васин Антон
|
4bb4fd6bca
|
#98 changelog edited
|
5 years ago |
|
Васин Антон
|
4eeb79ab80
|
#98 changelog edited
|
5 years ago |
|
Anton Romanov
|
336a16ff73
|
some refactor
|
5 years ago |
|
Artem.Arefev
|
0e7fdac980
|
Merge remote-tracking branch 'origin/dev' into 91-users-info
|
5 years ago |
|
Artem.Arefev
|
482e2b3595
|
#112 base ping activities
|
5 years ago |
|
Anton Romanov
|
828d320e0f
|
#120 try to run test in docker
|
5 years ago |
|
Anton Romanov
|
916bbae414
|
#120 add debug email
|
5 years ago |
|
Anton Romanov
|
477a9fd6ff
|
#120 move to service
|
5 years ago |
|
Anton Romanov
|
59d6edb818
|
#120 refactor
|
5 years ago |
|
Artem.Arefev
|
f4479c2ab7
|
#91 fixed app properties
|
5 years ago |
|
Artem.Arefev
|
193b2b3a32
|
#91 using RestTemplate & show error on timetable loading exception
|
5 years ago |
|
Anton Romanov
|
837a9f465c
|
#120 merge dev
|
5 years ago |
|
Семенова Мария
|
22195813ae
|
#127 fixes
|
5 years ago |
|
Семенова Мария
|
43e7b9fe1f
|
Merge branch 'dev' into 127-paper-references
|
5 years ago |
|
Anton Romanov
|
308da4113d
|
fix week number calculation
|
5 years ago |
|
Anton Romanov
|
c9ecae9842
|
Merge branch '104-students-mod-tests' into 'dev'
Resolve "Реализовать модульные тесты"
See merge request romanov73/ng-tracker!107
|
5 years ago |
|
Artem.Arefev
|
505a054cc8
|
Merge remote-tracking branch 'origin/dev' into 91-users-info
|
5 years ago |
|
Artem.Arefev
|
8bb9e3a844
|
#89 jquery
|
5 years ago |
|
Artem.Arefev
|
661da17f73
|
Merge remote-tracking branch 'origin/dev' into 89-restore-password
|
5 years ago |
|
Семенова Мария
|
01bcac2680
|
#127 allow nullable year
|
5 years ago |
|
Семенова Мария
|
421ed635e8
|
Merge branch 'dev' into 127-paper-references
|
5 years ago |
|
Семенова Мария
|
24a1276005
|
#127 autocomplete
|
5 years ago |
|
Семенова Мария
|
512a805e8c
|
#127 references formatting
|
5 years ago |
ASH
|
ab17b9f152
|
#104 mod tests period task
|
5 years ago |
|
Anton Romanov
|
181086c9db
|
#120 disable start browser on run application
|
5 years ago |
|
ASH
|
82e454a50b
|
#104 mod tests generate task
|
5 years ago |
|
Anton Romanov
|
c303d65c8d
|
#120 move to services
|
5 years ago |
|
Семенова Мария
|
7c1b124c94
|
#127 references tab, crud
|
5 years ago |
|
Семенова Мария
|
29cfadef02
|
#127 reference model, schema
|
5 years ago |
|
ASH
|
ef521123dd
|
#104 mod tests check repeatings
|
5 years ago |
|
Anton Romanov
|
82ae42f7fc
|
Merge branch '125-bug-date-conf' into 'dev'
Resolve "Bug: ошибка при попытке сохранить конференцию с невыбранными датами"
Closes #125
See merge request romanov73/ng-tracker!103
|
5 years ago |
|
Anton Romanov
|
1c8359f900
|
#103 modify files permissions
|
5 years ago |
|
ASH
|
284a3f51e9
|
#104 mod tests filter and create tasks
|
5 years ago |
|
T-Midnight
|
457f1da985
|
#120 fix checkRun and checkStyle
|
5 years ago |
|
T-Midnight
|
5f214620bf
|
#120 use loading from kias
|
5 years ago |
|
T-Midnight
|
bab621677e
|
#120 add methods for checking unique title and date of grant
|
5 years ago |
Nightblade73
|
8b52518c4a
|
#125 check method
|
5 years ago |
|
Artem.Arefev
|
d7c4e6b222
|
#91 base users dashboard
|
5 years ago |
|
T-Midnight
|
bb9f412480
|
#120 check unique grant name
|
5 years ago |
|
T-Midnight
|
c0e66e81a2
|
#120 drop unnecessary table column
|
5 years ago |
|
Artem.Arefev
|
e468646cd6
|
89 removed getCurrentUser
|
5 years ago |
|
Artem.Arefev
|
90799356ab
|
89 password reset
|
5 years ago |
|
Anton Romanov
|
d076f35ff7
|
fix user timetable url
|
5 years ago |
|
Artem.Arefev
|
532e007b0b
|
87 merged with dev
|
5 years ago |
|
Anton Romanov
|
3dbf635fb6
|
Merge branch '88-change-password' into 'dev'
Resolve "Смена пароля"
Closes #88
See merge request romanov73/ng-tracker!96
|
5 years ago |
|
Artem.Arefev
|
3da374326b
|
88 replacing all alerts in users.js
|
5 years ago |
|
Васин Антон
|
f960d4de1b
|
#98 deadline model edited
|
5 years ago |
|
Artem.Arefev
|
740adc5318
|
88 js using showFeedbackMessage
|
5 years ago |
|
Artem.Arefev
|
b8281c527a
|
87 removed unused imports
|
5 years ago |
|
Artem.Arefev
|
7163937a53
|
87 using showFeedBackMessage
|
5 years ago |
|
Васин Антон
|
097f7827b0
|
#98 db edited
|
5 years ago |
|
Anton Romanov
|
83aba158b6
|
Merge branch '104-module-test-conf' into 'dev'
Resolve "Реализовать модульные тесты"
See merge request romanov73/ng-tracker!92
|
5 years ago |
|
Artem.Arefev
|
76d3adb464
|
87 small fix whitespace
|
5 years ago |
|
Artem.Arefev
|
64357c2508
|
88 fixed changePassword request data
|
5 years ago |
|
Artem.Arefev
|
6a62e61caf
|
87 error handling + ajax + rest
|
5 years ago |
|
Artem.Arefev
|
fbd618a6d0
|
88 changed error text to russian
|
5 years ago |
|
Artem.Arefev
|
052e4a1aef
|
88 rest changePassword + ajax
|
5 years ago |
|
Artem.Arefev
|
4fc8bc3717
|
Merge branch '87-inviting-user' into 88-change-password
|
5 years ago |
|
Artem.Arefev
|
728fa42972
|
87 error handling
|
5 years ago |
|
Nightblade73
|
dc34c7bfb7
|
#104 fixed conference-row style
|
5 years ago |
|
Nightblade73
|
5263393379
|
#104 remove chart example from dashboard
|
5 years ago |
|
Nightblade73
|
80de18d3ee
|
#104 create fixed, remove update
|
5 years ago |
|
Nightblade73
|
bde9cb51fb
|
#104 some methods fixed
|
5 years ago |
|
Nightblade73
|
c0937d721a
|
#104 removePaper, addPaper, takePart fixed
|
5 years ago |
|
Nightblade73
|
ce7b4c9c7a
|
#104 addDeadline, removeDeadline fixed
|
5 years ago |
|
Artem.Arefev
|
c47d4f8a05
|
#88 removed unused imports
|
5 years ago |
|
Artem.Arefev
|
33f62c04e7
|
Merge branch '87-inviting-user' into 88-change-password
|
5 years ago |
|
Artem.Arefev
|
d50673f5fa
|
87-inviting-user small fix in mail template, and changed default user name
|
5 years ago |
|
Artem.Arefev
|
f8f501b8ff
|
88-change-password base
|
5 years ago |
|
ASH
|
cd1caa559e
|
Merge branch 'dev' into 79-students-tags-generation
# Conflicts:
# src/main/java/ru/ulstu/students/service/TaskService.java
|
5 years ago |
|
ASH
|
bc9cca62d6
|
#79 refactoring
|
5 years ago |
|
Artem.Arefev
|
3226cc3971
|
87 fixed UserControllerV2 logger
|
5 years ago |
|
Artem.Arefev
|
48a18a3a57
|
87 fixed imports
|
5 years ago |
|
Artem.Arefev
|
d88f67ce00
|
87 transactional inviting
|
5 years ago |
|
Artem.Arefev
|
11ef644e5e
|
88 inviting user base
|
5 years ago |
|
Nightblade73
|
1e06edfcc0
|
Merge remote-tracking branch 'remotes/origin/dev' into 104-module-test-conf
# Conflicts:
# src/main/java/ru/ulstu/conference/service/ConferenceService.java
|
5 years ago |
|
Nightblade73
|
7952787229
|
#104 add new tests, fixes
|
5 years ago |
|
Nightblade73
|
00c5d5f755
|
#104 test refactoring
|
5 years ago |
|
Artem.Arefev
|
95fc9da47d
|
lk base, created from dev
|
5 years ago |
|
Nightblade73
|
11cab955b4
|
#104 test create
|
5 years ago |
|
Nightblade73
|
c88c77cd7d
|
#104 test find one dto
|
5 years ago |
|
Nightblade73
|
a8d987b01f
|
#104 test copy from dto method
|
5 years ago |
|
Nightblade73
|
9da5fd8a7a
|
#104 shock, the first unit test works
|
5 years ago |
|
Anton Romanov
|
51851baa48
|
Merge branch '103-autotest-conf' into 'dev'
Resolve "Реализовать интеграционные автотесты для проверки модулей"
See merge request romanov73/ng-tracker!90
|
5 years ago |
|
Anton Romanov
|
10a9bd7a28
|
Merge branch '111-unique-name-control-conf' into 'dev'
Resolve "Контроль уникальности названия"
See merge request romanov73/ng-tracker!86
|
5 years ago |
|
Nightblade73
|
58a8495835
|
Merge remote-tracking branch 'remotes/origin/dev' into 103-autotest-conf
# Conflicts:
# src/main/java/ru/ulstu/timeline/service/EventService.java
|
5 years ago |
|
Nightblade73
|
ab59cb524e
|
#103 fix code style
|
5 years ago |
|
Nightblade73
|
6044d6f8e3
|
#111 save method refactor
|
5 years ago |
|
Anton Romanov
|
a3afdeb988
|
Merge branch '123-student-task-timeline' into 'dev'
Resolve "Добавление таймлайна для дедлайнов задач"
Closes #123
See merge request romanov73/ng-tracker!91
|
5 years ago |
|
T-Midnight
|
f6830d499b
|
#121 update view
|
5 years ago |
|
T-Midnight
|
99ec7af319
|
#121 reduce paper title
|
5 years ago |
|
T-Midnight
|
e1907d3169
|
#121 change Paper to PaperDto in attaching papers
|
5 years ago |
|
ASH
|
5b4180e685
|
#123 fixing layout
|
5 years ago |
|
ASH
|
a11e10dec4
|
#123 adding task timeline
|
5 years ago |
|
Nightblade73
|
d846192046
|
#111 fixes
|
5 years ago |
|
ASH
|
7798508d4f
|
Merge branch 'dev' into 79-students-tags-generation
# Conflicts:
# src/main/resources/db/changelog-20190505_000000-schema.xml
# src/main/resources/db/changelog-master.xml
|
5 years ago |
|
ASH
|
c59bb45c70
|
#79 fixing codestyle
|
5 years ago |
|
ASH
|
0de34c89fe
|
#79 fixing planner and year generation
|
5 years ago |
|
Nightblade73
|
6edcf8f594
|
#103 add sort and filter test, fixed delete conference, if it has fk with event
|
5 years ago |
|
Nightblade73
|
4e4e7ae194
|
#103 add paper transition
|
5 years ago |
|
Nightblade73
|
cad8682088
|
#103 add adding article
|
5 years ago |
|
T-Midnight
|
77e2ad0651
|
#119 add send notification functions
|
5 years ago |
|
T-Midnight
|
74a8dcbd8a
|
#119 add leader changed notification
|
5 years ago |