Anton Romanov
|
b662437afe
|
add conferences
|
2020-04-27 18:34:22 +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 |
|
Anton Romanov
|
ff19001f1f
|
fix grant doubling cause date comparison
|
2019-06-11 22:09:30 +04:00 |
|
Anton Romanov
|
098f70ede6
|
Merge remote-tracking branch 'origin/dev' into dev
|
2019-06-08 14:37:07 +04:00 |
|
Anton Romanov
|
d84b1fcbdc
|
use HtmlUnit instead of selenium webdriver for grants loading
|
2019-06-08 14:36:12 +04:00 |
|
Artem.Arefev
|
96d166d031
|
#95 block user html
|
2019-06-07 12:23:03 +04:00 |
|
Artem.Arefev
|
fb23f182de
|
#95 merged with dev
|
2019-06-07 11:39:44 +04:00 |
|
Artem.Arefev
|
4104844b1e
|
#95 merged with dev
|
2019-06-06 00:01:03 +04:00 |
|
Artem.Arefev
|
c0afabc37c
|
#112 merged with dev
|
2019-06-05 23:57:33 +04:00 |
|
Artem.Arefev
|
22abf6a27d
|
#95 blocking user
|
2019-06-03 02:11:35 +04:00 |
|
Artem.Arefev
|
abea3c7dad
|
#112 ping model changed
|
2019-06-02 21:53:51 +04:00 |
|
Artem.Arefev
|
3898dcf1c1
|
#112 changed mapping
|
2019-06-01 12:57:20 +04:00 |
|
Artem.Arefev
|
2d230afa35
|
#112changed mapping
|
2019-06-01 12:56:37 +04:00 |
|
a.vasin
|
ae8dc58a9d
|
#101 event service edited
|
2019-06-01 12:16:59 +04:00 |
|
a.vasin
|
267bd5b0f3
|
#101 event service edited
|
2019-06-01 11:44:41 +04:00 |
|
a.vasin
|
291f4e1e33
|
#101 db edited
|
2019-06-01 09:44:25 +04:00 |
|
Artem.Arefev
|
53307c6add
|
#95 init
|
2019-05-31 22:42:59 +04:00 |
|
Artem.Arefev
|
a405267092
|
merged with dev
|
2019-05-31 22:42:19 +04:00 |
|
a.vasin
|
632c6299b7
|
#101 files attach modified
|
2019-05-30 00:08:13 +04:00 |
|
a.vasin
|
9013d79228
|
#101 grant attach
|
2019-05-29 23:40:30 +04:00 |
|
a.vasin
|
eceb8ec528
|
#101 project model edited
|
2019-05-29 17:52:15 +04:00 |
|
Васин Антон
|
c25392337a
|
#98 project deadlines edited
|
2019-05-28 16:16:41 +03:00 |
|
a.vasin
|
3b0a2dd964
|
#98 executors list added
|
2019-05-28 11:12:27 +04:00 |
|
Artem.Arefev
|
a35bcfce1b
|
#112 merged with dev
|
2019-05-27 22:47:01 +04:00 |
|
Васин Антон
|
4bb4fd6bca
|
#98 changelog edited
|
2019-05-27 09:35:58 +03:00 |
|
Васин Антон
|
4eeb79ab80
|
#98 changelog edited
|
2019-05-27 09:19:52 +03:00 |
|
Artem.Arefev
|
482e2b3595
|
#112 base ping activities
|
2019-05-27 00:42:43 +04:00 |
|
Anton Romanov
|
837a9f465c
|
#120 merge dev
|
2019-05-25 12:39:44 +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 |
|
T-Midnight
|
c0e66e81a2
|
#120 drop unnecessary table column
|
2019-05-20 20:47:10 +04:00 |
|
Васин Антон
|
097f7827b0
|
#98 db edited
|
2019-05-17 10:30:34 +03:00 |
|
ASH
|
cd1caa559e
|
Merge branch 'dev' into 79-students-tags-generation
# Conflicts:
# src/main/java/ru/ulstu/students/service/TaskService.java
|
2019-05-16 00:14:05 +04:00 |
|
ASH
|
a11e10dec4
|
#123 adding task timeline
|
2019-05-12 01:00:26 +04:00 |
|
ASH
|
7798508d4f
|
Merge branch 'dev' into 79-students-tags-generation
# Conflicts:
# src/main/resources/db/changelog-20190505_000000-schema.xml
# src/main/resources/db/changelog-master.xml
|
2019-05-11 23:26:21 +04:00 |
|
T-Midnight
|
e3ad5ba510
|
Merge remote-tracking branch 'remotes/origin/dev' into 119-notification-grants
|
2019-05-08 16:22:39 +04:00 |
|
T-Midnight
|
7ffe04f1db
|
#122 move to right directory
|
2019-05-07 22:47:27 +04:00 |
|
T-Midnight
|
d244437858
|
#122 fix bug
|
2019-05-07 22:35:44 +04:00 |
|
T-Midnight
|
934d194df1
|
#119 gelete unnecessary column
|
2019-05-07 22:15:49 +04:00 |
|
Васин Антон
|
b1e101c940
|
#101 db event edited
|
2019-05-07 13:34:00 +03:00 |
|
Васин Антон
|
4025aa67ca
|
#98 project completion added
|
2019-05-06 21:51:58 +03:00 |
|
ASH
|
65dea9bce2
|
#79 adding task planer generation
|
2019-05-06 22:39:08 +04:00 |
|
Васин Антон
|
ee55e08fee
|
#98 project tasks deadline edited
|
2019-05-06 17:43:20 +03:00 |
|
T-Midnight
|
114f6769ac
|
#32 create changelog
|
2019-05-05 23:54:02 +04:00 |
|
Anton Romanov
|
68737b976f
|
Merge branch '117-filter-users' into 'dev'
Resolve "Фильтрация участников гранта по двум новым параметрам"
Closes #117
See merge request romanov73/ng-tracker!77
|
2019-05-03 05:58:19 +00:00 |
|
Nightblade73
|
6820c617f3
|
#70 remove conflicts
|
2019-05-02 14:42:08 +04:00 |
|
T-Midnight
|
c8cfde67a9
|
Merge remote-tracking branch 'remotes/origin/dev' into 38-attach-file-grants
|
2019-05-01 00:21:56 +04:00 |
|
T-Midnight
|
1f6d15b74b
|
#38 create changelogs
|
2019-04-30 23:55:31 +04:00 |
|
Васин Антон
|
5c677a975c
|
#114 changelog edited
|
2019-04-30 01:01:30 +03:00 |
|
Nightblade73
|
51877023d1
|
#70 added new column to event
|
2019-04-26 09:28:20 +04:00 |
|