Commit Graph

546 Commits

Author SHA1 Message Date
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
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
64357c2508 88 fixed changePassword request data 2019-05-17 04:35:33 +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
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
95fc9da47d lk base, created from dev 2019-05-15 00:49:54 +04:00
Nightblade73
11cab955b4 #104 test create 2019-05-14 18:51:03 +04:00
Nightblade73
c88c77cd7d #104 test find one dto 2019-05-14 18:20:01 +04:00
Nightblade73
a8d987b01f #104 test copy from dto method 2019-05-14 17:49:22 +04:00
Nightblade73
9da5fd8a7a #104 shock, the first unit test works 2019-05-14 00:02:30 +04:00
Anton Romanov
51851baa48 Merge branch '103-autotest-conf' into 'dev'
Resolve "Реализовать интеграционные автотесты для проверки модулей"

See merge request romanov73/ng-tracker!90
2019-05-13 19:46:29 +00:00
Anton Romanov
10a9bd7a28 Merge branch '111-unique-name-control-conf' into 'dev'
Resolve "Контроль уникальности названия"

See merge request romanov73/ng-tracker!86
2019-05-13 19:20:44 +00:00
Nightblade73
58a8495835 Merge remote-tracking branch 'remotes/origin/dev' into 103-autotest-conf
# Conflicts:
#	src/main/java/ru/ulstu/timeline/service/EventService.java
2019-05-13 20:27:52 +04:00
Nightblade73
ab59cb524e #103 fix code style 2019-05-13 20:26:13 +04:00
Nightblade73
6044d6f8e3 #111 save method refactor 2019-05-13 19:08:21 +04:00
Anton Romanov
a3afdeb988 Merge branch '123-student-task-timeline' into 'dev'
Resolve "Добавление таймлайна для дедлайнов задач"

Closes #123

See merge request romanov73/ng-tracker!91
2019-05-13 07:15:57 +00:00
T-Midnight
f6830d499b #121 update view 2019-05-12 15:31:50 +04:00
T-Midnight
99ec7af319 #121 reduce paper title 2019-05-12 15:30:09 +04:00
T-Midnight
e1907d3169 #121 change Paper to PaperDto in attaching papers 2019-05-12 15:28:47 +04:00
ASH
5b4180e685 #123 fixing layout 2019-05-12 11:04:43 +04:00
ASH
a11e10dec4 #123 adding task timeline 2019-05-12 01:00:26 +04:00
Nightblade73
d846192046 #111 fixes 2019-05-12 00:28:03 +04:00
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
2019-05-11 23:26:21 +04:00
ASH
c59bb45c70 #79 fixing codestyle 2019-05-11 23:06:30 +04:00
ASH
0de34c89fe #79 fixing planner and year generation 2019-05-11 22:58:57 +04:00
Nightblade73
6edcf8f594 #103 add sort and filter test, fixed delete conference, if it has fk with event 2019-05-10 23:36:07 +04:00
Nightblade73
4e4e7ae194 #103 add paper transition 2019-05-10 20:54:43 +04:00