Anton Romanov
|
d076f35ff7
|
fix user timetable url
|
2019-05-18 13:00:02 +04:00 |
|
Anton Romanov
|
56f083e757
|
Merge branch '87-inviting-user' into 'dev'
Resolve "Приглашение нового пользователя"
Closes #87
See merge request romanov73/ng-tracker!95
|
2019-05-17 10:36:07 +00:00 |
|
Artem.Arefev
|
532e007b0b
|
87 merged with dev
|
2019-05-17 14:31:08 +04:00 |
|
Anton Romanov
|
3dbf635fb6
|
Merge branch '88-change-password' into 'dev'
Resolve "Смена пароля"
Closes #88
See merge request romanov73/ng-tracker!96
|
2019-05-17 10:23:24 +00:00 |
|
Artem.Arefev
|
3da374326b
|
88 replacing all alerts in users.js
|
2019-05-17 14:16:41 +04:00 |
|
Васин Антон
|
4213524dbd
|
Merge branch 'dev' into 98-project-tasks
|
2019-05-17 11:40:21 +03:00 |
|
Васин Антон
|
f960d4de1b
|
#98 deadline model edited
|
2019-05-17 11:30:26 +03:00 |
|
Artem.Arefev
|
740adc5318
|
88 js using showFeedbackMessage
|
2019-05-17 12:23:45 +04:00 |
|
Artem.Arefev
|
b8281c527a
|
87 removed unused imports
|
2019-05-17 12:20:55 +04:00 |
|
Artem.Arefev
|
7163937a53
|
87 using showFeedBackMessage
|
2019-05-17 12:20:08 +04:00 |
|
Васин Антон
|
097f7827b0
|
#98 db edited
|
2019-05-17 10:30:34 +03:00 |
|
Anton Romanov
|
83aba158b6
|
Merge branch '104-module-test-conf' into 'dev'
Resolve "Реализовать модульные тесты"
See merge request romanov73/ng-tracker!92
|
2019-05-17 07:27:21 +00:00 |
|
Васин Антон
|
50314246f5
|
Merge branch 'dev' of https://gitlab.com/romanov73/ng-tracker into dev
|
2019-05-17 10:10:38 +03:00 |
|
Artem.Arefev
|
76d3adb464
|
87 small fix whitespace
|
2019-05-17 08:58:27 +04:00 |
|
Artem.Arefev
|
64357c2508
|
88 fixed changePassword request data
|
2019-05-17 04:35:33 +04:00 |
|
Artem.Arefev
|
6a62e61caf
|
87 error handling + ajax + rest
|
2019-05-17 04:34:03 +04:00 |
|
Artem.Arefev
|
b9748905d1
|
Merge branch '88-change-password' into 87-inviting-user
|
2019-05-17 03:59:28 +04:00 |
|
Artem.Arefev
|
fbd618a6d0
|
88 changed error text to russian
|
2019-05-17 03:59:09 +04:00 |
|
Artem.Arefev
|
052e4a1aef
|
88 rest changePassword + ajax
|
2019-05-17 03:55:22 +04:00 |
|
Artem.Arefev
|
4fc8bc3717
|
Merge branch '87-inviting-user' into 88-change-password
|
2019-05-17 02:01:56 +04:00 |
|
Artem.Arefev
|
728fa42972
|
87 error handling
|
2019-05-17 02:01:26 +04:00 |
|
Nightblade73
|
dc34c7bfb7
|
#104 fixed conference-row style
|
2019-05-16 18:07:18 +04:00 |
|
Nightblade73
|
5263393379
|
#104 remove chart example from dashboard
|
2019-05-16 17:55:34 +04:00 |
|
Nightblade73
|
80de18d3ee
|
#104 create fixed, remove update
|
2019-05-16 16:31:10 +04:00 |
|
Nightblade73
|
bde9cb51fb
|
#104 some methods fixed
|
2019-05-16 15:55:29 +04:00 |
|
Nightblade73
|
c0937d721a
|
#104 removePaper, addPaper, takePart fixed
|
2019-05-16 15:35:32 +04:00 |
|
Nightblade73
|
ce7b4c9c7a
|
#104 addDeadline, removeDeadline fixed
|
2019-05-16 13:33:26 +04:00 |
|
Anton Romanov
|
19a6b45cf9
|
Merge branch '79-students-tags-generation' into 'dev'
Resolve "Генерация периодических задач по тегам"
Closes #79
See merge request romanov73/ng-tracker!80
|
2019-05-16 03:30:46 +00:00 |
|
Artem.Arefev
|
c47d4f8a05
|
#88 removed unused imports
|
2019-05-16 01:17:04 +04:00 |
|
Artem.Arefev
|
33f62c04e7
|
Merge branch '87-inviting-user' into 88-change-password
|
2019-05-16 01:03:14 +04:00 |
|
Artem.Arefev
|
d50673f5fa
|
87-inviting-user small fix in mail template, and changed default user name
|
2019-05-16 01:01:31 +04:00 |
|
Artem.Arefev
|
f8f501b8ff
|
88-change-password base
|
2019-05-16 00:38:53 +04:00 |
|
ASH
|
cd1caa559e
|
Merge branch 'dev' into 79-students-tags-generation
# Conflicts:
# src/main/java/ru/ulstu/students/service/TaskService.java
|
2019-05-16 00:14:05 +04:00 |
|
ASH
|
bc9cca62d6
|
#79 refactoring
|
2019-05-15 23:47:05 +04:00 |
|
Artem.Arefev
|
ca3159a66b
|
Merge branch '87-inviting-user' into 88-change-password
|
2019-05-15 22:35:30 +04:00 |
|
Artem.Arefev
|
3226cc3971
|
87 fixed UserControllerV2 logger
|
2019-05-15 22:27:06 +04:00 |
|
Artem.Arefev
|
48a18a3a57
|
87 fixed imports
|
2019-05-15 22:24:19 +04:00 |
|
Artem.Arefev
|
d88f67ce00
|
87 transactional inviting
|
2019-05-15 03:08:21 +04:00 |
|
Artem.Arefev
|
11ef644e5e
|
88 inviting user base
|
2019-05-15 02:48:44 +04:00 |
|
Nightblade73
|
1e06edfcc0
|
Merge remote-tracking branch 'remotes/origin/dev' into 104-module-test-conf
# Conflicts:
# src/main/java/ru/ulstu/conference/service/ConferenceService.java
|
2019-05-15 01:28:08 +04:00 |
|
Nightblade73
|
7952787229
|
#104 add new tests, fixes
|
2019-05-15 01:14:02 +04:00 |
|
Nightblade73
|
00c5d5f755
|
#104 test refactoring
|
2019-05-15 00:54:30 +04:00 |
|
Artem.Arefev
|
3d02f551cc
|
Merge branch 'lk_v2' into 87-inviting-user
|
2019-05-15 00:53:52 +04:00 |
|
Artem.Arefev
|
95fc9da47d
|
lk base, created from dev
|
2019-05-15 00:49:54 +04:00 |
|
T-Midnight
|
1bf1ad915d
|
Merge branch 'dev' into 44-check-complete-deadlines
|
2019-05-14 23:59:22 +04:00 |
|
T-Midnight
|
9ca8d15b8f
|
#44 update fragment in conference
|
2019-05-14 23:55:08 +04:00 |
|
T-Midnight
|
8c13adb4aa
|
#44 replace paper status fragment
|
2019-05-14 23:46:15 +04:00 |
|
T-Midnight
|
8747ac1619
|
#44 change icon for grant
|
2019-05-14 23:44:00 +04:00 |
|
T-Midnight
|
72923312b7
|
#44 add title to paper status fragment
|
2019-05-14 23:42:49 +04:00 |
|
Nightblade73
|
11cab955b4
|
#104 test create
|
2019-05-14 18:51:03 +04:00 |
|