summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
2018-10-10Merge pull request #24 from Akshen/developSashi20
DWSIM Quiz NCCP-2018
2018-10-10Merge branch 'master' of https://github.com/Akshen/nccps-2018Akshen
2018-10-10Add DWSIM Online QuizAkshen
- Moderator can add, edit questions and view leaderboard - Participant can take quiz specified for that day
2018-10-09Merge branch 'master' of https://github.com/FOSSEE/nccps-2018FOSSEE Git User
2018-10-09Merge pull request #23 from Sashi20/masterSashi20
Added a point to the dwsim quiz template
2018-10-09Added a point to the dwsim quiz templateSashi20
2018-10-09Merge pull request #22 from Sashi20/masterSashi20
Added dwsim qiz template to display intro
2018-10-09Added dwsim qiz template to display introSashi20
2018-10-08Merge branch 'master' of https://github.com/FOSSEE/nccps-2018FOSSEE Git User
2018-10-08Merge pull request #21 from Sashi20/masterSashi20
Disabled submission interface
2018-10-08Disabled submission interfaceSashi20
2018-10-03Merge branch 'master' of https://github.com/FOSSEE/nccps-2018FOSSEE Git User
2018-10-03Merge pull request #20 from Sashi20/masterSashi20
Disabled unncessary urls
2018-10-03Disabled unncessary urlsSashi20
2018-10-03Merge pull request #19 from Sashi20/masterSashi20
Extended paper submission date and fixed minor issues in edit proposal
2018-10-03Extended paper submission date and fixed minor issues in edit proposalSashi20
2018-09-28Merge branch 'master' of https://github.com/FOSSEE/nccps-2018FOSSEE Git User
2018-09-28Merge pull request #18 from Sashi20/masterSashi20
Modified access for staff user to view proposals
2018-09-28Modified access for staff user to view proposalsSashi20
2018-09-27Merge branch 'master' of https://github.com/FOSSEE/nccps-2018FOSSEE Git User
2018-09-27Merge pull request #17 from Sashi20/masterSashi20
Modified user status to view proposals
2018-09-27Modified user status to view proposalsSashi20
2018-09-26Merge branch 'master' of https://github.com/FOSSEE/nccps-2018FOSSEE Git User
2018-09-26Merge pull request #16 from Sashi20/masterSashi20
Extended last date for paper submission
2018-09-26Extended last date for paper submissionSashi20
2018-09-24Merge branch 'master' of https://github.com/FOSSEE/nccps-2018FOSSEE Git User
2018-09-24Merge pull request #15 from Sashi20/masterSashi20
Removed bcc email from headers
2018-09-24Removed bcc email from headersSashi20
2018-09-24Merge pull request #14 from Sashi20/masterSashi20
Added BCC email in email headers
2018-09-24Added BCC email in email headersSashi20
2018-09-24Merge pull request #13 from Sashi20/masterSashi20
Modified login redirect url after password reset complete
2018-09-24Modified login redirect url after password reset completeSashi20
2018-09-24Merge pull request #12 from Sashi20/masterSashi20
Rectified forgot password link in login template
2018-09-24Rectified forgot password link in login templateSashi20
2018-09-24Merge pull request #11 from Sashi20/masterSashi20
Modified links for forgot password and added BCC email in paper submi…
2018-09-24Modified links for forgot password and added BCC email in paper submission ↵Sashi20
acknowledgement email
2018-09-19Merge branch 'master' of https://github.com/FOSSEE/nccps-2018FOSSEE Git User
2018-09-19Merge pull request #10 from Sashi20/masterSashi20
Added migrations
2018-09-19Added migrationsSashi20
generated by cgit (git 2.34.1) at 2024-12-20 17:11:57 +0000