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 |
Васин Антон
|
4213524dbd
|
Merge branch 'dev' into 98-project-tasks
|
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 |
|
Васин Антон
|
50314246f5
|
Merge branch 'dev' of https://gitlab.com/romanov73/ng-tracker into dev
|
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
|
b9748905d1
|
Merge branch '88-change-password' into 87-inviting-user
|
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 |
|
Anton Romanov
|
19a6b45cf9
|
Merge branch '79-students-tags-generation' into 'dev'
Resolve "Генерация периодических задач по тегам"
Closes #79
See merge request romanov73/ng-tracker!80
|
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
|
ca3159a66b
|
Merge branch '87-inviting-user' into 88-change-password
|
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
|
3d02f551cc
|
Merge branch 'lk_v2' into 87-inviting-user
|
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
|
1c5c05b5e4
|
#104 test take part
|
5 years ago |
|
Nightblade73
|
e6cb991463
|
#104 test is member
|
5 years ago |
|
Nightblade73
|
a8d987b01f
|
#104 test copy from dto method
|
5 years ago |
|
Nightblade73
|
3a9fde3404
|
#104 setUp fields
|
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 |