ASH
|
cd1caa559e
|
Merge branch 'dev' into 79-students-tags-generation
# Conflicts:
# src/main/java/ru/ulstu/students/service/TaskService.java
|
2019-05-16 00:14:05 +04:00 |
|
ASH
|
5b4180e685
|
#123 fixing layout
|
2019-05-12 11:04:43 +04:00 |
|
ASH
|
0de34c89fe
|
#79 fixing planner and year generation
|
2019-05-11 22:58:57 +04:00 |
|
ASH
|
7248a84c30
|
#76 adding sorting
|
2019-04-24 01:03:56 +04:00 |
|
ASH
|
6876d09557
|
#76 adding style to filters
|
2019-04-21 19:02:27 +04:00 |
|
ASH
|
1f36e04cd3
|
#74 fully adding tags
|
2019-04-14 21:24:22 +04:00 |
|
ASH
|
af3c0c0faa
|
#71 fixing layout n adding
|
2019-03-26 10:49:26 +04:00 |
|
ASH
|
bd975c53f3
|
#71 adding pages and layout
|
2019-03-11 22:46:51 +04:00 |
|