Nightblade73
|
5cb865eb70
|
#54 deleted edit btn
|
2019-03-11 14:43:32 +04:00 |
|
Nightblade73
|
2fec35264c
|
#54 add back link, css fixes
|
2019-03-11 12:58:40 +04:00 |
|
Nightblade73
|
f90d92b19d
|
#54 add custom paper-list
|
2019-03-11 11:36:00 +04:00 |
|
Nightblade73
|
d332282e03
|
#54 add custom deadline-list, add edit-button, add edit and delete icons
|
2019-03-10 22:15:09 +04:00 |
|
Nightblade73
|
7fff337c3a
|
#54 add member list
|
2019-03-07 22:50:37 +04:00 |
|
Nightblade73
|
76ec5add30
|
#54 part of make-up
|
2019-03-06 20:51:46 +04:00 |
|
Nightblade73
|
c21a65a075
|
#54 add transitions
|
2019-03-06 16:48:51 +04:00 |
|
Nightblade73
|
93e68b1929
|
#50 creating html page, changing href
|
2019-03-06 16:27:25 +04:00 |
|
Anton Romanov
|
cec13bb677
|
some layout fix
|
2018-12-30 19:23:11 +04:00 |
|
Anton Romanov
|
2cac98be50
|
fix enum field name
|
2018-12-29 09:58:37 +04:00 |
|
Anton Romanov
|
ce78f8ad66
|
some refactor
|
2018-12-28 13:57:20 +04:00 |
|
T-Midnight
|
816d115cc8
|
Hide button "Add Project" when project already exists (not perfect)
|
2018-12-25 02:44:50 +04:00 |
|
T-Midnight
|
18ad291e82
|
Made button "delete grant" visible
|
2018-12-25 00:14:38 +04:00 |
|
T-Midnight
|
2f68339ba2
|
Add thymeleaf template
|
2018-12-24 15:18:52 +04:00 |
|
T-Midnight
|
25278bcdd8
|
Create html fragments
|
2018-12-24 11:03:03 +04:00 |
|
Anton Romanov
|
6e14860c34
|
fix paper status template
|
2018-12-20 23:30:25 +04:00 |
|
Anton Romanov
|
468f440d9d
|
fix filer
|
2018-12-18 22:15:21 +04:00 |
|
Anton Romanov
|
ec1e3ff052
|
fix scripts
|
2018-12-18 19:40:23 +04:00 |
|
Anton Romanov
|
dc5abe1508
|
show authors
|
2018-12-18 19:23:15 +04:00 |
|
Anton Romanov
|
c88ce3ac37
|
confirm delete paper
|
2018-12-18 18:47:15 +04:00 |
|
Anton Romanov
|
c2c420027b
|
add papers navigation
|
2018-12-18 18:05:30 +04:00 |
|
Anton Romanov
|
59e2c9b544
|
edit deadlines
|
2018-12-17 13:46:08 +04:00 |
|
Anton Romanov
|
54ea705890
|
Merge branch 'master' into 46-mvc
# Conflicts:
# src/main/java/ru/ulstu/paper/controller/PaperController.java
# src/main/java/ru/ulstu/paper/model/Paper.java
# src/main/java/ru/ulstu/paper/model/PaperDto.java
# src/main/resources/public/js/papers.js
# src/main/resources/templates/papers/paper.html
# src/main/resources/templates/papers/papers.html
|
2018-12-14 16:00:46 +04:00 |
|
Anton Romanov
|
ac569ed9a9
|
Merge branch 'master' into 46-mvc
# Conflicts:
# src/main/java/ru/ulstu/paper/controller/PaperController.java
# src/main/java/ru/ulstu/paper/model/Paper.java
# src/main/java/ru/ulstu/paper/model/PaperDto.java
# src/main/resources/public/js/papers.js
# src/main/resources/templates/papers/paper.html
# src/main/resources/templates/papers/papers.html
|
2018-12-14 16:00:33 +04:00 |
|
Anton Romanov
|
35a08ab451
|
save authors
|
2018-12-05 18:08:47 +04:00 |
|
Anton Romanov
|
1f264331fa
|
fix npe
|
2018-12-05 17:36:53 +04:00 |
|
Anton Romanov
|
7b8f7a2047
|
format dates
|
2018-12-05 17:06:56 +04:00 |
|
Anton Romanov
|
54bf5735e5
|
fix create paper
|
2018-12-05 16:51:26 +04:00 |
|
Anton Romanov
|
7794738f63
|
fix js
|
2018-12-04 14:49:23 +04:00 |
|
Anton Romanov
|
3d4a7b09f3
|
show status
|
2018-12-04 14:48:39 +04:00 |
|
Anton Romanov
|
dfe44ab842
|
add validation
|
2018-12-04 14:13:01 +04:00 |
|
Anton Romanov
|
f9670ad0a5
|
pass values for paper
|
2018-12-04 11:35:51 +04:00 |
|
Anton Romanov
|
f376fedc64
|
load paper
|
2018-11-26 23:07:14 +04:00 |
|
Anton Romanov
|
aee396f686
|
Merge branch '14-filter-frontend' into 'master'
Resolve "Фильтр статей"
Closes #14
See merge request romanov73/ng-tracker!18
|
2018-11-23 16:40:15 +00:00 |
|
Anton Romanov
|
13f9081aee
|
fix failed commit
|
2018-11-23 20:37:24 +04:00 |
|
Anton Romanov
|
5fa5d670a5
|
show paper list in mvc
|
2018-11-23 16:45:40 +04:00 |
|
Alyona
|
f5068f8be9
|
filter
|
2018-11-23 14:17:16 +04:00 |
|
Alyona
|
a9ea796bbb
|
Merge branch 'master' into 14-filter-frontend
|
2018-11-23 14:12:37 +04:00 |
|
Elena
|
51e84e22a6
|
задача 10
|
2018-11-23 13:53:20 +04:00 |
|
Elena
|
fe6e52a19c
|
Merge branch 'master' into 10-savePaper
|
2018-11-23 12:39:36 +04:00 |
|
Anton Romanov
|
1b2db5b5d4
|
Merge remote-tracking branch 'origin/master'
|
2018-11-22 11:20:08 +04:00 |
|
Anton Romanov
|
ccd07305ec
|
add mertica
|
2018-11-22 11:19:50 +04:00 |
|
Anton Romanov
|
724dd6a78a
|
remove empty page
|
2018-11-21 15:47:26 +04:00 |
|
Anton Romanov
|
161fab55de
|
add toolbar
|
2018-11-21 15:47:14 +04:00 |
|
T-Midnight
|
f6647d6752
|
Create grant page
|
2018-11-21 15:28:41 +04:00 |
|
Anton Romanov
|
4e3e882f76
|
Merge branch '30-main-grants-page' into 'master'
Resolve "Создать страницу грантов"
Closes #30
See merge request romanov73/ng-tracker!17
|
2018-11-21 08:51:11 +00:00 |
|
T-Midnight
|
d13644d67d
|
Update dashboard for grants
|
2018-11-19 12:16:39 +04:00 |
|
Anton Romanov
|
2d78753b06
|
show events
|
2018-11-17 11:56:52 +04:00 |
|
Anton Romanov
|
ec9009be10
|
show toolbar buttons
|
2018-11-14 17:04:40 +04:00 |
|
Anton Romanov
|
74d9c5cd20
|
show toolbar buttons
|
2018-11-14 17:04:29 +04:00 |
|