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

146 Commits

Author SHA1 Message Date
Васин Антон
4bb4fd6bca #98 changelog edited 2019-05-27 09:35:58 +03:00
Семенова Мария
43e7b9fe1f Merge branch 'dev' into 127-paper-references 2019-05-24 16:14:02 +04:00
Artem.Arefev
8bb9e3a844 #89 jquery 2019-05-24 01:52:50 +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
Семенова Мария
7c1b124c94 #127 references tab, crud 2019-05-23 15:48:46 +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
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
Васин Антон
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
64357c2508 88 fixed changePassword request data 2019-05-17 04:35:33 +04:00
Artem.Arefev
052e4a1aef 88 rest changePassword + ajax 2019-05-17 03:55:22 +04:00
Nightblade73
dc34c7bfb7 #104 fixed conference-row style 2019-05-16 18:07:18 +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
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
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
Nightblade73
4e4e7ae194 #103 add paper transition 2019-05-10 20:54:43 +04:00
Nightblade73
cad8682088 #103 add adding article 2019-05-10 20:07:55 +04:00
Васин Антон
4025aa67ca #98 project completion added 2019-05-06 21:51:58 +03:00
ASH
65dea9bce2 #79 adding task planer generation 2019-05-06 22:39:08 +04: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
a69a257f09 #38 add styles 2019-04-30 23:43:47 +04:00
ASH
7ce8b20841 #79 fixing bug 2019-04-30 22:05:57 +04:00
Nightblade73
0e8752e460 #70 style fixes 2019-04-27 20:34:49 +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
7853496048 #116 add style for delete icon 2019-04-25 13:26:40 +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
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
Васин Антон
50a0f8aa78 #113 projects.js added 2019-04-23 23:19:25 +03:00
Anton Romanov
8f2f6adc3b #64 show global message 2019-04-23 23:15:22 +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
Nightblade73
53cc777734 #64 delete conference refactor 2019-04-22 21:46:42 +04:00
ASH
6876d09557 #76 adding style to filters 2019-04-21 19:02:27 +04:00
ASH
8400c5d40d Merge remote-tracking branch 'remotes/origin/dev' into 76-students-tags-filter 
# Conflicts:
#	src/main/resources/templates/students/dashboard.html
 2019-04-21 15:47:56 +04:00
Nightblade73
338d7c2e09 #59 added begin-end dates in conferenceRow 2019-04-19 18:32:24 +04:00
Nightblade73
34033fac5f #59 added filtration 2019-04-19 17:36:46 +04:00