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

ca3e87a8c5 #96 edit project blank page Васин Антон 2019-04-17 13:50:22 +0300
506fa01fab Revert: #42 merge with dev T-Midnight 2019-04-17 13:42:22 +0400
97d7d00098 #42 merge with dev T-Midnight 2019-04-17 13:30:14 +0400
1e6b3cba3a #42 delete blank lines, fix js, fix leaderId validation T-Midnight 2019-04-17 13:25:10 +0400
8564f2cf34 #69 managed to create a connection through a new entity Nightblade73 2019-04-17 13:00:48 +0400
92a0674b95 Merge branch 'dev' of https://gitlab.com/romanov73/ng-tracker into dev Васин Антон 2019-04-17 11:44:54 +0300
8fbce55028 #86 projects main page Васин Антон 2019-04-17 11:04:35 +0300
487aa578a7 Merge branch '86-projects-main-page' into 'dev' Anton Romanov 2019-04-17 07:35:00 +0000
f5c1bb940c #86 projects main page #180 Васин Антон 2019-04-17 11:24:30 +0300
14c28050c7 #65 changed interface Nightblade73 2019-04-17 11:19:23 +0400
b05a32edac fix issue template Anton Romanov 2019-04-17 09:33:58 +0400
7491d7e9e4 Merge branch '65-undock-article' into 'dev' Anton Romanov 2019-04-16 11:13:20 +0000
81d07645c2 #65 added delete method of article, fixed copyFromDto method #182 Nightblade73 2019-04-16 14:18:49 +0400
3facc0c26e Merge branch '74-students-add-new-task' into 'dev' Anton Romanov 2019-04-16 09:36:58 +0000
d81d1cf72c #74 some code fixes #174 Anton Romanov 2019-04-16 13:41:10 +0400
0c719d8886 Merge branch '66-attach-exist-article' into 'dev' Anton Romanov 2019-04-16 09:33:57 +0000
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 +0400
95f70f425a Update2 TagService.java anastasia shulga 2019-04-16 08:21:36 +0000
dbd61ce80c Update TagService.java anastasia shulga 2019-04-16 07:55:37 +0000
dca644eba1 #66 added handling of adding articles not added to the picker. Nightblade73 2019-04-16 10:42:40 +0400
fbf9a7943b #66 changed from Set to List Nightblade73 2019-04-16 09:51:31 +0400
735cbb5f7b #66 added front-end part Nightblade73 2019-04-16 09:46:24 +0400
06b5d66d3e Merge branch '58-delete-conf' into 'dev' Anton Romanov 2019-04-15 17:32:22 +0000
909c657c89 #58 added delete confirm #178 Nightblade73 2019-04-15 15:48:17 +0400
0cc8de2d32 #58 added delete method of conference Nightblade73 2019-04-15 10:36:55 +0400
9e657a7d2d Merge branch '62-delete-deadline' into 'dev' #179 Anton Romanov 2019-04-14 19:33:45 +0000
f88f035e65 #55 little fix #177 Nightblade73 2019-04-14 21:34:39 +0400
1f36e04cd3 #74 fully adding tags ASH 2019-04-14 21:24:22 +0400
8cfc64ea85 #55 added delete input style Nightblade73 2019-04-14 20:42:11 +0400
d6a11a5902 #74 fixing codestyle and tags ASH 2019-04-14 17:50:23 +0400
8b2a559d37 #42 fix thymeleaf expressions Anton Romanov 2019-04-13 23:56:24 +0400
34499abd60 #62 fix remove deadline in other JPA operation Anton Romanov 2019-04-13 22:59:59 +0400
9711febefb #55 added delete deadline Nightblade73 2019-04-13 13:02:36 +0400
1756f29505 #42 filter authors by leader and degree T-Midnight 2019-04-13 12:39:53 +0400
b4a2a8086d #62 remove verification of empty deadline list Nightblade73 2019-04-12 15:51:06 +0400
4955e9a637 #4--2 merge with dev Anton Romanov 2019-04-11 22:39:59 +0400
cafb3abcee #4--2 merge with dev Anton Romanov 2019-04-11 22:37:32 +0400
bd3513118c #42 this don't work T-Midnight 2019-04-11 21:42:28 +0400
f7d766f02d #42 rename birth_date column T-Midnight 2019-04-11 21:37:24 +0400
5eae7305c4 #74 codestyle ASH 2019-04-11 00:14:03 +0400
f019806a8e #74 fixing adding and db everything added except tags ASH 2019-04-10 23:57:55 +0400
e8461e26eb #42 fix birthDate and degree to User T-Midnight 2019-04-10 10:09:41 +0400
51c755ac07 #42 method hasErrors didn't work, return to the previous state T-Midnight 2019-04-10 09:39:07 +0400
9b697c6f3f #74 adding models, controllers and services ASH 2019-04-09 23:18:39 +0400
e2e10477ac #42 delete GrantStatusDto T-Midnight 2019-04-09 21:31:23 +0400
d1813f656e Merge branch '61-adding-deadline' into 'dev' Anton Romanov 2019-04-09 12:34:06 +0000
c308a5e5af #55 Navigation's method "hasErrors" don't work. it returns String, not redirection. #176 Nightblade73 2019-04-09 14:47:14 +0400
689a7799e3 #55 added method in controller Nightblade73 2019-04-08 22:04:30 +0400
518f587eed Merge branch '85-issue-templates' into 'dev' Anton Romanov 2019-04-08 07:36:33 +0000
3017366c91 №85 try to add issue template #175 user 2019-04-08 11:27:15 +0300
7dca991c2f Merge branch '55-new-conf' into 'dev' Anton Romanov 2019-04-08 03:33:40 +0000
e350f8b3c1 #55 refactor controller navigation, fix conference edit url #170 Anton Romanov 2019-04-08 07:40:26 +0400
c49b56916c #55 added initialization of fields in ConferenceDto Nightblade73 2019-04-07 10:08:13 +0400
db43da9ec0 #55 added nav controller Nightblade73 2019-04-07 10:01:44 +0400
3e5aeaf290 #55 fast fixes Nightblade73 2019-04-06 14:41:10 +0400
926cd02096 #55 fixed adding to DB Nightblade73 2019-04-06 11:05:30 +0400
b9af7c20c7 fix grids Anton Romanov 2019-04-06 00:11:49 +0400
7465803162 #42 add columns 'birth_date'&'degree' to User T-Midnight 2019-04-05 22:06:16 +0400
d26ab93629 Merge branch '83-docker-hub' into 'dev' Anton Romanov 2019-04-05 18:03:16 +0000
e0ca29fbab #83 fix wrong entity #173 Anton Romanov 2019-04-05 21:47:42 +0400
eb524d49d0 #55 added html side, don't work, because can't parse date, like in deadlines Nightblade73 2019-04-05 18:01:43 +0400
72add3638b #83 check CI Anton Romanov 2019-04-05 18:01:12 +0400
0feef9016a #83 disable cache Anton Romanov 2019-04-05 17:48:23 +0400
94dabd07fb #83 fix code Anton Romanov 2019-04-05 17:47:10 +0400
7a7dfb337f #83 fix postgres service Anton Romanov 2019-04-05 17:41:31 +0400
c7cdbe9044 #83 add tasks, modify build script for passing application properties Anton Romanov 2019-04-05 17:35:17 +0400
fe1820d540 #83 try to change container Anton Romanov 2019-04-05 16:37:03 +0400
67bfad22f9 #55 added create and update methods Nightblade73 2019-04-05 16:30:45 +0400
4a05d52e4c #83 try to change container Anton Romanov 2019-04-05 16:25:10 +0400
bbc398251f #83 try to change container Anton Romanov 2019-04-05 16:16:40 +0400
2cf3e52596 #73 merge dev into jdk11 Anton Romanov 2019-04-05 14:11:13 +0400
0d7c594a94 Merge branch '82-paper-formatted-list' into 'dev' Anton Romanov 2019-04-05 09:42:30 +0000
54edeb0559 #82 fix user abbreviate #172 Anton Romanov 2019-04-05 13:39:53 +0400
91d2168012 #82 show paper formatted lines Anton Romanov 2019-04-05 13:34:38 +0400
d6b7fe790a #55 added transition to the page new conference Nightblade73 2019-04-05 13:21:15 +0400
9d69f75530 #55 fixes Nightblade73 2019-04-04 20:26:38 +0400
2d04b1b43a #55 added findAll method in ConferenceService Nightblade73 2019-04-04 17:58:22 +0400
d189891e8c #55 added ConferenceFilterDto Nightblade73 2019-04-04 17:47:18 +0400
e3bbade40b #55 added ConferenceDto Nightblade73 2019-04-04 17:39:28 +0400
dc12a671d2 #55 added setters/getters Nightblade73 2019-04-04 12:50:12 +0400
be2dd291f6 #55 added conference model without user's participation and deposit. May be needed new user model. Nightblade73 2019-04-04 12:48:05 +0400
99a8550696 #42 merge dev into 42 T-Midnight 2019-04-04 09:44:51 +0400
566b7821d1 #42 merge dev into 42 T-Midnight 2019-04-04 09:43:26 +0400
8a7117d713 #42 Add leader and authors T-Midnight 2019-04-04 09:38:18 +0400
ded0ab482a add nonstopmode Семенова Мария 2019-04-03 17:46:45 +0400
4104aa04cd fixes for wrong build. entities always extends BaseEntity, tables must contains version column Anton Romanov 2019-04-03 10:39:55 +0400
54bbd2375d Merge branch '57-classes-creating' into 'dev' Anton Romanov 2019-04-03 04:03:46 +0000
0428bad048 #57 created classes #169 Nightblade73 2019-04-02 10:53:09 +0400
0c84f30498 Merge branch '81-students-create-database' into 'dev' Anton Romanov 2019-04-01 05:36:15 +0000
5ffb2d547e Merge branch 'dev' into 81-students-create-database #168 Anton Romanov 2019-04-01 09:42:40 +0400
61d4c67aac Merge branch '56-creating-tables-in-DB' into 'dev' Anton Romanov 2019-04-01 05:27:43 +0000
c2dc080d23 Merge branch '71-add-task-layout' into 'dev' Anton Romanov 2019-04-01 05:17:39 +0000
4e89c65c22 #81 adding main tables ASH 2019-03-31 18:58:57 +0400
2ad03a5689 #71 adding dashboard #156 ASH 2019-03-31 13:47:15 +0400
e93f618779 #56 added database schema #167 Nightblade73 2019-03-31 13:12:43 +0400
76d4c15db5 Merge branch '18-paper-timeline' into 'dev' Anton Romanov 2019-03-30 07:12:26 +0000
e98445bb48 Merge branch '53-vyorstka-stranitsy-spiska-konferentsiy' into 'dev' Anton Romanov 2019-03-30 07:10:47 +0000
030e1a3afb Merge branch 'dev' into 18-paper-timeline #166 Семенова Мария 2019-03-28 18:32:44 +0400
ba64b7df16 Merge branch 'restore-commits-page' into 'dev' Anton Romanov 2019-03-28 11:58:02 +0000
103ff05846 fix displaying commits #165 Anton Romanov 2019-03-28 15:53:31 +0300