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
|
fb23f182de
|
#95 merged with dev
|
2019-06-07 11:39:44 +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
|
a405267092
|
merged with dev
|
2019-05-31 22:42:19 +04:00 |
|
Artem.Arefev
|
e680aa30c4
|
#112 ping activity
|
2019-05-31 00:33:21 +04:00 |
|
Artem.Arefev
|
a35bcfce1b
|
#112 merged with dev
|
2019-05-27 22:47:01 +04:00 |
|
Artem.Arefev
|
482e2b3595
|
#112 base ping activities
|
2019-05-27 00:42:43 +04:00 |
|
Anton Romanov
|
916bbae414
|
#120 add debug email
|
2019-05-25 21:15:21 +04:00 |
|
Anton Romanov
|
837a9f465c
|
#120 merge dev
|
2019-05-25 12:39:44 +04:00 |
|
Artem.Arefev
|
c4b35ddf6a
|
#91 merged with dev
|
2019-05-27 21:53:55 +04:00 |
|
Artem.Arefev
|
0e7fdac980
|
Merge remote-tracking branch 'origin/dev' into 91-users-info
|
2019-05-27 00:42:54 +04:00 |
|
Artem.Arefev
|
193b2b3a32
|
#91 using RestTemplate & show error on timetable loading exception
|
2019-05-25 14:03:43 +04:00 |
|
Anton Romanov
|
c303d65c8d
|
#120 move to services
|
2019-05-23 16:02:44 +04:00 |
|
Artem.Arefev
|
d7c4e6b222
|
#91 base users dashboard
|
2019-05-21 02:09:07 +04:00 |
|
Artem.Arefev
|
90799356ab
|
89 password reset
|
2019-05-19 00:42:24 +04:00 |
|
Artem.Arefev
|
6a62e61caf
|
87 error handling + ajax + rest
|
2019-05-17 04:34:03 +04:00 |
|
Artem.Arefev
|
052e4a1aef
|
88 rest changePassword + ajax
|
2019-05-17 03:55:22 +04:00 |
|
Artem.Arefev
|
4fc8bc3717
|
Merge branch '87-inviting-user' into 88-change-password
|
2019-05-17 02:01:56 +04:00 |
|
Artem.Arefev
|
728fa42972
|
87 error handling
|
2019-05-17 02:01:26 +04:00 |
|
Artem.Arefev
|
d50673f5fa
|
87-inviting-user small fix in mail template, and changed default user name
|
2019-05-16 01:01:31 +04:00 |
|
Artem.Arefev
|
f8f501b8ff
|
88-change-password base
|
2019-05-16 00:38:53 +04:00 |
|
Artem.Arefev
|
48a18a3a57
|
87 fixed imports
|
2019-05-15 22:24:19 +04:00 |
|
Artem.Arefev
|
d88f67ce00
|
87 transactional inviting
|
2019-05-15 03:08:21 +04:00 |
|
Artem.Arefev
|
11ef644e5e
|
88 inviting user base
|
2019-05-15 02:48:44 +04:00 |
|
Artem.Arefev
|
95fc9da47d
|
lk base, created from dev
|
2019-05-15 00:49:54 +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 |
|
Anton Romanov
|
cafb3abcee
|
#4--2 merge with dev
|
2019-04-11 22:37:32 +04:00 |
|
Anton Romanov
|
1487affb8e
|
#73 fix deprecated annotations and classes
|
2019-03-20 19:20:28 +04:00 |
|
Anton Romanov
|
e74261184f
|
#73 first fixes by update versions
|
2019-03-20 14:37:57 +04:00 |
|
Anton Romanov
|
48894b2176
|
display user in filter
|
2019-03-12 13:40:48 +04:00 |
|
Anton Romanov
|
da7a17ee49
|
add service methods
|
2019-03-12 12:51:59 +03:00 |
|
Anton Romanov
|
112958a70b
|
fix code
|
2018-11-14 15:18:22 +04:00 |
|
Anton Romanov
|
67881262be
|
add notification templates
|
2018-11-09 10:04:50 +04:00 |
|
Anton Romanov
|
bd78be93ab
|
add paper create strategy
|
2018-11-08 19:36:50 +04:00 |
|
Anton Romanov
|
da1fbc3124
|
send notification
|
2018-06-10 01:49:38 +04:00 |
|
Anton Romanov
|
aa919906aa
|
add event controller
|
2018-06-10 01:12:28 +04:00 |
|
Anton Romanov
|
671cfdd486
|
add java code
|
2018-05-04 17:08:20 +04:00 |
|