Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge #1

Open
wants to merge 5 commits into
base: gh-pages
Choose a base branch
from
Open

merge #1

wants to merge 5 commits into from

Conversation

arushivii
Copy link
Owner

  • fill in details

  • Fixed faq, social links, map, timeline

  • add links to social sites

  • Fixes metadata and title

  • fix title bar image with trident logo

  • regis-date changed

  • Major Refactor (Changed the website JIITODC/trident#15)

This will definitely form the base of v1 release.

  • Add logo to readme.

  • Create README.md

  • add FAQ section

  • add FAQ section

Signed-off-by: Ankur Kothiwal ankur.kothiwal99@gmail.com

  • TBA sponsor

  • Mail

  • Tracks TBA

  • temporary pic

  • Add information to seperate pages

Signed-off-by: Divyansh Kamboj kambojdivyansh2000@gmail.com

  • Create pull_request_template.md

  • Create LICENSE

  • Revert "Create LICENSE"

  • Create LICENSE

  • squash: sponser + mail + tracks + info

Mail

Tracks TBA

temporary pic

Add information to seperate pages

Signed-off-by: Divyansh Kamboj kambojdivyansh2000@gmail.com

  • squash: pr template + exclude vi recovery files

Exclude Vi recovery files

Signed-off-by: Ankur Kothiwal ankur.kothiwal99@gmail.com

  • trigger

Signed-off-by: Ankur Kothiwal ankur.kothiwal99@gmail.com

  • add 'how to reach' and postponed notice

Signed-off-by: Ankur Kothiwal ankur.kothiwal99@gmail.com

  • change faq 'how to register'

Signed-off-by: Ankur Kothiwal ankur.kothiwal99@gmail.com

  • add 'How to reach' to 'Venue' page

Signed-off-by: Ankur Kothiwal ankur.kothiwal99@gmail.com

  • update content

  • fix conflicts

Signed-off-by: Ankur Kothiwal ankur.kothiwal99@gmail.com

  • fix indentation

Signed-off-by: Ankur Kothiwal ankur.kothiwal99@gmail.com

  • fixe footer and metro station details

Signed-off-by: Ankur Kothiwal ankur.kothiwal99@gmail.com

  • fix merge conflict

Signed-off-by: Ankur Kothiwal ankur.kothiwal99@gmail.com

Co-authored-by: Pranshu Srivastava rexagod@gmail.com
Co-authored-by: Ayush ayush@disroot.org
Co-authored-by: Ayush Karn ayushkarn739@gmail.com
Co-authored-by: Karan Dev Tyagi 40595692+karandevtyagi@users.noreply.github.com
Co-authored-by: karandevtyagi vatstyagi999@gmail.com
Co-authored-by: bhavya bhavya.bhavya.varshney@gmail.com
Co-authored-by: Arushi anniearushiverma@gmail.com
Co-authored-by: Divyansh Kamboj kambojdivyansh2000@gmail.com

Fixes:

Ankurk99 and others added 5 commits March 28, 2020 13:02
* fill in details

* Fixed faq, social links, map, timeline

* add links to social sites

* Fixes metadata and title

* fix title bar image with trident logo

* regis-date changed

* Major Refactor (#15)

This will definitely form the base of v1 release.

* Add logo to readme.

* Create README.md

* add FAQ section

* add FAQ section

Signed-off-by: Ankur Kothiwal <ankur.kothiwal99@gmail.com>

* TBA sponsor

* Mail

* Tracks TBA

* temporary pic

* Add information to seperate pages

Signed-off-by: Divyansh Kamboj <kambojdivyansh2000@gmail.com>

* Create pull_request_template.md

* Create LICENSE

* Revert "Create LICENSE"

* Create LICENSE

* squash: sponser + mail + tracks + info

Mail

Tracks TBA

temporary pic

Add information to seperate pages

Signed-off-by: Divyansh Kamboj <kambojdivyansh2000@gmail.com>

* squash: pr template + exclude vi recovery files

Exclude Vi recovery files

* Add Diversity and Inclusion section and CoC  (#34)

* Add Diversity nav and CoC

* Add Diversity nav and CoC

* add favicon to title bar

Signed-off-by: Ankur Kothiwal <ankur.kothiwal99@gmail.com>

* trigger

Signed-off-by: Ankur Kothiwal <ankur.kothiwal99@gmail.com>

* add 'how to reach' and postponed notice

Signed-off-by: Ankur Kothiwal <ankur.kothiwal99@gmail.com>

* change faq 'how to register'

Signed-off-by: Ankur Kothiwal <ankur.kothiwal99@gmail.com>

* add 'How to reach' to 'Venue' page

Signed-off-by: Ankur Kothiwal <ankur.kothiwal99@gmail.com>

* update content

* fix conflicts

Signed-off-by: Ankur Kothiwal <ankur.kothiwal99@gmail.com>

* fix indentation

Signed-off-by: Ankur Kothiwal <ankur.kothiwal99@gmail.com>

* fixe footer and metro station details

Signed-off-by: Ankur Kothiwal <ankur.kothiwal99@gmail.com>

* fix merge conflict

Signed-off-by: Ankur Kothiwal <ankur.kothiwal99@gmail.com>

Co-authored-by: Pranshu Srivastava <rexagod@gmail.com>
Co-authored-by: Ayush <ayush@disroot.org>
Co-authored-by: Ayush Karn <ayushkarn739@gmail.com>
Co-authored-by: Karan Dev Tyagi <40595692+karandevtyagi@users.noreply.github.com>
Co-authored-by: karandevtyagi <vatstyagi999@gmail.com>
Co-authored-by: bhavya <bhavya.bhavya.varshney@gmail.com>
Co-authored-by: Arushi <anniearushiverma@gmail.com>
Co-authored-by: Divyansh Kamboj <kambojdivyansh2000@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants