Commit Graph

  • 3d4a7b09f3 show status Anton Romanov 2018-12-04 14:48:39 +04:00
  • dfe44ab842 add validation Anton Romanov 2018-12-04 14:13:01 +04:00
  • f9670ad0a5 pass values for paper Anton Romanov 2018-12-04 11:35:51 +04:00
  • f376fedc64 load paper Anton Romanov 2018-11-26 23:07:14 +04:00
  • aee396f686 Merge branch '14-filter-frontend' into 'master' Anton Romanov 2018-11-23 16:40:15 +00:00
  • 13f9081aee fix failed commit #145 Anton Romanov 2018-11-23 20:37:24 +04:00
  • d2d2a7ae71 Merge branch '10-savePaper' into 'master' Anton Romanov 2018-11-23 16:24:26 +00:00
  • 5fa5d670a5 show paper list in mvc Anton Romanov 2018-11-23 16:45:40 +04:00
  • f5068f8be9 filter Alyona 2018-11-23 14:17:16 +04:00
  • a9ea796bbb Merge branch 'master' into 14-filter-frontend Alyona 2018-11-23 14:12:37 +04:00
  • df6bc223aa Merge remote-tracking branch 'origin/master' Alyona 2018-11-23 14:10:49 +04:00
  • 5eff1bac81 Merge branch 'master' of C:\Users\катя\IdeaProjects\ng-tracker with conflicts. Alyona 2018-11-23 14:10:36 +04:00
  • 8fc6d3b569 задача 10(new) #143 Elena 2018-11-23 14:05:23 +04:00
  • 51e84e22a6 задача 10 Elena 2018-11-23 13:53:20 +04:00
  • fe6e52a19c Merge branch 'master' into 10-savePaper Elena 2018-11-23 12:39:36 +04:00
  • e84e542309 fix colors Anton Romanov 2018-11-22 21:48:36 +04:00
  • 7f1fb168e1 fix colors Anton Romanov 2018-11-22 21:31:41 +04:00
  • 4163276da3 add paper status Anton Romanov 2018-11-22 21:06:58 +04:00
  • 1b2db5b5d4 Merge remote-tracking branch 'origin/master' Anton Romanov 2018-11-22 11:20:08 +04:00
  • ccd07305ec add mertica Anton Romanov 2018-11-22 11:19:50 +04:00
  • 724dd6a78a remove empty page Anton Romanov 2018-11-21 15:47:26 +04:00
  • 161fab55de add toolbar Anton Romanov 2018-11-21 15:47:14 +04:00
  • 0aec0c3c8e Merge remote-tracking branch 'origin/master' Anton Romanov 2018-11-21 15:42:20 +04:00
  • 908bf814ce Merge branch '31-' into 'master' Anton Romanov 2018-11-21 11:42:47 +00:00
  • 29586c9313 close failed papers Anton Romanov 2018-11-21 15:40:20 +04:00
  • f6647d6752 Create grant page #147 T-Midnight 2018-11-21 15:28:41 +04:00
  • 4e3e882f76 Merge branch '30-main-grants-page' into 'master' Anton Romanov 2018-11-21 08:51:11 +00:00
  • ef32bba684 Merge remote-tracking branch 'origin/master' Anton Romanov 2018-11-21 12:46:42 +04:00
  • 6314ca6ec5 notify if paper deadline in future Anton Romanov 2018-11-21 12:46:27 +04:00
  • d13644d67d Update dashboard for grants #144 T-Midnight 2018-11-19 12:16:39 +04:00
  • 58299d749d fix for remove event Anton Romanov 2018-11-19 08:21:22 +04:00
  • 2dc0b4e27c fix event create conditions Anton Romanov 2018-11-19 07:46:02 +04:00
  • 6adc96761b fix delete button Anton Romanov 2018-11-18 14:29:41 +04:00
  • 9a0fa5a170 fix delete button Anton Romanov 2018-11-17 12:31:22 +04:00
  • 2d78753b06 show events Anton Romanov 2018-11-17 11:56:52 +04:00
  • c774820d95 fix build script for netbeans Anton Romanov 2018-11-14 17:14:56 +04:00
  • ec9009be10 show toolbar buttons Anton Romanov 2018-11-14 17:04:40 +04:00
  • 74d9c5cd20 show toolbar buttons Anton Romanov 2018-11-14 17:04:29 +04:00
  • 863991953c show paper status Anton Romanov 2018-11-14 17:04:13 +04:00
  • f587f80eb6 fix code Anton Romanov 2018-11-14 17:03:22 +04:00
  • 112958a70b fix code Anton Romanov 2018-11-14 15:18:22 +04:00
  • 06864c7ec8 read dashboard Anton Romanov 2018-11-14 15:15:23 +04:00
  • 02f762b4f1 filter Alyona 2018-11-14 08:55:46 +04:00
  • eaf03daba3 Merge branch '14-DB-filter' into 'master' Anton Romanov 2018-11-13 11:46:25 +00:00
  • 2a76acc7ad filter papers #146 Anton Romanov 2018-11-13 15:41:18 +04:00
  • 4c0ccbe285 Merge remote-tracking branch 'origin/master' Anton Romanov 2018-11-11 14:28:51 +04:00
  • 9380b74f67 move class Anton Romanov 2018-11-11 12:43:27 +04:00
  • 600d58d416 Merge branch '20-' into 'master' Anton Romanov 2018-11-10 21:44:36 +00:00
  • 190591c031 fix scheduler #142 Anton Romanov 2018-11-11 01:31:27 +04:00
  • f0ac06c900 refactor and db changes Anton Romanov 2018-11-11 01:29:06 +04:00
  • 7cffbef9e2 delete paper Anton Romanov 2018-11-10 23:15:35 +04:00
  • 4da039f9b0 Create dashboard for grants T-Midnight 2018-11-10 21:55:09 +04:00
  • e3b248778c add route Anton Romanov 2018-11-10 21:43:52 +04:00
  • 376c820b44 fix Alyona 2018-11-10 20:28:17 +04:00
  • e76e7ad864 fix Alyona 2018-11-09 15:43:42 +04:00
  • 2db572f284 Задача №10 Elena 2018-11-09 15:43:25 +04:00
  • d5f9a81b46 remove styles from email template Anton Romanov 2018-11-09 15:37:58 +04:00
  • 7efb9a2926 Merge remote-tracking branch 'origin/master' Alyona 2018-11-09 15:29:48 +04:00
  • 6aa5f807b7 move styles to body Anton Romanov 2018-11-09 15:21:03 +04:00
  • f5e80d7e3c Merge branch '21-Event-status' into 'master' Anton Romanov 2018-11-09 11:15:00 +00:00
  • 1b53debc88 Merge branch 'master' into 21-Event-status #141 Anton Romanov 2018-11-09 15:08:10 +04:00
  • 5c54817fc6 fix styles Anton Romanov 2018-11-09 15:05:39 +04:00
  • 1211b0db29 add styles in email templates Anton Romanov 2018-11-09 14:53:24 +04:00
  • 392b2a9657 added period event Alyona 2018-11-09 14:51:19 +04:00
  • 25707db6cd added period event Alyona 2018-11-09 14:48:21 +04:00
  • 0f9bbc13cc Merge branch 'master' into 10-savePaper Elena 2018-11-09 13:43:08 +04:00
  • 65d788512b Задача №10 Elena 2018-11-09 13:42:28 +04:00
  • f449eeb999 Merge remote-tracking branch 'origin/master' Alyona 2018-11-09 13:30:31 +04:00
  • 67881262be add notification templates Anton Romanov 2018-11-09 10:04:50 +04:00
  • 2bf84dc286 move to notification service Anton Romanov 2018-11-09 09:16:24 +04:00
  • 34d7927d30 fix scheduler code to use service Anton Romanov 2018-11-09 08:39:00 +04:00
  • cd09cf6d60 add toolbar Anton Romanov 2018-11-08 21:58:10 +04:00
  • e554f9ea4c fix paths Anton Romanov 2018-11-08 20:34:09 +04:00
  • 4c43776528 add config parameter Anton Romanov 2018-11-08 20:08:26 +04:00
  • 1958e01d01 Merge remote-tracking branch 'origin/master' Anton Romanov 2018-11-08 19:39:22 +04:00
  • bd78be93ab add paper create strategy Anton Romanov 2018-11-08 19:36:50 +04:00
  • 6c492fa955 Update README.md Anton Romanov 2018-11-06 10:39:25 +00:00
  • def4f97784 fix ci Anton Romanov 2018-11-06 14:10:00 +04:00
  • 42fb1a1537 fix imports Anton Romanov 2018-11-01 12:53:19 +04:00
  • 8fe9f6625c changelog Alyona 2018-10-31 20:06:27 +04:00
  • 0b2824cee6 Merge branch 'master' into 21-Event-status Alyona 2018-10-31 19:35:23 +04:00
  • 0341a823d2 Merge branch 'master' of C:\Users\катя\IdeaProjects\ng-tracker with conflicts. Alyona 2018-10-31 19:33:21 +04:00
  • 92d3067dd3 added event status Alyona 2018-10-30 23:59:42 +04:00
  • 9013baa209 Merge branch '4-show-time-line' into 'master' Anton Romanov 2018-10-30 19:32:00 +00:00
  • d721907c24 Merge branch 'master' into 4-show-time-line #129 Anton Romanov 2018-10-30 23:29:18 +04:00
  • 02499c0aae fix db Anton Romanov 2018-10-30 23:26:55 +04:00
  • 128b147bf2 Revert "remove liquibase" Anton Romanov 2018-10-30 23:07:01 +04:00
  • 679756b02b Merge remote-tracking branch 'origin/4-show-time-line' into 4-show-time-line Anton Romanov 2018-10-30 23:04:49 +04:00
  • 4e7c0259d4 Revert "remove liquibase" Anton Romanov 2018-10-30 23:04:21 +04:00
  • 5766bdadbc Merge branch '11-Message-about-deadlines' into 'master' Anton Romanov 2018-10-27 21:00:43 +00:00
  • 40c668905f Merge branch '12-' into 'master' Anton Romanov 2018-10-27 21:00:01 +00:00
  • 5af8cb1bd3 fix #140 Alyona 2018-10-28 00:33:00 +04:00
  • b3f8b334ef fix Alyona 2018-10-28 00:26:09 +04:00
  • d1e6e80f87 fix #139 Alyona 2018-10-28 00:17:16 +04:00
  • 450cb92d01 fix Alyona 2018-10-28 00:15:42 +04:00
  • d0f40da30e fix Alyona 2018-10-27 23:50:12 +04:00
  • 92f86e70c9 fix Alyona 2018-10-27 23:46:49 +04:00
  • afd854e0cb - make scheduler as a service - reformat code - fix cyrillic letter Anton Romanov 2018-10-27 23:25:27 +04:00
  • 7388b2cb27 add database column Anton Romanov 2018-10-27 23:16:14 +04:00
  • 7f54394b44 class for send messages about update paper Alyona 2018-10-27 23:11:07 +04:00