Anton Romanov
|
7587ff7a51
|
show paper type
|
2019-11-23 09:27:15 +04:00 |
|
Anton Romanov
|
6c220355ee
|
display some of paper
|
2019-11-22 23:47:59 +04:00 |
|
Anton Romanov
|
48955b9cfd
|
show paper statuses
|
2019-11-21 11:30:09 +04:00 |
|
Anton Romanov
|
9665653234
|
show paper list
|
2019-11-21 10:54:48 +04:00 |
|
Anton Romanov
|
df1bf873ff
|
fix warnings
|
2019-06-22 13:31:53 +04:00 |
|
Anton Romanov
|
36c4e52e37
|
Merge branch 'dev' into move-to-jdk11
# Conflicts:
# src/main/java/ru/ulstu/conference/service/ConferenceService.java
# src/main/java/ru/ulstu/grant/model/Grant.java
# src/main/java/ru/ulstu/grant/service/GrantService.java
# src/main/java/ru/ulstu/paper/model/Paper.java
# src/main/java/ru/ulstu/paper/service/PaperService.java
# src/main/java/ru/ulstu/project/model/Project.java
# src/main/java/ru/ulstu/project/model/ProjectDto.java
# src/main/java/ru/ulstu/students/model/Task.java
# src/main/java/ru/ulstu/students/service/TaskService.java
# src/main/java/ru/ulstu/timeline/model/Event.java
# src/main/java/ru/ulstu/timeline/model/EventDto.java
# src/main/java/ru/ulstu/timeline/service/EventService.java
# src/main/java/ru/ulstu/user/service/UserService.java
# src/main/resources/application.properties
# src/main/resources/db/changelog-master.xml
# src/main/resources/public/css/conference.css
# src/main/resources/public/js/conference.js
# src/main/resources/public/js/tasks.js
# src/main/resources/templates/conferences/conference.html
# src/main/resources/templates/grants/grant.html
# src/main/resources/templates/papers/paper.html
|
2019-06-21 04:22:06 +04:00 |
|
Artem.Arefev
|
c0afabc37c
|
#112 merged with dev
|
2019-06-05 23:57:33 +04:00 |
|
Васин Антон
|
482964fe53
|
#101 EventService edited
|
2019-06-03 20:21:46 +03:00 |
|
Artem.Arefev
|
abea3c7dad
|
#112 ping model changed
|
2019-06-02 21:53:51 +04:00 |
|
a.vasin
|
bde4ac5f1c
|
#101 event service edited
|
2019-06-01 13:25:12 +04:00 |
|
Artem.Arefev
|
3898dcf1c1
|
#112 changed mapping
|
2019-06-01 12:57:20 +04:00 |
|
a.vasin
|
db3252d822
|
#101 event service edited
|
2019-06-01 12:55:13 +04:00 |
|
a.vasin
|
7edb9d2aa3
|
#101 event service edited
|
2019-06-01 11:56:38 +04:00 |
|
Artem.Arefev
|
e680aa30c4
|
#112 ping activity
|
2019-05-31 00:33:21 +04:00 |
|
Artem.Arefev
|
482e2b3595
|
#112 base ping activities
|
2019-05-27 00:42:43 +04:00 |
|
Семенова Мария
|
22195813ae
|
#127 fixes
|
2019-05-24 16:15:38 +04:00 |
|
Семенова Мария
|
01bcac2680
|
#127 allow nullable year
|
2019-05-24 00:26:38 +04:00 |
|
Семенова Мария
|
24a1276005
|
#127 autocomplete
|
2019-05-24 00:14:46 +04:00 |
|
Семенова Мария
|
512a805e8c
|
#127 references formatting
|
2019-05-23 17:26:22 +04:00 |
|
Семенова Мария
|
7c1b124c94
|
#127 references tab, crud
|
2019-05-23 15:48:46 +04:00 |
|
Семенова Мария
|
29cfadef02
|
#127 reference model, schema
|
2019-05-23 15:02:55 +04:00 |
|
Nightblade73
|
bde9cb51fb
|
#104 some methods fixed
|
2019-05-16 15:55:29 +04:00 |
|
Nightblade73
|
c0937d721a
|
#104 removePaper, addPaper, takePart fixed
|
2019-05-16 15:35:32 +04:00 |
|
T-Midnight
|
e1907d3169
|
#121 change Paper to PaperDto in attaching papers
|
2019-05-12 15:28:47 +04:00 |
|
Семенова Мария
|
2fba252df0
|
#109 show other paper attachs
|
2019-05-07 23:53:10 +04:00 |
|
Семенова Мария
|
1e07c5424d
|
#109 only one conference for paper
|
2019-05-07 21:35:50 +04:00 |
|
Семенова Мария
|
dffd839905
|
#109 only uncompleted for grant
|
2019-05-07 20:26:49 +04:00 |
|
T-Midnight
|
de625923e9
|
#117 resolve discussions v.2
|
2019-05-02 21:56:54 +04:00 |
|
T-Midnight
|
b334b5d70e
|
#117 resolve discussions
|
2019-05-02 21:42:06 +04:00 |
|
T-Midnight
|
8b333ab3a6
|
Merge branch '38-attach-file-grants' into 117-filter-users
|
2019-05-02 21:29:20 +04:00 |
|
T-Midnight
|
9cf002ad95
|
Merge remote-tracking branch 'remotes/origin/dev' into 117-filter-users
|
2019-04-26 15:22:04 +04:00 |
|
T-Midnight
|
39f3c69479
|
#117 add scopus papers filter
|
2019-04-26 15:16:04 +04:00 |
|
T-Midnight
|
51e121ae24
|
#117 add BAK papers filter
|
2019-04-26 00:29:20 +04:00 |
|
Семенова Мария
|
8f3e3fd9a7
|
#108 add formatting methods
|
2019-04-26 00:00:01 +04:00 |
|
Семенова Мария
|
71ec7bb726
|
#108 add reference dto
|
2019-04-25 22:08:24 +04:00 |
|
Anton Romanov
|
1e6fbdc1fa
|
Merge branch '64-add-article-conf' into 'dev'
Resolve "Добавить новую статью к конференции"
Closes #64
See merge request romanov73/ng-tracker!70
|
2019-04-24 09:35:08 +00:00 |
|
Anton Romanov
|
8f2f6adc3b
|
#64 show global message
|
2019-04-23 23:15:22 +04:00 |
|
T-Midnight
|
6df1a87367
|
#107 merge with dev
|
2019-04-23 15:01:47 +04:00 |
|
Nightblade73
|
6d6ea3136d
|
#64 dont show error message
|
2019-04-23 13:37:56 +04:00 |
|
T-Midnight
|
d3b8be2cf1
|
#107 add view of the selected papers
|
2019-04-23 13:21:13 +04:00 |
|
Anton Romanov
|
7684bac74d
|
Merge branch 'dev' into move-to-jdk11
# Conflicts:
# build.gradle
# src/main/java/ru/ulstu/grant/model/GrantDto.java
# src/main/java/ru/ulstu/grant/service/GrantService.java
# src/main/java/ru/ulstu/paper/model/PaperDto.java
# src/main/java/ru/ulstu/project/model/Project.java
|
2019-04-23 11:35:41 +04:00 |
|
Nightblade73
|
53cc777734
|
#64 delete conference refactor
|
2019-04-22 21:46:42 +04:00 |
|
Nightblade73
|
2767403128
|
#64 added saving in db
|
2019-04-22 15:11:52 +04:00 |
|
Nightblade73
|
5bfeaff054
|
#64 added method addPaper
|
2019-04-22 11:13:04 +04:00 |
|
Семенова Мария
|
a3d1834ab8
|
#110 add paper type
|
2019-04-21 12:17:31 +04:00 |
|
Anton Romanov
|
9e31bfa7d7
|
#106 add checkstyle rules
|
2019-04-19 17:08:12 +04:00 |
|
Семенова Мария
|
a2dca6b7c6
|
Merge branch 'dev' into paper-latex-editing
# Conflicts:
# src/main/java/ru/ulstu/paper/model/Paper.java
# src/main/java/ru/ulstu/paper/model/PaperDto.java
# src/main/java/ru/ulstu/paper/service/PaperService.java
# src/main/resources/db/changelog-master.xml
# src/main/resources/templates/papers/paper.html
|
2019-04-18 18:20:51 +04:00 |
|
Семенова Мария
|
789fda9c98
|
remove nonstopmode from bibtex
|
2019-04-18 10:49:36 +04:00 |
|
Nightblade73
|
dca644eba1
|
#66 added handling of adding articles not added to the picker.
|
2019-04-16 10:42:40 +04:00 |
|
Anton Romanov
|
2cf3e52596
|
#73 merge dev into jdk11
|
2019-04-05 14:11:13 +04:00 |
|