romanov73/ng-tracker
1
0
Fork 0
Code Issues 18 Pull Requests 4 Projects Releases Wiki Activity
342 Commits 15 Branches 1 Tag 45 MiB
2cf3e52596
Commit Graph

342 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anton Romanov
2cf3e52596 #73 merge dev into jdk11 2019-04-05 14:11:13 +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
Nightblade73
ea4e25aded #53 added years filter forms 2019-03-23 15:19:48 +04:00
Nightblade73
edd6aee00f #53 fast fix 2019-03-23 12:52:52 +04:00
Nightblade73
50dbe8cb8f #53 added custom checkboxes, added selection of all conferences 2019-03-23 12:39:53 +04:00
Семенова Мария
b90e7c054b #33 link in new tab 2019-03-23 12:23:30 +04:00
Семенова Мария
c228f5aee0 Merge branch 'dev' into 33-paper-url 
# Conflicts:
#	src/main/java/ru/ulstu/paper/model/Paper.java
#	src/main/java/ru/ulstu/paper/service/PaperService.java
#	src/main/resources/db/changelog-master.xml
 2019-03-23 12:04:51 +04:00
Anton Romanov
f5ce1aa269 Merge branch '13-paper-files' into 'dev' 
Resolve "Загрузка и сохранение файлов статей"

Closes #13

See merge request romanov73/ng-tracker!35
 2019-03-22 10:36:09 +00:00
Anton Romanov
482e74e10e #13 reduce of code 2019-03-22 13:58:03 +04:00
Anton Romanov
7012c00c5f #13 fix condition 2019-03-22 13:52:06 +04:00
Семенова Мария
a0b65f341b #13 streams refactoring 2019-03-22 13:21:32 +04:00
Семенова Мария
5da9de1bab #13 rename 'deleted', move creating fileDto to service 2019-03-22 09:32:21 +04:00
Семенова Мария
c702e2abb4 #13 fileDataDto instead of Object[] 2019-03-21 18:26:28 +04:00
Nightblade73
9182a71015 #53 added ping style 2019-03-21 11:30:28 +04:00
Nightblade73
d356c21944 #53 added buttons, added bottom pagination 2019-03-21 09:55:38 +04:00
Nightblade73
89e0d1a291 #53 customization css styles 2019-03-20 21:15:45 +04:00
Anton Romanov
167de9bf65 #73 fix deprecated parameters 2019-03-20 20:35:24 +04:00
Anton Romanov
993a034527 #73 restore authentication 2019-03-20 20:32:10 +04:00
Anton Romanov
9bd954ea9b #73 fix new thymeleaf syntax 2019-03-20 20:31:46 +04:00
Anton Romanov
1487affb8e #73 fix deprecated annotations and classes 2019-03-20 19:20:28 +04:00
Nightblade73
cb673d8782 #53 remake of conference list without table 2019-03-20 18:33:15 +04:00
Nightblade73
1364e8e84d #53 added multi selection, added selection of all items 2019-03-20 16:48:55 +04:00