Commit Graph

  • b16b3ed2e3 #68 added class structure Nightblade73 2019-04-24 17:41:19 +0400
  • 5bff419dbd #68 added ping table Nightblade73 2019-04-24 16:44:17 +0400
  • 4dd0a6c210 fix merge bug Anton Romanov 2019-04-24 13:45:09 +0400
  • bb2518e5f4 Merge branch '76-students-tags-filter' into 'dev' Anton Romanov 2019-04-24 09:36:03 +0000
  • 1e6fbdc1fa Merge branch '64-add-article-conf' into 'dev' Anton Romanov 2019-04-24 09:35:08 +0000
  • 54c6fe815d Merge branch '113-delete-project' into 'dev' Anton Romanov 2019-04-24 09:34:12 +0000
  • d37c9bda57 #64 excluded adding articles with the same name #197 Nightblade73 2019-04-24 10:17:32 +0400
  • fe55890518 #64 more style fixes Nightblade73 2019-04-24 10:12:42 +0400
  • 7eb5dce94e #64 style fixes Nightblade73 2019-04-24 09:42:00 +0400
  • 7248a84c30 #76 adding sorting #188 ASH 2019-04-24 01:03:56 +0400
  • 02d643727e #113 projects/projects edited #198 Васин Антон 2019-04-23 23:32:40 +0300
  • 50a0f8aa78 #113 projects.js added Васин Антон 2019-04-23 23:19:25 +0300
  • 2418e953be #113 line fragment edited Васин Антон 2019-04-23 23:15:52 +0300
  • e32da7c7c2 #113 delete function Васин Антон 2019-04-23 23:11:45 +0300
  • 3aea19088d Merge branch '115-follow-up-from-resolve' into 'dev' Anton Romanov 2019-04-23 19:17:17 +0000
  • 8f2f6adc3b #64 show global message Anton Romanov 2019-04-23 23:15:22 +0400
  • c18ecea13b #115 move method to service #200 T-Midnight 2019-04-23 22:03:06 +0400
  • bf515a3fcb Merge remote-tracking branch 'remotes/origin/107-attach-article' into 115-follow-up-from-resolve T-Midnight 2019-04-23 21:47:54 +0400
  • 2d6de6b535 Merge branch 'dev' of https://gitlab.com/romanov73/ng-tracker into dev Васин Антон 2019-04-23 19:52:38 +0300
  • 39f44403c1 Merge branch '114-bug-projects-list' into 'dev' Anton Romanov 2019-04-23 12:14:22 +0000
  • 2f3c1addbb #114 unused imports removed #199 Васин Антон 2019-04-23 14:20:17 +0300
  • c78ea05255 #114 update edited Васин Антон 2019-04-23 14:11:42 +0300
  • 26969dba5b #107 merge with dev #191 T-Midnight 2019-04-23 15:02:41 +0400
  • 6df1a87367 #107 merge with dev T-Midnight 2019-04-23 15:01:47 +0400
  • 546b0dc323 #107 add styles T-Midnight 2019-04-23 14:51:51 +0400
  • 41bd00d645 project dashboard edited Васин Антон 2019-04-23 13:40:11 +0300
  • 955bdaa438 fix repository method Anton Romanov 2019-04-23 13:55:59 +0400
  • 60dfad5d76 Merge branch 'dev' into move-to-jdk11 Anton Romanov 2019-04-23 13:51:21 +0400
  • 6d6ea3136d #64 dont show error message Nightblade73 2019-04-23 13:37:56 +0400
  • 70920cc612 Merge branch 'dev' of https://gitlab.com/romanov73/ng-tracker into dev Васин Антон 2019-04-23 12:33:56 +0300
  • d3b8be2cf1 #107 add view of the selected papers T-Midnight 2019-04-23 13:21:13 +0400
  • e16b1da761 fix script Anton Romanov 2019-04-23 12:46:17 +0400
  • 09cae66ca4 fix image Anton Romanov 2019-04-23 12:38:15 +0400
  • 7684bac74d Merge branch 'dev' into move-to-jdk11 Anton Romanov 2019-04-23 11:35:41 +0400
  • 5e86952cb6 Merge branch '97-edit-project' into 'dev' Anton Romanov 2019-04-23 07:34:13 +0000
  • 019fe7c652 #97 adding deadlines #186 Васин Антон 2019-04-23 10:32:23 +0300
  • 3698d31bc8 #76 fixing conflicts ASH 2019-04-22 21:52:26 +0400
  • 53cc777734 #64 delete conference refactor Nightblade73 2019-04-22 21:46:42 +0400
  • 53cc947a17 #97 copy from DTO edited Васин Антон 2019-04-22 15:48:29 +0300
  • ba565746f5 #97 dashboard added Васин Антон 2019-04-22 14:41:58 +0300
  • 519dd51446 #97 dashboard added Васин Антон 2019-04-22 14:31:46 +0300
  • 349e7373ff #97 save function Васин Антон 2019-04-22 14:19:01 +0300
  • 2767403128 #64 added saving in db Nightblade73 2019-04-22 15:11:52 +0400
  • 5bfeaff054 #64 added method addPaper Nightblade73 2019-04-22 11:13:04 +0400
  • b6ced3ce1a Merge branch '60-sort-conf' into 'dev' Anton Romanov 2019-04-22 03:12:00 +0000
  • 7fac92b52f Merge branch '110-paper-type' into 'dev' Anton Romanov 2019-04-22 03:10:48 +0000
  • 6876d09557 #76 adding style to filters ASH 2019-04-21 19:02:27 +0400
  • ddd21dab1c #60 added dashboard #193 Nightblade73 2019-04-21 17:18:44 +0400
  • 8400c5d40d Merge remote-tracking branch 'remotes/origin/dev' into 76-students-tags-filter ASH 2019-04-21 15:47:56 +0400
  • a4ae42f072 #60 added sorting Nightblade73 2019-04-21 15:03:31 +0400
  • a3d1834ab8 #110 add paper type #194 Семенова Мария 2019-04-21 12:17:31 +0400
  • bc98785be9 Merge branch '59-filter-conference' into 'dev' #195 77-students-datetime-sorting Anton Romanov 2019-04-19 14:46:23 +0000
  • a9f4a326c5 #59 fixed styles #192 Nightblade73 2019-04-19 18:38:56 +0400
  • 338d7c2e09 #59 added begin-end dates in conferenceRow Nightblade73 2019-04-19 18:32:24 +0400
  • eec739a49f #41 create simple attach of articles T-Midnight 2019-04-19 17:49:36 +0400
  • f29d31b840 #41 create changelog T-Midnight 2019-04-19 17:45:22 +0400
  • 34033fac5f #59 added filtration Nightblade73 2019-04-19 17:36:46 +0400
  • e2b49689d5 #59 changed filterDto Nightblade73 2019-04-19 17:31:30 +0400
  • 9f664b2618 #59 add front thymeleaf Nightblade73 2019-04-19 17:30:30 +0400
  • 21ba06170a Merge branch '106-papers-bug' into 'dev' Anton Romanov 2019-04-19 13:13:10 +0000
  • 9e31bfa7d7 #106 add checkstyle rules #189 Anton Romanov 2019-04-19 17:08:12 +0400
  • 2d0f2aeecd Merge branch '69-take-part-conf' into 'dev' Anton Romanov 2019-04-19 13:05:07 +0000
  • b623402aa8 #69 changed method getConference in controller #183 Nightblade73 2019-04-19 14:39:07 +0400
  • 9edcebb2f5 #69 changed isCurrentUserParticipant Nightblade73 2019-04-19 14:29:08 +0400
  • 713e50043e Merge remote-tracking branch 'remotes/origin/dev' into 69-take-part-conf Nightblade73 2019-04-19 14:24:32 +0400
  • 9506057bb1 Merge branch '41-js' into 'dev' Anton Romanov 2019-04-19 09:52:24 +0000
  • f387b4eb52 #41 add link to the grant page #190 T-Midnight 2019-04-19 11:36:27 +0400
  • 6c8554a0b8 #106 change boolean to nullable Семенова Мария 2019-04-18 23:37:08 +0400
  • 7bec7b4e44 #76 filters added ASH 2019-04-18 23:15:32 +0400
  • 5a55e3cfc8 Merge branch '42--2' into 'dev' Anton Romanov 2019-04-18 18:40:37 +0000
  • 958a0d461b #42 merge with dev #171 T-Midnight 2019-04-18 22:35:07 +0400
  • 416ad7eeda #42 merge with dev T-Midnight 2019-04-18 22:34:20 +0400
  • 3bdb8798cd Merge branch '105-paper-latex-editing' into 'dev' Anton Romanov 2019-04-18 18:31:18 +0000
  • 59887e5141 #76 delete function added ASH 2019-04-18 21:57:56 +0400
  • 9da227ab34 #76 fixing dashboard ASH 2019-04-18 21:38:55 +0400
  • 6c6a748978 #105 danger message type #187 Семенова Мария 2019-04-18 19:03:04 +0400
  • a2dca6b7c6 Merge branch 'dev' into paper-latex-editing Семенова Мария 2019-04-18 18:20:51 +0400
  • f1f7c1f0f6 #97 cancel button edited Васин Антон 2019-04-18 16:49:10 +0300
  • 96431701df #69 added button disabling take part, if cur user already taken part Nightblade73 2019-04-18 15:38:45 +0400
  • 6469ddcd42 Merge branch 'dev' of https://gitlab.com/romanov73/ng-tracker into dev Васин Антон 2019-04-18 13:37:29 +0300
  • 8fd352aaa4 #69 added styles Nightblade73 2019-04-18 14:33:49 +0400
  • 8474fb492f Merge branch '96-edit-project-page' into 'dev' Anton Romanov 2019-04-18 09:32:48 +0000
  • d015b02862 #96 removed wildcards from imports #184 Васин Антон 2019-04-18 13:26:11 +0300
  • ced3b0a978 #96 database edited Васин Антон 2019-04-18 12:10:27 +0300
  • e284298200 #42 rename variables T-Midnight 2019-04-18 13:09:50 +0400
  • b722687050 #96 edit project page Васин Антон 2019-04-18 10:32:43 +0300
  • 918079ac89 #69 fixed not working code, now user can take part in conference and choose participation and deposit Nightblade73 2019-04-18 11:20:44 +0400
  • 789fda9c98 remove nonstopmode from bibtex Семенова Мария 2019-04-18 10:49:36 +0400
  • 4eef57bce7 Merge branch '102-autotesting' into 'dev' Anton Romanov 2019-04-17 14:17:41 +0000
  • 32c7261c2e #102 restore old swagger #185 Anton Romanov 2019-04-17 18:13:21 +0400
  • 4615183ae4 #102 temporary skip tests until fix docker container Anton Romanov 2019-04-17 17:46:06 +0400
  • 49a379ab3c #102 temporary skip tests until fix docker container Anton Romanov 2019-04-17 17:37:43 +0400
  • 5b89ed7284 #102 fix code style Anton Romanov 2019-04-17 17:26:54 +0400
  • cfbe36197b #102 add auto tests Anton Romanov 2019-04-17 17:20:20 +0400
  • e85c814f70 #96 project comment added Васин Антон 2019-04-17 14:46:42 +0300
  • 255692d6ea #96 project status added Васин Антон 2019-04-17 14:38:07 +0300
  • f079e34a57 #96 project title added Васин Антон 2019-04-17 14:18:35 +0300
  • 4ea40931eb #96 project status fragment added Васин Антон 2019-04-17 14:06:38 +0300
  • a89d93a9b0 #96 project line fragment added Васин Антон 2019-04-17 14:01:45 +0300
  • 7e4d8d4918 #69 added method take part in conference Nightblade73 2019-04-17 14:51:19 +0400