12 Commits

Author SHA1 Message Date
arefiev1997
48d7131593 gl_88 inviting user 2019-05-13 03:16:37 +04:00
Anton Romanov
7684bac74d Merge branch 'dev' into move-to-jdk11
# Conflicts:
#	build.gradle
#	src/main/java/ru/ulstu/grant/model/GrantDto.java
#	src/main/java/ru/ulstu/grant/service/GrantService.java
#	src/main/java/ru/ulstu/paper/model/PaperDto.java
#	src/main/java/ru/ulstu/project/model/Project.java
2019-04-23 11:35:41 +04:00
Anton Romanov
cafb3abcee #4--2 merge with dev 2019-04-11 22:37:32 +04:00
Anton Romanov
1487affb8e #73 fix deprecated annotations and classes 2019-03-20 19:20:28 +04:00
Anton Romanov
e74261184f #73 first fixes by update versions 2019-03-20 14:37:57 +04:00
Anton Romanov
48894b2176 display user in filter 2019-03-12 13:40:48 +04:00
Anton Romanov
da7a17ee49 add service methods 2019-03-12 12:51:59 +03:00
Anton Romanov
112958a70b fix code 2018-11-14 15:18:22 +04:00
Anton Romanov
67881262be add notification templates 2018-11-09 10:04:50 +04:00
Anton Romanov
bd78be93ab add paper create strategy 2018-11-08 19:36:50 +04:00
Anton Romanov
aa919906aa add event controller 2018-06-10 01:12:28 +04:00
Anton Romanov
671cfdd486 add java code 2018-05-04 17:08:20 +04:00