Commit Graph

589 Commits

Author SHA1 Message Date
Семенова Мария
22195813ae #127 fixes 2019-05-24 16:15:38 +04:00
Семенова Мария
43e7b9fe1f Merge branch 'dev' into 127-paper-references 2019-05-24 16:14:02 +04:00
Anton Romanov
c9ecae9842 Merge branch '104-students-mod-tests' into 'dev'
Resolve "Реализовать модульные тесты"

See merge request romanov73/ng-tracker!107
2019-05-24 06:37:03 +00:00
Artem.Arefev
8bb9e3a844 #89 jquery 2019-05-24 01:52:50 +04:00
Artem.Arefev
661da17f73 Merge remote-tracking branch 'origin/dev' into 89-restore-password 2019-05-24 01:36:01 +04:00
Семенова Мария
01bcac2680 #127 allow nullable year 2019-05-24 00:26:38 +04:00
Семенова Мария
421ed635e8 Merge branch 'dev' into 127-paper-references 2019-05-24 00:18:07 +04:00
Семенова Мария
24a1276005 #127 autocomplete 2019-05-24 00:14:46 +04:00
Семенова Мария
512a805e8c #127 references formatting 2019-05-23 17:26:22 +04:00
ASH
ab17b9f152 #104 mod tests period task 2019-05-23 16:45:09 +04:00
ASH
82e454a50b #104 mod tests generate task 2019-05-23 16:17:04 +04:00
Семенова Мария
7c1b124c94 #127 references tab, crud 2019-05-23 15:48:46 +04:00
Семенова Мария
29cfadef02 #127 reference model, schema 2019-05-23 15:02:55 +04:00
ASH
ef521123dd #104 mod tests check repeatings 2019-05-23 14:31:34 +04:00
Anton Romanov
82ae42f7fc Merge branch '125-bug-date-conf' into 'dev'
Resolve "Bug: ошибка при попытке сохранить конференцию с невыбранными датами"

Closes #125

See merge request romanov73/ng-tracker!103
2019-05-23 09:56:21 +00:00
Anton Romanov
1c8359f900 #103 modify files permissions 2019-05-23 13:54:44 +04:00
ASH
284a3f51e9 #104 mod tests filter and create tasks 2019-05-23 12:07:34 +04:00
ASH
bd24525315 #103 integration tests 2019-05-23 00:15:03 +04:00
Nightblade73
8b52518c4a #125 check method 2019-05-21 15:53:42 +04:00
Artem.Arefev
e468646cd6 89 removed getCurrentUser 2019-05-19 00:47:49 +04:00
Artem.Arefev
90799356ab 89 password reset 2019-05-19 00:42:24 +04:00
Anton Romanov
d076f35ff7 fix user timetable url 2019-05-18 13:00:02 +04: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
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
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
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
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
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
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