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.

Sign up for GitHub

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

Jump to bottom

add 'how to reach' and postponed notice #49

Merged
merged 50 commits into from
Mar 28, 2020
Merged

add 'how to reach' and postponed notice #49

merged 50 commits into from
Mar 28, 2020

Conversation

Ankurk99
Copy link
Member

Fixes:

rexagod and others added 30 commits March 11, 2020 00:10
@rexagod
fill in details
8c00b76
@eldracode
Fixed faq, social links, map, timeline
50a6a63
@Ankurk99
add links to social sites
712e453
@eldracode
Merge pull request JIITODC#8 from eldraco19/gh-pages
e152af8 
Fixed faq, social links, map, timeline
@Ankurk99
Fixes metadata and title
41d0398
@Ankurk99
Fixes metadata and title
8975bc6
@eldracode
Merge pull request JIITODC#7 from Ankurk99/gh-pages
0c5c054 
fix metadata and title
@Ankurk99
fix title bar image with trident logo
090272e
@karandevtyagi
Merge pull request JIITODC#11 from Ankurk99/gh-pages
66ca459 
fix title bar image with trident logo
@karandevtyagi
regis-date changed
a97485c
@karandevtyagi
Merge pull request JIITODC#12 from karandevtyagi/gh-pages
562beac 
regis-date changed
@eldracode
Major Refactor (JIITODC#15)
26c7486 
This will definitely form the base of v1 release.
@rexagod
Add logo to readme.
5252906
@rexagod
Create README.md
4d2de1b
@Ankurk99
add FAQ section
07f504a
@Ankurk99
add FAQ section
5bfb2c6 
Signed-off-by: Ankur Kothiwal <ankur.kothiwal99@gmail.com>
@Ankurk99
add FAQ section
b143197 
Signed-off-by: Ankur Kothiwal <ankur.kothiwal99@gmail.com>
@Ankurk99
add FAQ section
b86a947 
Signed-off-by: Ankur Kothiwal <ankur.kothiwal99@gmail.com>
@bhavyavarshney-123 @weirdwiz
TBA sponsor
e8d7c6c
@bhavyavarshney-123 @weirdwiz
Mail
e2dbc04
@arushivii @weirdwiz
Tracks TBA
bdcf83c
@arushivii @weirdwiz
temporary pic
4203ae0
@weirdwiz
Add information to seperate pages
5d6eeae 
Signed-off-by: Divyansh Kamboj <kambojdivyansh2000@gmail.com>
@karandevtyagi
Merge pull request JIITODC#22 from weirdwiz/further
cc7a184 
Add information to seperate pages
@rexagod
Create pull_request_template.md
2fd7175
@Ankurk99
rebase with current branch
131616f
@Ankurk99
Create LICENSE
5b47f1a
@Ankurk99
Merge pull request #2 from Ankurk99/add-license-2
f3b8bbb 
Create LICENSE
@Ankurk99
Revert "Create LICENSE"
7d6e918
@Ankurk99
Merge pull request #3 from Ankurk99/revert-2-add-license-2
4431ab2 
Revert "Create LICENSE"
@Ankurk99 Ankurk99 mentioned this pull request Mar 19, 2020
Merged
@Ankurk99
change faq 'how to register'
baeabbd 
Signed-off-by: Ankur Kothiwal <ankur.kothiwal99@gmail.com>
@Ankk98
Copy link
Member

Ankk98 commented Mar 19, 2020

Replace How to reach to venue page.
Also you have mentioned aqua in place of blue line. Fix it.
@Ankurk99

@Ankk98
Copy link
Member

Ankk98 commented Mar 19, 2020

@Ankurk99 Check if changing colour of to be announced make it better or not.

@Ankk98
Copy link
Member

Ankk98 commented Mar 21, 2020

Fix merge conflicts.

@Ankk98
Copy link
Member

Ankk98 commented Mar 24, 2020

@Ankurk99 Any progress?

@Ankurk99
Copy link
Member Author

Replace How to reach to venue page.
Also you have mentioned aqua in place of blue line. Fix it.
@Ankurk99
It's on aqua line(comes under noida metro NMRC).

@Ankurk99
Copy link
Member Author

@Ankurk99 Check if changing colour of to be announced make it better or not.

Done

@Ankurk99
add 'How to reach' to 'Venue' page
5882d54 
Signed-off-by: Ankur Kothiwal <ankur.kothiwal99@gmail.com>
@Ankurk99
merges Ayush's commit
cbf056c 
Signed-off-by: Ankur Kothiwal <ankur.kothiwal99@gmail.com>
@Ankurk99
resolve merge conflict
1148641
@Ankurk99
update content
386554d
@Ankk98
Copy link
Member

Ankk98 commented Mar 24, 2020

@Ankurk99 Needs some fixes, ptal at image below.
trident-bug

@Ankurk99
Copy link
Member Author

@Ankurk99 Needs some fixes, ptal at image below.
trident-bug

Yes, the commit crashed some of the content. On it.

@Ankurk99
fix conflicts
42a7c0f 
Signed-off-by: Ankur Kothiwal <ankur.kothiwal99@gmail.com>
@Ankurk99
Copy link
Member Author

Done. PTAL

@Ankurk99
fix indentation
0904786 
Signed-off-by: Ankur Kothiwal <ankur.kothiwal99@gmail.com>
@Ankk98
Copy link
Member

Ankk98 commented Mar 24, 2020

  1. Fix footer
  2. Replace this line with -
    "New Delhi/Ghaziabad/Faridabad Nearest Metro Station(Magenta Line or Aqua-Line - Noida Metro)"
    -> "New Delhi/Ghaziabad/Faridabad/Gurugram Nearest Metro Station(Magenta Line or Blue line)"

@Ankurk99 Check preview Here: preview

screenshot

@Ankurk99
fixe footer and metro station details
3a1cfdd 
Signed-off-by: Ankur Kothiwal <ankur.kothiwal99@gmail.com>
@Ankurk99
Copy link
Member Author

@Ankk98 PTAL

@Ankk98 Ankk98 requested a review from rexagod March 24, 2020 16:28
@Ankk98
Copy link
Member

Ankk98 commented Mar 24, 2020

Looks good to me. @rexagod review and merge.

rexagod
rexagod requested changes Mar 24, 2020
View reviewed changes
css/style.css Outdated Show resolved Hide resolved
@Ankurk99
fix merge conflict
b735fdc 
Signed-off-by: Ankur Kothiwal <ankur.kothiwal99@gmail.com>
@Ankurk99
Copy link
Member Author

@rexagod PTAL.

@rexagod rexagod merged commit 259c600 into JIITODC:gh-pages Mar 28, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rexagod rexagod rexagod approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@Ankurk99 @Ankk98 @rexagod @eldracode @karandevtyagi @bhavyavarshney-123 @arushivii @weirdwiz