Final#116

Merged

sksingh55 merged 234 commits intoFusionIIIT:masterfrom

Jan 23, 2020

Commits on Sep 2, 2019

Commits on Sep 5, 2019

Commits on Sep 8, 2019

Commits on Sep 9, 2019

Added no_proxy environment variable to bypass proxy for intranet
D. Debnath
committed

Commits on Sep 12, 2019

Commits on Sep 13, 2019

Commits on Sep 14, 2019

Update requirements.txt
manavgoyal53
committed

Commits on Sep 23, 2019

Merge pull request #15 from salarx/dependabot/pip/requests-2.20.0
Sahil Kumar
authored
Merge pull request #14 from salarx/dependabot/pip/django-1.11.23
Sahil Kumar
authored
Merge pull request #13 from salarx/dependabot/pip/twisted-19.7.0
Sahil Kumar
authored
Merge pull request #12 from salarx/dependabot/pip/FusionIIIT/media/documents/placement/schedule/urllib3-1.24.2
Sahil Kumar
authored
Bump requests in /FusionIIIT/media/documents/placement/schedule
dependabot[bot]
authored
Merge pull request #11 from salarx/dependabot/pip/FusionIIIT/media/documents/placement/schedule/requests-2.20.0
Sahil Kumar
authored
Bump django in /FusionIIIT/media/documents/placement/schedule
dependabot[bot]
authored
Merge pull request #10 from salarx/dependabot/pip/FusionIIIT/media/documents/placement/schedule/twisted-19.7.0
Sahil Kumar
authored
Merge pull request #9 from salarx/dependabot/pip/FusionIIIT/media/documents/placement/schedule/django-1.11.23
Sahil Kumar
authored
Bump urllib3 from 1.22 to 1.24.2
dependabot[bot]
authored
Merge pull request #8 from salarx/dependabot/pip/urllib3-1.24.2
Sahil Kumar
authored
Update requirements.txt
salarx
committed
Update pythonapp.yml
Sahil Kumar
authored
Update stale.yml
Sahil Kumar
authored
Update label.yml
Sahil Kumar
authored
Update greetings.yml
Sahil Kumar
authored
Rename .github/workflows/pythonapp.yml to pythonapp.yml
Sahil Kumar
authored
Update pythonapp.yml
salarx
committed
azure deployment files
salarx
committed
Delete pythonapp.yml
Sahil Kumar
authored
Delete greetings.yml
Sahil Kumar
authored
Delete label.yml
Sahil Kumar
authored
Delete stale.yml
Sahil Kumar
authored
Merge branch 'master' of https://github.com/salarx/Fusion
salarx
committed

Commits on Sep 25, 2019

Commits on Sep 28, 2019

Commits on Sep 29, 2019

Commits on Sep 30, 2019

Modify models and views of some apps.
manavgoyal53
committed

Commits on Oct 3, 2019

Fix mess_warden in Mess Module
garg3133
authored

Commits on Oct 18, 2019

Commits on Oct 23, 2019

Bump pillow from 4.2.1 to 6.2.0
dependabot[bot]
authored
Bump pillow in /FusionIIIT/media/documents/placement/schedule
dependabot[bot]
authored
Merge pull request #28 from salarx/dependabot/pip/FusionIIIT/media/documents/placement/schedule/pillow-6.2.0
Sahil Kumar
authored
Merge pull request #27 from salarx/dependabot/pip/pillow-6.2.0
Sahil Kumar
authored
Merge pull request #29 from salarx/azure-testing
Sahil Kumar
authored
Merge pull request #30 from salarx/azure-testing
Sahil Kumar
authored
A new one
salarx
committed
LOL
salarx
committed
updated
salarx
committed
updated
salarx
committed
LOL4
salarx
committed
DATABASE RESET
salarx
committed
migrations
salarx
committed
Merge pull request #31 from salarx/master
Sahil Kumar
authored
Script and related changes
salarx
committed

Commits on Oct 24, 2019

updated
salarx
committed
Separated B.tech courses from other courses
salarx
committed
Changes in dbinsertion script
salarx
committed
Data insertion Scripts corrections and some model changes
salarx
committed
Script Changes chal rahe hai abhi
salarx
committed
admin panel changes
salarx
committed
Minor Chnages
salarx
committed
LOL
salarx
committed
updated requirements and README
salarx
committed
fixed Readme
salarx
committed
Updated Readme
salarx
committed
updated Readme
salarx
committed
Updated Readme
salarx
committed
Updated Readme
salarx
committed
Updated Readme
salarx
committed
Merge pull request #32 from salarx/azure-testing
Sahil Kumar
authored
Updated Readme
salarx
committed
updated Readme
salarx
committed
updated Readme
salarx
committed
Updated Readme
salarx
committed
Updated Readme
salarx
committed
Updated Readme
salarx
committed
updated Readme
salarx
committed
updated Readme
salarx
committed

