ng-tracker

romanov73/ng-tracker

Fork 0

Commit Graph

Select branches

Hide Pull Requests

1-audit-listener

100-project-documents

104-paper-unit-tests

44-check-complete-deadlines

48-crud

77-students-datetime-sorting

89-

90-edit-workload

93-activites-analytics

99-project-from-grant

dev

gl_87

gl_88

lk

master

#128

#129

#130

#131

#132

#133

#134

#135

#136

#137

#138

#139

#140

#141

#142

#143

#144

#145

#146

#147

#148

#149

#150

#151

#152

#153

#154

#155

#156

#157

#158

#159

#160

#161

#162

#163

#164

#165

#166

#167

#168

#169

#170

#171

#172

#173

#174

#175

#176

#177

#178

#179

#180

#181

#182

#183

#184

#185

#186

#187

#188

#189

#190

#191

#192

#193

#194

#195

#196

#197

#198

#199

#200

#201

#202

#203

#204

#205

#206

#207

#208

#209

#210

#211

#212

#213

#214

#215

#216

#217

#218

#219

#220

#221

#222

#223

#224

#225

#226

#227

#228

#229

#230

#231

#232

#233

#234

#235

#236

#237

#238

#239

#240

#241

#242

#243

#244

#245

#246

#248

0.1.0

