Artem.Arefev
|
53307c6add
|
#95 init
|
2019-05-31 22:42:59 +04:00 |
|
Artem.Arefev
|
a405267092
|
merged with dev
|
2019-05-31 22:42:19 +04:00 |
|
Anton Romanov
|
a878f8c22c
|
fix remove older events
|
2019-05-31 09:06:21 +04:00 |
|
Anton Romanov
|
d2ce6d604e
|
fix merging collection
|
2019-05-31 08:46:21 +04:00 |
|
Anton Romanov
|
b4b7b9087e
|
fix npe
|
2019-05-31 08:12:57 +04:00 |
|
a.vasin
|
a7b48e1534
|
#101 project tests
|
2019-05-31 02:23:15 +04:00 |
|
a.vasin
|
9388302a47
|
#101 project tests
|
2019-05-31 01:08:40 +04:00 |
|
Artem.Arefev
|
e680aa30c4
|
#112 ping activity
|
2019-05-31 00:33:21 +04:00 |
|
a.vasin
|
4498b71259
|
#101 project tests
|
2019-05-30 09:53:27 +04:00 |
|
a.vasin
|
632c6299b7
|
#101 files attach modified
|
2019-05-30 00:08:13 +04:00 |
|
a.vasin
|
9013d79228
|
#101 grant attach
|
2019-05-29 23:40:30 +04:00 |
|
a.vasin
|
192adbfa0b
|
#101 no projects message
|
2019-05-29 18:40:14 +04:00 |
|
a.vasin
|
eb30d07d10
|
#101 project deadlines on timeline
|
2019-05-29 18:27:34 +04:00 |
|
a.vasin
|
eceb8ec528
|
#101 project model edited
|
2019-05-29 17:52:15 +04:00 |
|
|
|
f0e4121d1d
|
try-vue: add some examples of validataion via veevalidate
|
2019-05-29 00:59:58 +04:00 |
|
|
|
528fb87f77
|
try-vue: vuelidate is not exists in webjar format, so try use only VeeValidate
|
2019-05-28 22:44:33 +04:00 |
|
|
|
fde4ef58d9
|
try-vue: add test pages for validators
|
2019-05-28 22:28:14 +04:00 |
|
Васин Антон
|
77ce908d58
|
#98 deadline edited
|
2019-05-28 16:55:08 +03:00 |
|
Васин Антон
|
8ffafd6693
|
#98 deadline imports edited
|
2019-05-28 16:46:12 +03:00 |
|
Васин Антон
|
e967e2bfee
|
Merge branch 'dev' of https://gitlab.com/romanov73/ng-tracker into 98-project-tasks
|
2019-05-28 16:17:37 +03:00 |
|
Васин Антон
|
c25392337a
|
#98 project deadlines edited
|
2019-05-28 16:16:41 +03:00 |
|
a.vasin
|
3b0a2dd964
|
#98 executors list added
|
2019-05-28 11:12:27 +04:00 |
|
a.vasin
|
8d1e410e83
|
Merge branch 'dev' of gitlab.com:romanov73/ng-tracker into 98-project-tasks
|
2019-05-28 00:41:15 +04:00 |
|
a.vasin
|
eb87c6d52f
|
#98 project statuses edited
|
2019-05-28 00:40:36 +04:00 |
|
Artem.Arefev
|
a35bcfce1b
|
#112 merged with dev
|
2019-05-27 22:47:01 +04:00 |
|
Artem.Arefev
|
c4b35ddf6a
|
#91 merged with dev
|
2019-05-27 21:53:55 +04:00 |
|
Васин Антон
|
7388e12e3f
|
#98 edited project executors
|
2019-05-27 18:19:31 +03:00 |
|
Anton Romanov
|
10d560623d
|
add moment
|
2019-05-27 18:02:05 +04:00 |
|
Anton Romanov
|
4fefa39f7b
|
authors multiselect
|
2019-05-27 16:23:17 +04:00 |
|
Anton Romanov
|
6e584975e4
|
Merge remote-tracking branch 'origin/try-vue' into try-vue
# Conflicts:
# src/main/java/ru/ulstu/paper/controller/PaperController.java
# src/main/java/ru/ulstu/paper/service/PaperService.java
|
2019-05-27 15:10:51 +04:00 |
|
Anton Romanov
|
8187c9b614
|
merge dev
|
2019-05-27 15:08:45 +04:00 |
|
Васин Антон
|
4bb4fd6bca
|
#98 changelog edited
|
2019-05-27 09:35:58 +03:00 |
|
Васин Антон
|
4eeb79ab80
|
#98 changelog edited
|
2019-05-27 09:19:52 +03:00 |
|
Anton Romanov
|
336a16ff73
|
some refactor
|
2019-05-27 09:14:24 +04:00 |
|
Artem.Arefev
|
0e7fdac980
|
Merge remote-tracking branch 'origin/dev' into 91-users-info
|
2019-05-27 00:42:54 +04:00 |
|
Artem.Arefev
|
482e2b3595
|
#112 base ping activities
|
2019-05-27 00:42:43 +04:00 |
|
Anton Romanov
|
280c39dae4
|
#120 fix variable
|
2019-05-25 21:32:20 +04:00 |
|
Anton Romanov
|
828d320e0f
|
#120 try to run test in docker
|
2019-05-25 21:16:26 +04:00 |
|
Anton Romanov
|
678397e970
|
#120 test classes refactor
|
2019-05-25 21:15:54 +04:00 |
|
Anton Romanov
|
916bbae414
|
#120 add debug email
|
2019-05-25 21:15:21 +04:00 |
|
Anton Romanov
|
477a9fd6ff
|
#120 move to service
|
2019-05-25 15:48:32 +04:00 |
|
Anton Romanov
|
59d6edb818
|
#120 refactor
|
2019-05-25 15:42:08 +04:00 |
|
Artem.Arefev
|
f4479c2ab7
|
#91 fixed app properties
|
2019-05-25 14:11:57 +04:00 |
|
Artem.Arefev
|
193b2b3a32
|
#91 using RestTemplate & show error on timetable loading exception
|
2019-05-25 14:03:43 +04:00 |
|
Anton Romanov
|
837a9f465c
|
#120 merge dev
|
2019-05-25 12:39:44 +04:00 |
|
Семенова Мария
|
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
|
308da4113d
|
fix week number calculation
|
2019-05-24 13:26: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
|
505a054cc8
|
Merge remote-tracking branch 'origin/dev' into 91-users-info
|
2019-05-24 01:53:54 +04: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 |
|
Anton Romanov
|
181086c9db
|
#120 disable start browser on run application
|
2019-05-23 16:36:48 +04:00 |
|
ASH
|
82e454a50b
|
#104 mod tests generate task
|
2019-05-23 16:17:04 +04:00 |
|
Anton Romanov
|
c303d65c8d
|
#120 move to services
|
2019-05-23 16:02:44 +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 |
|
T-Midnight
|
47131f1fb7
|
#103 add tests for papers
|
2019-05-23 13:43:18 +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 |
|
T-Midnight
|
3e9bbb3584
|
#103 create tests for create, update and delete functions
|
2019-05-22 23:15:04 +04:00 |
|
T-Midnight
|
16885cc94f
|
#103 update overriding method
|
2019-05-22 23:12:30 +04:00 |
|
T-Midnight
|
ecda92326b
|
#103 create blank classes
|
2019-05-22 16:04:51 +04:00 |
|
T-Midnight
|
457f1da985
|
#120 fix checkRun and checkStyle
|
2019-05-22 15:45:23 +04:00 |
|
T-Midnight
|
5f214620bf
|
#120 use loading from kias
|
2019-05-22 15:16:20 +04:00 |
|
T-Midnight
|
c21739bfc6
|
#120 parse kias page
|
2019-05-22 15:12:45 +04:00 |
|
T-Midnight
|
bab621677e
|
#120 add methods for checking unique title and date of grant
|
2019-05-22 15:10:51 +04:00 |
|
Nightblade73
|
8b52518c4a
|
#125 check method
|
2019-05-21 15:53:42 +04:00 |
|
Artem.Arefev
|
d7c4e6b222
|
#91 base users dashboard
|
2019-05-21 02:09:07 +04:00 |
|
T-Midnight
|
bb9f412480
|
#120 check unique grant name
|
2019-05-20 20:49:03 +04:00 |
|
T-Midnight
|
c0e66e81a2
|
#120 drop unnecessary table column
|
2019-05-20 20:47:10 +04:00 |
|
T-Midnight
|
1823c1ba50
|
#120 create kias page
|
2019-05-20 18:37:24 +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 |
|
Васин Антон
|
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 |
|
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 |
|
