Commit Graph

  • 746f443931 fix primefaces repo Anton Romanov 2019-11-21 09:37:09 +04:00
  • 1be74769bf fix ports and dependencies Anton Romanov 2019-11-21 09:35:50 +04:00
  • 2cdec4bcda jsf initial Anton Romanov 2019-11-21 08:37:37 +04:00
  • a17dac55e2 fix jdk Anton Romanov 2019-11-08 16:36:53 +04:00
  • 9e6993f136 Merge branch 'move-to-jdk11' into 'dev' Anton Romanov 2019-11-08 10:48:03 +00:00
  • 0647438bfb #73 fix jdk #161 Anton Romanov 2019-11-08 14:29:16 +04:00
  • 41c4ee7997 fix htmlunit js errors Anton Romanov 2019-10-26 11:47:32 +04:00
  • 9d3ee273f6 fix spring boot version Anton Romanov 2019-06-24 14:53:55 +04:00
  • 3267138524 fix warnings Anton Romanov 2019-06-22 13:50:15 +04:00
  • df1bf873ff fix warnings Anton Romanov 2019-06-22 13:31:53 +04:00
  • 24f447aed7 fix tests Anton Romanov 2019-06-22 11:58:01 +04:00
  • 36c4e52e37 Merge branch 'dev' into move-to-jdk11 Anton Romanov 2019-06-21 04:22:06 +04:00
  • 529db0442c fix grant dashboard indicators 0.1.0 Anton Romanov 2019-06-13 14:50:21 +04:00
  • db97892af2 fix grant indicators Anton Romanov 2019-06-13 14:48:02 +04:00
  • ff19001f1f fix grant doubling cause date comparison #243 100-project-documents Anton Romanov 2019-06-11 22:09:30 +04:00
  • e81ee4d36b #93 codestyle #232 93-activites-analytics Artem.Arefev 2019-06-11 01:20:34 +04:00
  • cbae48c23e #93 users activities analytycs Artem.Arefev 2019-06-11 01:18:49 +04:00
  • 2012a58fc2 show active grants Anton Romanov 2019-06-10 12:15:01 +04:00
  • 015a1d7fb8 #93 merged with dev Artem.Arefev 2019-06-09 01:54:21 +04:00
  • 0bb9d5771f #93 merged with dev Artem.Arefev 2019-06-09 01:53:01 +04:00
  • 9ba4476f80 restore dependencies Anton Romanov 2019-06-08 14:43:08 +04:00
  • 098f70ede6 Merge remote-tracking branch 'origin/dev' into dev Anton Romanov 2019-06-08 14:37:07 +04:00
  • d84b1fcbdc use HtmlUnit instead of selenium webdriver for grants loading Anton Romanov 2019-06-08 14:36:12 +04:00
  • b44bbaec75 Merge branch '95-block-user' into 'dev' Anton Romanov 2019-06-08 08:29:44 +00:00
  • 436c15e727 Merge branch '104-module-tests-grant' into 'dev' Anton Romanov 2019-06-08 06:02:09 +00:00
  • e4f5bede2a #104 add 3 more tests #242 T-Midnight 2019-06-07 22:39:20 +04:00
  • 888fecf687 #104 add unit tests T-Midnight 2019-06-07 20:55:59 +04:00
  • 51ed732ae8 #104 fix web element in integration test T-Midnight 2019-06-07 20:54:38 +04:00
  • 18bb0b85ac sout driver path Anton Romanov 2019-06-07 15:53:09 +04:00
  • 615c70d12a sout driver path Anton Romanov 2019-06-07 15:35:15 +04:00
  • a28b3ea57b #93 resolve stashed conflicts Artem.Arefev 2019-06-07 12:46:27 +04:00
  • 96d166d031 #95 block user html #237 Artem.Arefev 2019-06-07 12:23:03 +04:00
  • fb23f182de #95 merged with dev Artem.Arefev 2019-06-07 11:39:44 +04:00
  • f8c1e52ca4 add kias loader to rest Anton Romanov 2019-06-07 09:48:07 +04:00
  • 59e52aaf4a different drivers Anton Romanov 2019-06-06 17:07:25 +04:00
  • dc467ec72c Merge branch '112-ping-stats' into 'dev' Anton Romanov 2019-06-05 20:28:47 +00:00
  • 019ac6e0ad #112 fix ping authors in grant #241 Artem.Arefev 2019-06-06 00:21:19 +04:00
  • 1ccec83390 Merge branch '112-ping-stats' into 'dev' Anton Romanov 2019-06-05 20:04:44 +00:00
  • 4104844b1e #95 merged with dev Artem.Arefev 2019-06-06 00:01:03 +04:00
  • c0afabc37c #112 merged with dev #236 Artem.Arefev 2019-06-05 23:57:33 +04:00
  • 624573a47a Merge branch '103-integr-tests-grant' into 'dev' Anton Romanov 2019-06-05 19:46:59 +00:00
  • fddc15af5a #103 add tests for authors and description #233 T-Midnight 2019-06-05 23:14:52 +04:00
  • bdb8fd8ce4 Merge remote-tracking branch 'origin/dev' into 112-ping-stats Artem.Arefev 2019-06-05 18:12:38 +04:00
  • acd58005de #103 merge with 44 T-Midnight 2019-06-05 15:52:29 +04:00
  • 9bec1d080d #93 completed count Artem.Arefev 2019-06-05 11:55:51 +04:00
  • 858b4b96a7 Merge remote-tracking branch 'origin/44-check-complete-deadlines' into 44-check-complete-deadlines #220 44-check-complete-deadlines T-Midnight 2019-06-05 11:55:31 +04:00
  • 8b263e7e0f #44 fix link to papers T-Midnight 2019-06-05 11:52:54 +04:00
  • 44e3fc2c6e #93 fixes Artem.Arefev 2019-06-05 11:25:33 +04:00
  • 2adaf7740a #93 removed comment Artem.Arefev 2019-06-05 10:55:12 +04:00
  • ed7707c4d8 #93 users activity by date Artem.Arefev 2019-06-05 10:53:30 +04:00
  • 24d3c2ef69 Merge branch '103-integr-tests-grant' into 44-check-complete-deadlines T-Midnight 2019-06-05 10:47:52 +04:00
  • 1ff38fc80e #103 merge with dev T-Midnight 2019-06-05 09:36:29 +04:00
  • c77702704f #103 merge with dev T-Midnight 2019-06-05 09:34:51 +04:00
  • 44824e53b2 Merge branch '103-paper-integr-tests' into 'dev' Anton Romanov 2019-06-05 04:57:33 +00:00
  • bacd3827e3 Merge branch '101-projecgt-timeline' into 'dev' Anton Romanov 2019-06-05 04:55:15 +00:00
  • 997e7776b6 #99 project dashboard edited #240 99-project-from-grant a.vasin 2019-06-05 08:48:20 +04:00
  • 26c1b78960 99 unique name a.vasin 2019-06-05 08:41:55 +04:00
  • 0cd8003dd7 #103 add tests for deadline T-Midnight 2019-06-04 16:26:42 +04:00
  • bdff81d25e #101 tests edited #212 Васин Антон 2019-06-03 20:42:49 +03:00
  • 482964fe53 #101 EventService edited Васин Антон 2019-06-03 20:21:46 +03:00
  • dc52968ddf Merge branch '101-projecgt-timeline' of gitlab.com:romanov73/ng-tracker into 101-projecgt-timeline Васин Антон 2019-06-03 14:40:09 +03:00
  • ea0b8fbaad Merge remote-tracking branch 'origin/dev' into 93-activites-analytics Artem.Arefev 2019-06-03 02:14:26 +04:00
  • 22abf6a27d #95 blocking user Artem.Arefev 2019-06-03 02:11:35 +04:00
  • f1ca0418fe #104 paper unit tests #239 104-paper-unit-tests Семенова Мария 2019-06-03 00:11:25 +04:00
  • abea3c7dad #112 ping model changed Artem.Arefev 2019-06-02 21:53:51 +04:00
  • 23d4e5602f #103 integration auto tests #238 Семенова Мария 2019-06-01 23:16:39 +04:00
  • bde4ac5f1c #101 event service edited a.vasin 2019-06-01 13:25:12 +04:00
  • 3898dcf1c1 #112 changed mapping Artem.Arefev 2019-06-01 12:57:20 +04:00
  • 2d230afa35 #112changed mapping Artem.Arefev 2019-06-01 12:56:37 +04:00
  • db3252d822 #101 event service edited a.vasin 2019-06-01 12:55:13 +04:00
  • e6dc2abdd9 #101 event service edited a.vasin 2019-06-01 12:23:52 +04:00
  • ae8dc58a9d #101 event service edited a.vasin 2019-06-01 12:16:59 +04:00
  • 38478835fb #101 event service edited a.vasin 2019-06-01 12:03:42 +04:00
  • 7edb9d2aa3 #101 event service edited a.vasin 2019-06-01 11:56:38 +04:00
  • 961a6a318e #101 event service edited a.vasin 2019-06-01 11:51:01 +04:00
  • 267bd5b0f3 #101 event service edited a.vasin 2019-06-01 11:44:41 +04:00
  • a5ac2bcbc2 Merge branch 'dev' of gitlab.com:romanov73/ng-tracker into 101-projecgt-timeline a.vasin 2019-06-01 09:44:46 +04:00
  • 291f4e1e33 #101 db edited a.vasin 2019-06-01 09:44:25 +04:00
  • 53307c6add #95 init Artem.Arefev 2019-05-31 22:42:59 +04:00
  • a405267092 merged with dev Artem.Arefev 2019-05-31 22:42:19 +04:00
  • 1224cc7a23 Merge branch 'dev' of gitlab.com:romanov73/ng-tracker into 101-projecgt-timeline Васин Антон 2019-05-31 16:04:01 +03:00
  • a878f8c22c fix remove older events Anton Romanov 2019-05-31 09:06:21 +04:00
  • d2ce6d604e fix merging collection Anton Romanov 2019-05-31 08:46:21 +04:00
  • b4b7b9087e fix npe Anton Romanov 2019-05-31 08:12:57 +04:00
  • a7b48e1534 #101 project tests a.vasin 2019-05-31 02:23:15 +04:00
  • 9388302a47 #101 project tests a.vasin 2019-05-31 01:08:40 +04:00
  • e680aa30c4 #112 ping activity Artem.Arefev 2019-05-31 00:33:21 +04:00
  • 4498b71259 #101 project tests a.vasin 2019-05-30 09:53:27 +04:00
  • 632c6299b7 #101 files attach modified a.vasin 2019-05-30 00:08:13 +04:00
  • 9013d79228 #101 grant attach a.vasin 2019-05-29 23:40:30 +04:00
  • 192adbfa0b #101 no projects message a.vasin 2019-05-29 18:40:14 +04:00
  • eb30d07d10 #101 project deadlines on timeline a.vasin 2019-05-29 18:27:34 +04:00
  • eceb8ec528 #101 project model edited a.vasin 2019-05-29 17:52:15 +04:00
  • 330ffc4df1 Merge branch '98-project-tasks' into 'dev' Anton Romanov 2019-05-29 04:56:30 +00:00
  • 77ce908d58 #98 deadline edited #201 Васин Антон 2019-05-28 16:55:08 +03:00
  • 8ffafd6693 #98 deadline imports edited Васин Антон 2019-05-28 16:46:12 +03:00
  • e967e2bfee Merge branch 'dev' of https://gitlab.com/romanov73/ng-tracker into 98-project-tasks Васин Антон 2019-05-28 16:17:37 +03:00
  • c25392337a #98 project deadlines edited Васин Антон 2019-05-28 16:16:41 +03:00
  • 3b0a2dd964 #98 executors list added a.vasin 2019-05-28 11:12:27 +04:00
  • 8d1e410e83 Merge branch 'dev' of gitlab.com:romanov73/ng-tracker into 98-project-tasks a.vasin 2019-05-28 00:41:15 +04:00