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

124 Commits

Author SHA1 Message Date
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
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
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
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
Nightblade73
713e50043e Merge remote-tracking branch 'remotes/origin/dev' into 69-take-part-conf 
# Conflicts:
#	src/main/resources/db/changelog-master.xml
 2019-04-19 14:24:32 +04:00
Anton Romanov
5a55e3cfc8 Merge branch '42--2' into 'dev' 
Resolve "Форма добавления и фильтра участников гранта"

Closes #42

See merge request romanov73/ng-tracker!44
 2019-04-18 18:40:37 +00:00
ASH
59887e5141 #76 delete function added 2019-04-18 21:57:56 +04:00
Семенова Мария
a2dca6b7c6 Merge branch 'dev' into paper-latex-editing 
# Conflicts:
#	src/main/java/ru/ulstu/paper/model/Paper.java
#	src/main/java/ru/ulstu/paper/model/PaperDto.java
#	src/main/java/ru/ulstu/paper/service/PaperService.java
#	src/main/resources/db/changelog-master.xml
#	src/main/resources/templates/papers/paper.html
 2019-04-18 18:20:51 +04:00
Nightblade73
96431701df #69 added button disabling take part, if cur user already taken part 2019-04-18 15:38:45 +04:00
Nightblade73
8fd352aaa4 #69 added styles 2019-04-18 14:33:49 +04:00
T-Midnight
97d7d00098 #42 merge with dev 2019-04-17 13:30:14 +04:00
Anton Romanov
3facc0c26e Merge branch '74-students-add-new-task' into 'dev' 
Resolve "Добавление новой задачи"

Closes #78 and #74

See merge request romanov73/ng-tracker!47
 2019-04-16 09:36:58 +00:00
Anton Romanov
d81d1cf72c #74 some code fixes 2019-04-16 13:41:10 +04:00
Nightblade73
d4b38d314f #66 fixed bug, when attach-article lose what needed to attach after add or remove deadline 2019-04-16 13:22:15 +04:00
Nightblade73
909c657c89 #58 added delete confirm 2019-04-15 15:48:17 +04:00
ASH
1f36e04cd3 #74 fully adding tags 2019-04-14 21:24:22 +04:00
Nightblade73
8cfc64ea85 #55 added delete input style 2019-04-14 20:42:11 +04:00
Anton Romanov
cafb3abcee #4--2 merge with dev 2019-04-11 22:37:32 +04:00
Anton Romanov
b9af7c20c7 fix grids 2019-04-06 00:11:49 +04:00
T-Midnight
566b7821d1 #42 merge dev into 42 2019-04-04 09:43:26 +04:00
T-Midnight
8a7117d713 #42 Add leader and authors 2019-04-04 09:38:18 +04:00
Anton Romanov
c2dc080d23 Merge branch '71-add-task-layout' into 'dev' 
Resolve "Верстка страницы добавления новой задачи, ПУ и списка задач"

Closes #71

See merge request romanov73/ng-tracker!29
 2019-04-01 05:17:39 +00:00
Anton Romanov
e98445bb48 Merge branch '53-vyorstka-stranitsy-spiska-konferentsiy' into 'dev' 
Resolve "Вёрстка страницы списка конференций"

Closes #53

See merge request romanov73/ng-tracker!33
 2019-03-30 07:10:47 +00:00
Anton Romanov
103ff05846 fix displaying commits 2019-03-28 15:53:31 +03:00
Anton Romanov
539095c89e partially restored commits page 2019-03-28 14:59:35 +04:00
Nightblade73
01b082c31b #53 changed style like in module "papers" 2019-03-28 10:15:15 +04:00