Commit Graph

357 Commits

Author SHA1 Message Date
anastasia shulga
95f70f425a Update2 TagService.java 2019-04-16 08:21:36 +00:00
anastasia shulga
dbd61ce80c Update TagService.java 2019-04-16 07:55:37 +00:00
ASH
1f36e04cd3 #74 fully adding tags 2019-04-14 21:24:22 +04:00
ASH
d6a11a5902 #74 fixing codestyle and tags 2019-04-14 17:50:23 +04:00
ASH
5eae7305c4 #74 codestyle 2019-04-11 00:14:03 +04:00
ASH
f019806a8e #74 fixing adding and db everything added except tags 2019-04-10 23:57:55 +04:00
ASH
9b697c6f3f #74 adding models, controllers and services 2019-04-09 23:18:39 +04:00
Anton Romanov
b9af7c20c7 fix grids 2019-04-06 00:11:49 +04:00
Anton Romanov
d26ab93629 Merge branch '83-docker-hub' into 'dev'
Resolve "Образ для docker hub"

Closes #83

See merge request romanov73/ng-tracker!46
2019-04-05 18:03:16 +00:00
Anton Romanov
e0ca29fbab #83 fix wrong entity 2019-04-05 21:47:42 +04:00
Anton Romanov
72add3638b #83 check CI 2019-04-05 18:01:12 +04:00
Anton Romanov
0feef9016a #83 disable cache 2019-04-05 17:48:23 +04:00
Anton Romanov
94dabd07fb #83 fix code 2019-04-05 17:47:10 +04:00
Anton Romanov
7a7dfb337f #83 fix postgres service 2019-04-05 17:41:31 +04:00
Anton Romanov
c7cdbe9044 #83 add tasks, modify build script for passing application properties 2019-04-05 17:35:17 +04:00
Anton Romanov
fe1820d540 #83 try to change container 2019-04-05 16:37:03 +04:00
Anton Romanov
4a05d52e4c #83 try to change container 2019-04-05 16:25:10 +04:00
Anton Romanov
bbc398251f #83 try to change container 2019-04-05 16:16:40 +04:00
Anton Romanov
0d7c594a94 Merge branch '82-paper-formatted-list' into 'dev'
Resolve "Метод в rest для список опубликованных статей"

Closes #82

See merge request romanov73/ng-tracker!45
2019-04-05 09:42:30 +00:00
Anton Romanov
54edeb0559 #82 fix user abbreviate 2019-04-05 13:39:53 +04:00
Anton Romanov
91d2168012 #82 show paper formatted lines 2019-04-05 13:34:38 +04:00
Anton Romanov
4104aa04cd fixes for wrong build. entities always extends BaseEntity, tables must contains version column 2019-04-03 10:39:55 +04:00
Anton Romanov
54bbd2375d Merge branch '57-classes-creating' into 'dev'
Resolve "Создание классов для модуля Конференции"

Closes #57

See merge request romanov73/ng-tracker!42
2019-04-03 04:03:46 +00:00
Nightblade73
0428bad048 #57 created classes 2019-04-02 10:53:09 +04:00
Anton Romanov
0c84f30498 Merge branch '81-students-create-database' into 'dev'
Resolve "Создание базы данных"

Closes #81

See merge request romanov73/ng-tracker!41
2019-04-01 05:36:15 +00:00
Anton Romanov
5ffb2d547e Merge branch 'dev' into 81-students-create-database
# Conflicts:
#	src/main/resources/db/changelog-master.xml
2019-04-01 09:42:40 +04:00
Anton Romanov
61d4c67aac Merge branch '56-creating-tables-in-DB' into 'dev'
Resolve "Создание таблиц в БД по модулю конференций"

Closes #56

See merge request romanov73/ng-tracker!40
2019-04-01 05:27:43 +00:00
Anton Romanov
c2dc080d23 Merge branch '71-add-task-layout' into 'dev'
Resolve "Верстка страницы добавления новой задачи, ПУ и списка задач"

Closes #71

See merge request romanov73/ng-tracker!29
2019-04-01 05:17:39 +00:00
ASH
4e89c65c22 #81 adding main tables 2019-03-31 18:58:57 +04:00
ASH
2ad03a5689 #71 adding dashboard 2019-03-31 13:47:15 +04:00
Nightblade73
e93f618779 #56 added database schema 2019-03-31 13:12:43 +04:00
Anton Romanov
76d4c15db5 Merge branch '18-paper-timeline' into 'dev'
Resolve "Реализовать добавление в таймлайн событий по дедлайнам статей"

Closes #18

See merge request romanov73/ng-tracker!39
2019-03-30 07:12:26 +00:00
Anton Romanov
e98445bb48 Merge branch '53-vyorstka-stranitsy-spiska-konferentsiy' into 'dev'
Resolve "Вёрстка страницы списка конференций"

Closes #53

See merge request romanov73/ng-tracker!33
2019-03-30 07:10:47 +00:00
Семенова Мария
030e1a3afb Merge branch 'dev' into 18-paper-timeline
# Conflicts:
#	src/main/java/ru/ulstu/paper/model/Paper.java
#	src/main/resources/db/changelog-master.xml
2019-03-28 18:32:44 +04:00
Anton Romanov
ba64b7df16 Merge branch 'restore-commits-page' into 'dev'
partially restored commits page

See merge request romanov73/ng-tracker!38
2019-03-28 11:58:02 +00:00
Anton Romanov
103ff05846 fix displaying commits 2019-03-28 15:53:31 +03:00
Anton Romanov
539095c89e partially restored commits page 2019-03-28 14:59:35 +04:00
Anton Romanov
7269f45662 Merge branch '80-no-records-message' into 'dev'
Resolve "Добавить сообщения на пустые страницы"

Closes #80

See merge request romanov73/ng-tracker!37
2019-03-28 10:39:06 +00:00
Anton Romanov
7b0b7a041a #80 hide mvc controllers from api 2019-03-28 14:45:39 +04:00
Anton Romanov
c70c35f4f3 #80 add no records message 2019-03-28 14:36:58 +04:00
Семенова Мария
2f0c461524 #18 add paper events 2019-03-28 12:40:10 +04:00
Nightblade73
01b082c31b #53 changed style like in module "papers" 2019-03-28 10:15:15 +04:00
Anton Romanov
e74fcb316c #33 small external link 2019-03-27 13:27:49 +04:00
Anton Romanov
37e20fb472 Update README.md 2019-03-27 09:07:02 +00:00
Anton Romanov
1dbb9b9136 Merge branch '33-paper-url' into 'dev'
Resolve "Добавить в конференцию/статью ссылку на сайт"

Closes #33

See merge request romanov73/ng-tracker!36
2019-03-27 07:58:58 +00:00
ASH
af3c0c0faa #71 fixing layout n adding 2019-03-26 10:49:26 +04:00
Nightblade73
79cfd7c0ab #53 added pagination style, css fixes 2019-03-25 11:41:36 +04:00
Nightblade73
cc1f5c00c5 #53 adapted, refactor css 2019-03-24 16:17:26 +04:00
Nightblade73
99468a0cea #53 added actual.html, css fixes 2019-03-24 13:48:34 +04:00
Nightblade73
bff824bc06 #53 added control panel 2019-03-24 12:46:15 +04:00