summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-10-31Merge branch 'master' of https://github.com/FOSSEE/nccps-2018FOSSEE Git User
2018-10-31Merge pull request #48 from Sashi20/masterSashi20
Modified group registrations sentence
2018-10-31Modified group registrations sentenceSashi20
2018-10-31Merge pull request #47 from Sashi20/masterSashi20
Added sentence for group registrations
2018-10-31Added sentence for group registrationsSashi20
2018-10-31Settings.py UpdatedAkshen
- from sqlite3 to mysql
2018-10-31Allow participants to view and download solutionsAkshen
- view correct answers - download all dwsim files - remove 10 marks week
2018-10-25Merge branch 'master' of https://github.com/FOSSEE/nccps-2018FOSSEE Git User
2018-10-25Merge pull request #45 from Akshen/developSashi20
Update marks for week 3 and 4
2018-10-25Marks Issue fixedAkshen
2018-10-25Update marks for week 3 and 4Akshen
- 5 marks for week 3 - 10 marks for week 4 13th and 14th TBA - Upload Model for each question TBD
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
generated by cgit (git 2.34.1) at 2024-12-20 11:15:06 +0000