ng-tracker/src/main/java/ru/ulstu
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
..
commit add java code 2018-05-04 17:08:20 +04:00
conference Merge remote-tracking branch 'remotes/origin/dev' into 104-module-test-conf 2019-05-15 01:28:08 +04:00
configuration #4--2 merge with dev 2019-04-11 22:37:32 +04:00
core #64 show global message 2019-04-23 23:15:22 +04:00
deadline #70 add hashCode for deadline 2019-05-02 14:51:22 +04:00
file #106 add checkstyle rules 2019-04-19 17:08:12 +04:00
grant #121 reduce paper title 2019-05-12 15:30:09 +04:00
index/controller #80 hide mvc controllers from api 2019-03-28 14:45:39 +04:00
name #111 fixes 2019-05-12 00:28:03 +04:00
odin #106 add checkstyle rules 2019-04-19 17:08:12 +04:00
odinexample add java code 2018-05-04 17:08:20 +04:00
paper #121 change Paper to PaperDto in attaching papers 2019-05-12 15:28:47 +04:00
ping #70 fixes 2019-05-02 14:35:40 +04:00
project #113 projects/projects edited 2019-04-23 23:32:40 +03:00
strategy/api move class 2018-11-11 12:43:27 +04:00
students #123 adding task timeline 2019-05-12 01:00:26 +04:00
tags #76 filters added 2019-04-18 23:15:32 +04:00
timeline Merge remote-tracking branch 'remotes/origin/dev' into 103-autotest-conf 2019-05-13 20:27:52 +04:00
user #76 fixing conflicts 2019-04-22 21:52:26 +04:00
NgTrackerApplication.java #4--2 merge with dev 2019-04-11 22:37:32 +04:00