summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-10-23Merge branch 'master' of https://github.com/FOSSEE/nccps-2018FOSSEE Git User
2018-10-23Merge pull request #44 from Sashi20/masterSashi20
Modified subject line for proposal rejection
2018-10-23Modified subject line for proposal rejectionSashi20
2018-10-23Merge pull request #43 from Sashi20/masterSashi20
Gave staff user permission to modify proposals
2018-10-23Gave staff user permission to modify proposalsSashi20
2018-10-23Merge pull request #42 from Sashi20/masterSashi20
Added missing comma
2018-10-23Added missing commaSashi20
2018-10-23Merge pull request #41 from Sashi20/masterSashi20
Modified indentation for rejection emails
2018-10-23Modified indentation for rejection emailsSashi20
2018-10-23Merge pull request #40 from Sashi20/masterSashi20
Modified status change view
2018-10-23Modified status change viewSashi20
2018-10-23Merge pull request #39 from Sashi20/masterSashi20
Modified resubmit email template
2018-10-23Modified resubmit email templateSashi20
2018-10-23Merge pull request #38 from Sashi20/masterSashi20
Modified the registration table and email template for rejecting prop…
2018-10-23Modified the registration table and email template for rejecting proposalSashi20
2018-10-23Merge pull request #37 from Sashi20/masterSashi20
Added js files and removed unnecessary code in view proposals
2018-10-23Added js files and removed unnecessary code in view proposalsSashi20
2018-10-23Merge pull request #36 from Akshen/developSashi20
hyphen bug fix
2018-10-23hyphen bug fixAkshen
2018-10-23Merge pull request #35 from Akshen/developSashi20
Download AnswerPaper data via Admin Panel
2018-10-23Merge pull request #34 from Sashi20/masterSashi20
Modified link for ticket registration
2018-10-23Merge branch 'master' of https://github.com/FOSSEE/nccps-2018 into developAkshen
2018-10-22Download AnswerPaper data via Admin PanelAkshen
2018-10-22Modified link for ticket registrationSashi20
2018-10-18Merge branch 'master' of https://github.com/FOSSEE/nccps-2018FOSSEE Git User
2018-10-18Merge pull request #33 from prashantsinalkar/masterPrashant S
removed unused jquery
2018-10-18removed unused jqueryprashantsinalkar
2018-10-18Merge pull request #32 from prashantsinalkar/masterPrashant S
updated the payment instructions
2018-10-18updated the payment instructionsprashantsinalkar
2018-10-17Merge branch 'master' of https://github.com/FOSSEE/nccps-2018FOSSEE Git User
2018-10-17Merge pull request #31 from prashantsinalkar/masterPrashant S
updated the payment details
2018-10-17updated the payment instructionsprashantsinalkar
2018-10-17updated the accomodation detailsprashantsinalkar
2018-10-17updated the payment detailsprashantsinalkar
2018-10-12Merge branch 'master' of https://github.com/FOSSEE/nccps-2018FOSSEE Git User
2018-10-12Merge pull request #30 from Sashi20/masterSashi20
Remove migration files and modified config file
2018-10-12Remove migration files and modified config fileSashi20
2018-10-12Merge pull request #29 from Akshen/developSashi20
Update Admin Model
2018-10-12UpdatedAkshen
- Model Admin Update
2018-10-12Merge branch 'master' of https://github.com/FOSSEE/nccps-2018 into developAkshen
2018-10-12Update Admin ModelAkshen
2018-10-10Merge branch 'master' of https://github.com/FOSSEE/nccps-2018FOSSEE Git User
2018-10-10Merge pull request #28 from Sashi20/masterSashi20
Disabled submit paper link
2018-10-10Disabled submit paper linkSashi20
2018-10-10Merge pull request #27 from Sashi20/fix-settingsSashi20
Restore default DB settings in settings.py
2018-10-10Restore default DB settings in settings.pySashi20
2018-10-10Merge pull request #26 from Sashi20/masterSashi20
Added migrations for dwsim quiz
2018-10-10Added migrations for dwsim quizSashi20
2018-10-10Merge pull request #25 from Sashi20/masterSashi20
Minor changes in the navbar and quiz intro
2018-10-10Minor changes in the navbar and quiz introSashi20