Commits on Oct 27, 2019

Delete ~$README.md
Sahil Kumar
authored
Merge pull request #33 from salarx/azure-testing
Sahil Kumar
authored
cleaned gitignore
salarx
committed
Update .gitattributes
salarx
committed
updated database host
salarx
committed
Merge pull request #34 from salarx/azure-testing
Sahil Kumar
authored
Update README.md
salarx
committed
Merge branch 'azure-testing'
salarx
committed
updated readme

salarx
authored and
salarx
committed
updated readme

salarx
authored and
salarx
committed
updated readme

salarx
authored and
salarx
committed

Commits on Oct 28, 2019

created datadump
salarx
committed
updated database engine and readme

salarx
authored and
salarx
committed
Merge branch 'master' of https://github.com/salarx/Fusion

salarx
authored and
salarx
committed
updated static
salarx
committed
updated urls

salarx
authored and
salarx
committed

Commits on Oct 29, 2019

updated

salarx
authored and
salarx
committed
updated requirements
salarx
committed
updated lgin page

salarx
authored and
salarx
committed
updated login v2

salarx
authored and
salarx
committed

Commits on Oct 31, 2019

Added online course management sydtem
salarx
committed
Course management templates added, ocms_ols removed
salarx
committed

Commits on Nov 1, 2019

Merge branch 'static-mod' of https://github.com/salarx/Fusion into static-mod
salarx
committed

Commits on Nov 3, 2019

enforced django toolbar
salarx
committed
removed crispy forms

salarx
authored and
salarx
committed
updated login page
salarx
committed

Commits on Nov 8, 2019

DIRECTOR DASHBOARD
salarx
committed

Commits on Nov 12, 2019

Pre-registration script added.\
salarx
committed
updated gitignore

salarx
authored and
salarx
committed
director_dashboard_sidebar
tusharvohra
committed
Merge branch 'static-mod' of https://github.com/salarx/Fusion into static-mod

salarx
authored and
salarx
committed
LOLOLOLOLOL.
salarx
committed
LOL
salarx
committed
zLJd;al
salarx
committed

Commits on Nov 14, 2019

Commits on Nov 16, 2019

updated semantic-ui static files

salarx
authored and
salarx
committed
update login-ui
salarx
committed
Merge branch 'static-mod' of https://github.com/salarx/Fusion into static-mod
salarx
committed
semantic-ui css

salarx
authored and
salarx
committed
Merge branch 'static-mod' of https://github.com/salarx/Fusion into static-mod

salarx
authored and
salarx
committed
ignored staic
salarx
committed
removed static
salarx
committed

Commits on Nov 24, 2019

Added a script for inserting UG2016 pre-reg data
salarx
committed
Changes for convenience
salarx
committed
Normal Changes
salarx
committed
lol
salarx
committed

Commits on Nov 25, 2019

cbvbn
salarx
committed

Commits on Nov 27, 2019

Commits on Jan 16, 2020

Commits on Jan 17, 2020

Update settings.py
Sahil Kumar
authored
Update requirements.txt
Sahil Kumar
authored
Update requirements.txt
Sahil Kumar
authored
Update README.md
Sahil Kumar
authored
Merge pull request #41 from salarx/master
Sahil Kumar
authored
updated markdown
salarx
committed
updated
salarx
committed
Merge branch 'static-mod' of https://github.com/salarx/Fusion into static-mod
salarx
committed
Merge pull request #42 from salarx/static-mod
Sahil Kumar
authored
Delete pgadmin4-4.14-py2.py3-none-any.whl
Sahil Kumar
authored
Delete pgadmin4-4.15-py2.py3-none-any.whl
Sahil Kumar
authored
Update settings.py
Sahil Kumar
authored

Commits on Jan 21, 2020

Delete login.html
Sahil Kumar
authored
Update settings.py
Sahil Kumar
authored

Commits on Jan 22, 2020

Update settings.py
Sahil Kumar
authored
Update settings.py
Sahil Kumar
authored