romanov73/ng-tracker
1
0
Fork 0
Code Issues 18 Pull Requests 4 Projects Releases Wiki Activity
815 Commits 15 Branches 1 Tag
Commit Graph

321 Commits

Author SHA1 Message Date
Artem.Arefev
728fa42972 87 error handling 2019-05-17 02:01:26 +04:00
Nightblade73
5263393379 #104 remove chart example from dashboard 2019-05-16 17:55:34 +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
Artem.Arefev
11ef644e5e 88 inviting user base 2019-05-15 02:48:44 +04:00
Artem.Arefev
95fc9da47d lk base, created from dev 2019-05-15 00:49:54 +04: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
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
ASH
5b4180e685 #123 fixing layout 2019-05-12 11:04:43 +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
0de34c89fe #79 fixing planner and year generation 2019-05-11 22:58:57 +04:00
Семенова Мария
2fba252df0 #109 show other paper attachs 2019-05-07 23:53:10 +04:00
Васин Антон
4025aa67ca #98 project completion added 2019-05-06 21:51:58 +03:00
Васин Антон
4bab980f62 #98 deadline model and service edited 2019-05-06 20:17:10 +03:00
Васин Антон
ee55e08fee #98 project tasks deadline edited 2019-05-06 17:43:20 +03:00
Anton Romanov
68737b976f Merge branch '117-filter-users' into 'dev' 
Resolve "Фильтрация участников гранта по двум новым параметрам"

Closes #117

See merge request romanov73/ng-tracker!77
 2019-05-03 05:58:19 +00:00
T-Midnight
8b333ab3a6 Merge branch '38-attach-file-grants' into 117-filter-users 2019-05-02 21:29:20 +04:00
T-Midnight
6442a67ff1 #38 update view 2019-04-30 23:41:51 +04:00
Nightblade73
0e8752e460 #70 style fixes 2019-04-27 20:34:49 +04:00
Nightblade73
e178cd1639 #70 added checking empty fields of deadline, fix bug on EventDto 2019-04-27 09:45:47 +04:00
T-Midnight
51e121ae24 #117 add BAK papers filter 2019-04-26 00:29:20 +04:00
Nightblade73
c489ebbf91 #70 added create notification for all users about new conference 2019-04-25 17:12:39 +04:00
Anton Romanov
88ec35faa0 Merge branch '68-ping-conf' into 'dev' 
Resolve "Ping конференции в списке конференций"

Closes #68

See merge request romanov73/ng-tracker!69
 2019-04-25 10:00:34 +00:00
T-Midnight
2bb5189fff #116 update view 2019-04-25 13:25:56 +04:00
Nightblade73
bc73265109 Merge remote-tracking branch 'remotes/origin/dev' into 68-ping-conf 
# Conflicts:
#	src/main/java/ru/ulstu/conference/repository/ConferenceRepository.java
#	src/main/java/ru/ulstu/conference/service/ConferenceService.java
#	src/main/resources/db/changelog-master.xml
 2019-04-24 22:41:48 +04:00
Nightblade73
b77619777e #68 added dashboard-card styles depending on the conference.ping count 2019-04-24 22:34:56 +04:00
Nightblade73
70d260c34b #68 ping but style 2019-04-24 21:52:13 +04:00
Nightblade73
d921def09d #68 added ping method 2019-04-24 21:05:25 +04:00
Nightblade73
f556b969b4 #68 added demo version of charts, using highcharts lib 2019-04-24 18:55:52 +04:00
Anton Romanov
bb2518e5f4 Merge branch '76-students-tags-filter' into 'dev' 
Resolve "Фильтр задач по типу (тегам)"

Closes #77, #75, and #76

See merge request romanov73/ng-tracker!61
 2019-04-24 09:36:03 +00:00
Anton Romanov
1e6fbdc1fa Merge branch '64-add-article-conf' into 'dev' 
Resolve "Добавить новую статью к конференции"

Closes #64

See merge request romanov73/ng-tracker!70
 2019-04-24 09:35:08 +00:00
Anton Romanov
54c6fe815d Merge branch '113-delete-project' into 'dev' 
Resolve "Реализовать удаление проекта"

Closes #113

See merge request romanov73/ng-tracker!71
 2019-04-24 09:34:12 +00:00
Nightblade73
fe55890518 #64 more style fixes 2019-04-24 10:12:42 +04:00
Nightblade73
7eb5dce94e #64 style fixes 2019-04-24 09:42:00 +04:00
ASH
7248a84c30 #76 adding sorting 2019-04-24 01:03:56 +04:00
Васин Антон
02d643727e #113 projects/projects edited 2019-04-23 23:32:40 +03:00
Васин Антон
2418e953be #113 line fragment edited 2019-04-23 23:15:52 +03:00
Васин Антон
e32da7c7c2 #113 delete function 2019-04-23 23:11:45 +03:00
Anton Romanov
8f2f6adc3b #64 show global message 2019-04-23 23:15:22 +04:00
T-Midnight
bf515a3fcb Merge remote-tracking branch 'remotes/origin/107-attach-article' into 115-follow-up-from-resolve 2019-04-23 21:47:54 +04:00
Васин Антон
c78ea05255 #114 update edited 2019-04-23 14:11:42 +03:00
T-Midnight
26969dba5b #107 merge with dev 2019-04-23 15:02:41 +04:00
T-Midnight
6df1a87367 #107 merge with dev 2019-04-23 15:01:47 +04:00
T-Midnight
546b0dc323 #107 add styles 2019-04-23 14:51:51 +04:00
Васин Антон
41bd00d645 project dashboard edited 2019-04-23 13:40:11 +03:00
Nightblade73
6d6ea3136d #64 dont show error message 2019-04-23 13:37:56 +04:00
T-Midnight
d3b8be2cf1 #107 add view of the selected papers 2019-04-23 13:21:13 +04:00
Васин Антон
019fe7c652 #97 adding deadlines 2019-04-23 10:32:23 +03:00