Commit Graph

208 Commits (486a0ac50ab4c312b14443759990a55099e6504a)
 

Author SHA1 Message Date
Anton Romanov 4e3e882f76 Merge branch '30-main-grants-page' into 'master'
Resolve "Создать страницу грантов"

Closes #30

See merge request romanov73/ng-tracker!17
6 years ago
Anton Romanov ef32bba684 Merge remote-tracking branch 'origin/master' 6 years ago
Anton Romanov 6314ca6ec5 notify if paper deadline in future 6 years ago
T-Midnight d13644d67d Update dashboard for grants 6 years ago
Anton Romanov 58299d749d fix for remove event 6 years ago
Anton Romanov 2dc0b4e27c fix event create conditions 6 years ago
Anton Romanov 6adc96761b fix delete button 6 years ago
Anton Romanov 9a0fa5a170 fix delete button 6 years ago
Anton Romanov 2d78753b06 show events 6 years ago
Anton Romanov c774820d95 fix build script for netbeans 6 years ago
Anton Romanov ec9009be10 show toolbar buttons 6 years ago
Anton Romanov 74d9c5cd20 show toolbar buttons 6 years ago
Anton Romanov 863991953c show paper status 6 years ago
Anton Romanov f587f80eb6 fix code 6 years ago
Anton Romanov 112958a70b fix code 6 years ago
Anton Romanov 06864c7ec8 read dashboard 6 years ago
Alyona 02f762b4f1 filter 6 years ago
Anton Romanov eaf03daba3 Merge branch '14-DB-filter' into 'master'
Resolve "Метод чтения из БД для фильтра статей"

See merge request romanov73/ng-tracker!19
6 years ago
Anton Romanov 2a76acc7ad filter papers 6 years ago
Anton Romanov 4c0ccbe285 Merge remote-tracking branch 'origin/master' 6 years ago
Anton Romanov 9380b74f67 move class 6 years ago
Anton Romanov 600d58d416 Merge branch '20-' into 'master'
Resolve "Реализовать периодические события"

Closes #20

See merge request romanov73/ng-tracker!15
6 years ago
Anton Romanov 190591c031 fix scheduler 6 years ago
Anton Romanov f0ac06c900 refactor and db changes 6 years ago
Anton Romanov 7cffbef9e2 delete paper 6 years ago
T-Midnight 4da039f9b0 Create dashboard for grants 6 years ago
Anton Romanov e3b248778c add route 6 years ago
Alyona 376c820b44 fix 6 years ago
Alyona e76e7ad864 fix 6 years ago
Elena 2db572f284 Задача №10 6 years ago
Anton Romanov d5f9a81b46 remove styles from email template 6 years ago
Alyona 7efb9a2926 Merge remote-tracking branch 'origin/master' 6 years ago
Anton Romanov 6aa5f807b7 move styles to body 6 years ago
Anton Romanov f5e80d7e3c Merge branch '21-Event-status' into 'master'
Resolve "Добавить статус события"

Closes #21

See merge request romanov73/ng-tracker!14
6 years ago
Anton Romanov 1b53debc88 Merge branch 'master' into 21-Event-status
# Conflicts:
#	src/main/resources/db/changelog-master.xml
6 years ago
Anton Romanov 5c54817fc6 fix styles 6 years ago
Anton Romanov 1211b0db29 add styles in email templates 6 years ago
Alyona 392b2a9657 added period event 6 years ago
Alyona 25707db6cd added period event 6 years ago
Elena 0f9bbc13cc Merge branch 'master' into 10-savePaper 6 years ago
Elena 65d788512b Задача №10 6 years ago
Alyona f449eeb999 Merge remote-tracking branch 'origin/master' 6 years ago
Anton Romanov 67881262be add notification templates 6 years ago
Anton Romanov 2bf84dc286 move to notification service 6 years ago
Anton Romanov 34d7927d30 fix scheduler code to use service 6 years ago
Anton Romanov cd09cf6d60 add toolbar 6 years ago
Anton Romanov e554f9ea4c fix paths 6 years ago
Anton Romanov 4c43776528 add config parameter 6 years ago
Anton Romanov 1958e01d01 Merge remote-tracking branch 'origin/master' 6 years ago
Anton Romanov bd78be93ab add paper create strategy 6 years ago