Commit Graph

  • 600d58d416 Merge branch '20-' into 'master' Anton Romanov 2018-11-10 21:44:36 +0000
  • 190591c031 fix scheduler #142 Anton Romanov 2018-11-11 01:31:27 +0400
  • f0ac06c900 refactor and db changes Anton Romanov 2018-11-11 01:29:06 +0400
  • 7cffbef9e2 delete paper Anton Romanov 2018-11-10 23:15:35 +0400
  • 4da039f9b0 Create dashboard for grants T-Midnight 2018-11-10 21:55:09 +0400
  • e3b248778c add route Anton Romanov 2018-11-10 21:43:52 +0400
  • 376c820b44 fix Alyona 2018-11-10 20:28:17 +0400
  • e76e7ad864 fix Alyona 2018-11-09 15:43:42 +0400
  • 2db572f284 Задача №10 Elena 2018-11-09 15:43:25 +0400
  • d5f9a81b46 remove styles from email template Anton Romanov 2018-11-09 15:37:58 +0400
  • 7efb9a2926 Merge remote-tracking branch 'origin/master' Alyona 2018-11-09 15:29:48 +0400
  • 6aa5f807b7 move styles to body Anton Romanov 2018-11-09 15:21:03 +0400
  • f5e80d7e3c Merge branch '21-Event-status' into 'master' Anton Romanov 2018-11-09 11:15:00 +0000
  • 1b53debc88 Merge branch 'master' into 21-Event-status #141 Anton Romanov 2018-11-09 15:08:10 +0400
  • 5c54817fc6 fix styles Anton Romanov 2018-11-09 15:05:39 +0400
  • 1211b0db29 add styles in email templates Anton Romanov 2018-11-09 14:53:24 +0400
  • 392b2a9657 added period event Alyona 2018-11-09 14:51:19 +0400
  • 25707db6cd added period event Alyona 2018-11-09 14:48:21 +0400
  • 0f9bbc13cc Merge branch 'master' into 10-savePaper Elena 2018-11-09 13:43:08 +0400
  • 65d788512b Задача №10 Elena 2018-11-09 13:42:28 +0400
  • f449eeb999 Merge remote-tracking branch 'origin/master' Alyona 2018-11-09 13:30:31 +0400
  • 67881262be add notification templates Anton Romanov 2018-11-09 10:04:50 +0400
  • 2bf84dc286 move to notification service Anton Romanov 2018-11-09 09:16:24 +0400
  • 34d7927d30 fix scheduler code to use service Anton Romanov 2018-11-09 08:39:00 +0400
  • cd09cf6d60 add toolbar Anton Romanov 2018-11-08 21:58:10 +0400
  • e554f9ea4c fix paths Anton Romanov 2018-11-08 20:34:09 +0400
  • 4c43776528 add config parameter Anton Romanov 2018-11-08 20:08:26 +0400
  • 1958e01d01 Merge remote-tracking branch 'origin/master' Anton Romanov 2018-11-08 19:39:22 +0400
  • bd78be93ab add paper create strategy Anton Romanov 2018-11-08 19:36:50 +0400
  • 6c492fa955 Update README.md Anton Romanov 2018-11-06 10:39:25 +0000
  • def4f97784 fix ci Anton Romanov 2018-11-06 14:10:00 +0400
  • 42fb1a1537 fix imports Anton Romanov 2018-11-01 12:53:19 +0400
  • 8fe9f6625c changelog Alyona 2018-10-31 20:06:27 +0400
  • 0b2824cee6 Merge branch 'master' into 21-Event-status Alyona 2018-10-31 19:35:23 +0400
  • 0341a823d2 Merge branch 'master' of C:\Users\катя\IdeaProjects\ng-tracker with conflicts. Alyona 2018-10-31 19:33:21 +0400
  • 92d3067dd3 added event status Alyona 2018-10-30 23:59:42 +0400
  • 9013baa209 Merge branch '4-show-time-line' into 'master' Anton Romanov 2018-10-30 19:32:00 +0000
  • d721907c24 Merge branch 'master' into 4-show-time-line #129 Anton Romanov 2018-10-30 23:29:18 +0400
  • 02499c0aae fix db Anton Romanov 2018-10-30 23:26:55 +0400
  • 128b147bf2 Revert "remove liquibase" Anton Romanov 2018-10-30 23:07:01 +0400
  • 679756b02b Merge remote-tracking branch 'origin/4-show-time-line' into 4-show-time-line Anton Romanov 2018-10-30 23:04:49 +0400
  • 4e7c0259d4 Revert "remove liquibase" Anton Romanov 2018-10-30 23:04:21 +0400
  • 5766bdadbc Merge branch '11-Message-about-deadlines' into 'master' Anton Romanov 2018-10-27 21:00:43 +0000
  • 40c668905f Merge branch '12-' into 'master' Anton Romanov 2018-10-27 21:00:01 +0000
  • 5af8cb1bd3 fix #140 Alyona 2018-10-28 00:33:00 +0400
  • b3f8b334ef fix Alyona 2018-10-28 00:26:09 +0400
  • d1e6e80f87 fix #139 Alyona 2018-10-28 00:17:16 +0400
  • 450cb92d01 fix Alyona 2018-10-28 00:15:42 +0400
  • d0f40da30e fix Alyona 2018-10-27 23:50:12 +0400
  • 92f86e70c9 fix Alyona 2018-10-27 23:46:49 +0400
  • afd854e0cb - make scheduler as a service - reformat code - fix cyrillic letter Anton Romanov 2018-10-27 23:25:27 +0400
  • 7388b2cb27 add database column Anton Romanov 2018-10-27 23:16:14 +0400
  • 7f54394b44 class for send messages about update paper Alyona 2018-10-27 23:11:07 +0400
  • 61c19e5b87 add deadlineSсheduler Alyona 2018-10-27 22:32:51 +0400
  • 43740981f2 add deadlineDate to models Alyona 2018-10-27 22:24:10 +0400
  • 5e7cff8ac6 some fix Anton Romanov 2018-10-25 10:27:57 +0400
  • ed2554216d Merge branch '8-' into 'master' #138 Anton Romanov 2018-10-25 04:59:51 +0000
  • 75c33bb065 finish deadline #135 Alyona 2018-10-25 08:53:48 +0400
  • 4f49e7ae32 finish deadline Alyona 2018-10-25 08:53:29 +0400
  • 92b807f6b9 Merge branch 'master' into 8-Deadline Alyona 2018-10-25 08:44:25 +0400
  • cd6b82f892 partially add deadline Alyona 2018-10-25 08:41:37 +0400
  • 5c0de4bcf4 Merge branch '7-dates-Matveeva' into 'master' Anton Romanov 2018-10-18 07:25:58 +0000
  • 275348563d use html5 datetime pickers #137 Anton Romanov 2018-10-18 11:21:26 +0400
  • 29f836fcc8 Задача №7 Elena 2018-10-18 10:38:04 +0400
  • f9c977177a Merge branch '6-authors-list-Matveeva' into 'master' Anton Romanov 2018-10-18 04:49:10 +0000
  • 76666912d7 fix buttons size Anton Romanov 2018-10-11 19:49:16 +0400
  • 47e906fddc fix styles Anton Romanov 2018-10-11 15:39:57 +0400
  • e163529d66 load paper statuses Anton Romanov 2018-10-11 10:03:44 +0400
  • 2464915b62 fix progress background Anton Romanov 2018-10-11 09:05:41 +0400
  • b1c98aba45 Задача №6 #136 Elena 2018-10-10 23:09:45 +0400
  • 89f4b04a3f Merge branch '5-' into 'master' Anton Romanov 2018-10-10 13:18:24 +0000
  • 0219b0ce28 fix paper view #132 Anton Romanov 2018-10-10 17:05:54 +0400
  • 31c7c8571e Задача №5 new Elena 2018-10-10 15:30:47 +0400
  • 95e366ca20 Merge branch 'master' into 5-Matveeva-Page Elena 2018-10-10 10:09:07 +0400
  • f9f287c190 Задача №5 Elena 2018-10-04 10:39:27 +0400
  • 2a493205f3 Merge branch '27-file-upload' into 'master' Anton Romanov 2018-10-02 07:46:40 +0000
  • 7db839aee9 Merge branch 'master' into 27-file-upload #134 Anton Romanov 2018-10-02 11:11:13 +0400
  • bf73be3b70 add messages Anton Romanov 2018-10-02 10:58:41 +0400
  • dd5ab38c40 add example for file uploading Anton Romanov 2018-10-01 13:54:11 +0400
  • a9f4e51558 minimize scripts Anton Romanov 2018-09-29 09:22:48 +0400
  • 4009a5cf2b fix error pages Anton Romanov 2018-09-27 21:32:16 +0400
  • f7bb4a2c74 Merge branch 'refactor-ui' into 'master' Anton Romanov 2018-09-27 16:01:02 +0000
  • a3668ddcd3 move pages #133 Anton Romanov 2018-09-27 12:11:25 +0400
  • 550cc4cdf3 some refactor Anton Romanov 2018-09-27 10:35:22 +0400
  • 7c8fa2b42a Merge branch '3-ui' into 'master' Anton Romanov 2018-09-27 06:08:53 +0000
  • 879f388e66 Merge branch 'master' into 3-ui #128 Anton Romanov 2018-09-27 10:03:00 +0400
  • 948305e4d9 Merge branch 'master' into 3-ui Anton Romanov 2018-09-27 10:02:49 +0400
  • fae5666694 Merge branch 'master' into 5-Page-of-paper Alyona 2018-09-26 16:44:36 +0400
  • 5b16ac785c Merge branch 'master' into 23-dashboard Alyona 2018-09-26 16:41:33 +0400
  • f00a156c45 Merge branch '23-dashboard' into 'master' Anton Romanov 2018-09-26 12:22:38 +0000
  • 0814081187 Merge branch 'master' into 23-dashboard #131 Alyona 2018-09-26 16:11:43 +0400
  • e4e37454ed Merge branch 'master' into 23-dashboard Alyona 2018-09-26 16:11:19 +0400
  • 48d3b57503 add paper page Alyona 2018-09-26 16:04:31 +0400
  • 5f4e63b96f Merge branch '24-paper-page' into 'master' Anton Romanov 2018-09-26 11:55:20 +0000
  • a93a19bcfe Alyona-Test Alyona 2018-09-25 17:13:01 +0400
  • 5c0e06e6b5 Тестовое задание #130 Elena 2018-09-25 16:45:01 +0400
  • 88f42e90b5 Update README.md Anton Romanov 2018-09-22 06:56:33 +0000
  • 1af2f9645a change ports Anton Romanov 2018-09-08 10:19:21 +0400
  • d42c6ece7e Merge remote-tracking branch 'origin/4-show-time-line' into 4-show-time-line Anton Romanov 2018-09-08 10:07:21 +0400
  • 0ce90e2780 Merge branch 'master' into 4-show-time-line Anton Romanov 2018-09-08 09:54:14 +0400