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

..

commit

add java code

2018-05-04 17:08:20 +04:00

conference

#70 fixes

2019-05-02 14:35:40 +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

Merge branch 'dev' into 79-students-tags-generation

2019-05-11 23:26:21 +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

#109 show other paper attachs

2019-05-07 23:53:10 +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

#79 fixing codestyle

2019-05-11 23:06:30 +04:00

tags

#79 fixing planner and year generation

2019-05-11 22:58:57 +04:00

timeline

#32 add deadlines on timeline page

2019-05-06 00:32:28 +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