338d7c2e09 #59 added begin-end dates in conferenceRow Nightblade73 2019-04-19 18:32:24 +04:00
eec739a49f #41 create simple attach of articles T-Midnight 2019-04-19 17:49:36 +04:00
f29d31b840 #41 create changelog T-Midnight 2019-04-19 17:45:22 +04:00
34033fac5f #59 added filtration Nightblade73 2019-04-19 17:36:46 +04:00
e2b49689d5 #59 changed filterDto Nightblade73 2019-04-19 17:31:30 +04:00
9f664b2618 #59 add front thymeleaf Nightblade73 2019-04-19 17:30:30 +04:00
21ba06170a Merge branch '106-papers-bug' into 'dev' Anton Romanov 2019-04-19 13:13:10 +00:00
9e31bfa7d7 #106 add checkstyle rules #189 Anton Romanov 2019-04-19 17:08:12 +04:00
2d0f2aeecd Merge branch '69-take-part-conf' into 'dev' Anton Romanov 2019-04-19 13:05:07 +00:00
b623402aa8 #69 changed method getConference in controller #183 Nightblade73 2019-04-19 14:39:07 +04:00
9edcebb2f5 #69 changed isCurrentUserParticipant Nightblade73 2019-04-19 14:29:08 +04:00
713e50043e Merge remote-tracking branch 'remotes/origin/dev' into 69-take-part-conf Nightblade73 2019-04-19 14:24:32 +04:00
9506057bb1 Merge branch '41-js' into 'dev' Anton Romanov 2019-04-19 09:52:24 +00:00
f387b4eb52 #41 add link to the grant page #190 T-Midnight 2019-04-19 11:36:27 +04:00
6c8554a0b8 #106 change boolean to nullable Семенова Мария 2019-04-18 23:37:08 +04:00
7bec7b4e44 #76 filters added ASH 2019-04-18 23:15:32 +04:00
5a55e3cfc8 Merge branch '42--2' into 'dev' Anton Romanov 2019-04-18 18:40:37 +00:00
958a0d461b #42 merge with dev #171 T-Midnight 2019-04-18 22:35:07 +04:00
416ad7eeda #42 merge with dev T-Midnight 2019-04-18 22:34:20 +04:00
3bdb8798cd Merge branch '105-paper-latex-editing' into 'dev' Anton Romanov 2019-04-18 18:31:18 +00:00
59887e5141 #76 delete function added ASH 2019-04-18 21:57:56 +04:00
9da227ab34 #76 fixing dashboard ASH 2019-04-18 21:38:55 +04:00
6c6a748978 #105 danger message type #187 Семенова Мария 2019-04-18 19:03:04 +04:00
a2dca6b7c6 Merge branch 'dev' into paper-latex-editing Семенова Мария 2019-04-18 18:20:51 +04:00
f1f7c1f0f6 #97 cancel button edited Васин Антон 2019-04-18 16:49:10 +03:00
96431701df #69 added button disabling take part, if cur user already taken part Nightblade73 2019-04-18 15:38:45 +04:00
6469ddcd42 Merge branch 'dev' of https://gitlab.com/romanov73/ng-tracker into dev Васин Антон 2019-04-18 13:37:29 +03:00
8fd352aaa4 #69 added styles Nightblade73 2019-04-18 14:33:49 +04:00
8474fb492f Merge branch '96-edit-project-page' into 'dev' Anton Romanov 2019-04-18 09:32:48 +00:00
d015b02862 #96 removed wildcards from imports #184 Васин Антон 2019-04-18 13:26:11 +03:00
ced3b0a978 #96 database edited Васин Антон 2019-04-18 12:10:27 +03:00
e284298200 #42 rename variables T-Midnight 2019-04-18 13:09:50 +04:00
b722687050 #96 edit project page Васин Антон 2019-04-18 10:32:43 +03:00
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 +04:00
789fda9c98 remove nonstopmode from bibtex Семенова Мария 2019-04-18 10:49:36 +04:00
4eef57bce7 Merge branch '102-autotesting' into 'dev' Anton Romanov 2019-04-17 14:17:41 +00:00
32c7261c2e #102 restore old swagger #185 Anton Romanov 2019-04-17 18:13:21 +04:00
4615183ae4 #102 temporary skip tests until fix docker container Anton Romanov 2019-04-17 17:46:06 +04:00
49a379ab3c #102 temporary skip tests until fix docker container Anton Romanov 2019-04-17 17:37:43 +04:00
5b89ed7284 #102 fix code style Anton Romanov 2019-04-17 17:26:54 +04:00
cfbe36197b #102 add auto tests Anton Romanov 2019-04-17 17:20:20 +04:00
e85c814f70 #96 project comment added Васин Антон 2019-04-17 14:46:42 +03:00
255692d6ea #96 project status added Васин Антон 2019-04-17 14:38:07 +03:00
f079e34a57 #96 project title added Васин Антон 2019-04-17 14:18:35 +03:00
4ea40931eb #96 project status fragment added Васин Антон 2019-04-17 14:06:38 +03:00
a89d93a9b0 #96 project line fragment added Васин Антон 2019-04-17 14:01:45 +03:00
7e4d8d4918 #69 added method take part in conference Nightblade73 2019-04-17 14:51:19 +04:00
ca3e87a8c5 #96 edit project blank page Васин Антон 2019-04-17 13:50:22 +03:00
506fa01fab Revert: #42 merge with dev T-Midnight 2019-04-17 13:42:22 +04:00
97d7d00098 #42 merge with dev T-Midnight 2019-04-17 13:30:14 +04:00
1e6b3cba3a #42 delete blank lines, fix js, fix leaderId validation T-Midnight 2019-04-17 13:25:10 +04:00
8564f2cf34 #69 managed to create a connection through a new entity Nightblade73 2019-04-17 13:00:48 +04:00
92a0674b95 Merge branch 'dev' of https://gitlab.com/romanov73/ng-tracker into dev Васин Антон 2019-04-17 11:44:54 +03:00
8fbce55028 #86 projects main page Васин Антон 2019-04-17 11:04:35 +03:00
487aa578a7 Merge branch '86-projects-main-page' into 'dev' Anton Romanov 2019-04-17 07:35:00 +00:00
f5c1bb940c #86 projects main page #180 Васин Антон 2019-04-17 11:24:30 +03:00
14c28050c7 #65 changed interface Nightblade73 2019-04-17 11:19:23 +04:00
b05a32edac fix issue template Anton Romanov 2019-04-17 09:33:58 +04:00
7491d7e9e4 Merge branch '65-undock-article' into 'dev' Anton Romanov 2019-04-16 11:13:20 +00:00
81d07645c2 #65 added delete method of article, fixed copyFromDto method #182 Nightblade73 2019-04-16 14:18:49 +04:00
3facc0c26e Merge branch '74-students-add-new-task' into 'dev' Anton Romanov 2019-04-16 09:36:58 +00:00
d81d1cf72c #74 some code fixes #174 Anton Romanov 2019-04-16 13:41:10 +04:00
0c719d8886 Merge branch '66-attach-exist-article' into 'dev' Anton Romanov 2019-04-16 09:33:57 +00:00
d4b38d314f #66 fixed bug, when attach-article lose what needed to attach after add or remove deadline #181 Nightblade73 2019-04-16 13:22:15 +04:00
95f70f425a Update2 TagService.java anastasia shulga 2019-04-16 08:21:36 +00:00
dbd61ce80c Update TagService.java anastasia shulga 2019-04-16 07:55:37 +00:00
dca644eba1 #66 added handling of adding articles not added to the picker. Nightblade73 2019-04-16 10:42:40 +04:00
fbf9a7943b #66 changed from Set to List Nightblade73 2019-04-16 09:51:31 +04:00
735cbb5f7b #66 added front-end part Nightblade73 2019-04-16 09:46:24 +04:00
06b5d66d3e Merge branch '58-delete-conf' into 'dev' Anton Romanov 2019-04-15 17:32:22 +00:00
909c657c89 #58 added delete confirm #178 Nightblade73 2019-04-15 15:48:17 +04:00
0cc8de2d32 #58 added delete method of conference Nightblade73 2019-04-15 10:36:55 +04:00
9e657a7d2d Merge branch '62-delete-deadline' into 'dev' #179 Anton Romanov 2019-04-14 19:33:45 +00:00
f88f035e65 #55 little fix #177 Nightblade73 2019-04-14 21:34:39 +04:00
1f36e04cd3 #74 fully adding tags ASH 2019-04-14 21:24:22 +04:00
8cfc64ea85 #55 added delete input style Nightblade73 2019-04-14 20:42:11 +04:00
d6a11a5902 #74 fixing codestyle and tags ASH 2019-04-14 17:50:23 +04:00
8b2a559d37 #42 fix thymeleaf expressions Anton Romanov 2019-04-13 23:56:24 +04:00
34499abd60 #62 fix remove deadline in other JPA operation Anton Romanov 2019-04-13 22:59:59 +04:00
9711febefb #55 added delete deadline Nightblade73 2019-04-13 13:02:36 +04:00
1756f29505 #42 filter authors by leader and degree T-Midnight 2019-04-13 12:39:53 +04:00
b4a2a8086d #62 remove verification of empty deadline list Nightblade73 2019-04-12 15:51:06 +04:00
4955e9a637 #4--2 merge with dev Anton Romanov 2019-04-11 22:39:59 +04:00
cafb3abcee #4--2 merge with dev Anton Romanov 2019-04-11 22:37:32 +04:00
bd3513118c #42 this don't work T-Midnight 2019-04-11 21:42:28 +04:00
f7d766f02d #42 rename birth_date column T-Midnight 2019-04-11 21:37:24 +04:00
5eae7305c4 #74 codestyle ASH 2019-04-11 00:14:03 +04:00
f019806a8e #74 fixing adding and db everything added except tags ASH 2019-04-10 23:57:55 +04:00
e8461e26eb #42 fix birthDate and degree to User T-Midnight 2019-04-10 10:09:41 +04:00
51c755ac07 #42 method hasErrors didn't work, return to the previous state T-Midnight 2019-04-10 09:39:07 +04:00
9b697c6f3f #74 adding models, controllers and services ASH 2019-04-09 23:18:39 +04:00
e2e10477ac #42 delete GrantStatusDto T-Midnight 2019-04-09 21:31:23 +04:00
d1813f656e Merge branch '61-adding-deadline' into 'dev' Anton Romanov 2019-04-09 12:34:06 +00:00
c308a5e5af #55 Navigation's method "hasErrors" don't work. it returns String, not redirection. #176 Nightblade73 2019-04-09 14:47:14 +04:00
689a7799e3 #55 added method in controller Nightblade73 2019-04-08 22:04:30 +04:00
518f587eed Merge branch '85-issue-templates' into 'dev' Anton Romanov 2019-04-08 07:36:33 +00:00
3017366c91 №85 try to add issue template #175 user 2019-04-08 11:27:15 +03:00
7dca991c2f Merge branch '55-new-conf' into 'dev' Anton Romanov 2019-04-08 03:33:40 +00:00
e350f8b3c1 #55 refactor controller navigation, fix conference edit url #170 Anton Romanov 2019-04-08 07:40:26 +04:00
c49b56916c #55 added initialization of fields in ConferenceDto Nightblade73 2019-04-07 10:08:13 +04:00