Merge branch 'master' of C:\Users\катя\IdeaProjects\ng-tracker with conflicts.

src/main/resources/public/js/papers.js

@@ -62,6 +62,16 @@ function addPaper(title, status, comment, locked) {
     });
 }
 
+function filterPaper(authorId, year) {
+    var paperData = JSON.stringify({
+        "authors": title,
+        "": status
+    });
+    postToRest(urlPapers, paperData, function (data) {
+        alert(data);
+    });
+}
+
 function getPaperStatusClass(status) {
     switch (status) {
         case 'DRAFT':