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
..
commit	add java code	2018-05-04 17:08:20 +04:00
conference	Merge remote-tracking branch 'remotes/origin/dev' into 68-ping-conf	2019-04-24 22:41:48 +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	#62 fix remove deadline in other JPA operation	2019-04-13 22:59:59 +04:00
file	#106 add checkstyle rules	2019-04-19 17:08:12 +04:00
grant	#116 add removeDeadline method	2019-04-25 13:25:32 +04:00
index/controller	#80 hide mvc controllers from api	2019-03-28 14:45:39 +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	Merge branch '64-add-article-conf' into 'dev'	2019-04-24 09:35:08 +00:00
ping	#68 added ping in db	2019-04-24 21:24:32 +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	#76 adding sorting	2019-04-24 01:03:56 +04:00
tags	#76 filters added	2019-04-18 23:15:32 +04:00
timeline	#18 add paper events	2019-03-28 12:40:10 +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