Commit Graph

927 Commits (23797bae9eb1fcc4942776e485078324b1cb56c9)
 

Author SHA1 Message Date
Anton Romanov 5fa5d670a5 show paper list in mvc 6 years ago
Alyona f5068f8be9 filter 6 years ago
Alyona a9ea796bbb Merge branch 'master' into 14-filter-frontend 6 years ago
Alyona df6bc223aa Merge remote-tracking branch 'origin/master' 6 years ago
Alyona 5eff1bac81 Merge branch 'master' of C:\Users\катя\IdeaProjects\ng-tracker with conflicts. 6 years ago
Elena 8fc6d3b569 задача 10(new) 6 years ago
Elena 51e84e22a6 задача 10 6 years ago
Elena fe6e52a19c Merge branch 'master' into 10-savePaper 6 years ago
Anton Romanov e84e542309 fix colors 6 years ago
Anton Romanov 7f1fb168e1 fix colors 6 years ago
Anton Romanov 4163276da3 add paper status 6 years ago
Anton Romanov 1b2db5b5d4 Merge remote-tracking branch 'origin/master' 6 years ago
Anton Romanov ccd07305ec add mertica 6 years ago
Anton Romanov 724dd6a78a remove empty page 6 years ago
Anton Romanov 161fab55de add toolbar 6 years ago
Anton Romanov 0aec0c3c8e Merge remote-tracking branch 'origin/master' 6 years ago
Anton Romanov 908bf814ce Merge branch '31-' into 'master'
Resolve "Создать страницу гранта"

Closes #31

See merge request romanov73/ng-tracker!20
6 years ago
Anton Romanov 29586c9313 close failed papers 6 years ago
T-Midnight f6647d6752 Create grant page 6 years ago
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