Merge branch 'master' into production

navnikum · Dec 31, 2016 · 90713ba · 90713ba
2 parents 1e6567a + 519d350
commit 90713ba
Show file tree

Hide file tree

Showing 35 changed files with 56 additions and 39 deletions.
diff --git a/_includes/header.html b/_includes/header.html
@@ -12,7 +12,7 @@ <h1><a href="{{ site.baseurl }}/" class="site-title" >{{ site.title }}</a></h1>
                   {% endunless %}
               {% endif %}
             {% endfor %}
-            <li><a href="{{ '/events'| prepend: site.baseurl }}" class="button special">Events</a></li>
+            <li><a href="{{ '/wiki'| prepend: site.baseurl }}" class="button special">Wiki</a></li>
         </ul>
     </nav>
 </header>
diff --git a/_site/404.html b/_site/404.html
@@ -87,7 +87,7 @@ <h1><a href="/" class="site-title" >WnCC</a></h1>
 
 
 
-            <li><a href="/events" class="button special">Events</a></li>
+            <li><a href="/wiki" class="button special">Wiki</a></li>
         </ul>
     </nav>
 </header>

diff --git a/_site/events/index.html b/_site/events/index.html
@@ -87,7 +87,7 @@ <h1><a href="/" class="site-title" >WnCC</a></h1>
 
 
 
-            <li><a href="/events" class="button special">Events</a></li>
+            <li><a href="/wiki" class="button special">Wiki</a></li>
         </ul>
     </nav>
 </header>

diff --git a/_site/feed.xml b/_site/feed.xml
@@ -6,8 +6,9 @@
 </description>
     <link>nihal111.github.io//</link>
     <atom:link href="nihal111.github.io//feed.xml" rel="self" type="application/rss+xml" />
-    <pubDate>Thu, 21 Jul 2016 08:28:50 +0530</pubDate>
-    <lastBuildDate>Thu, 21 Jul 2016 08:28:50 +0530</lastBuildDate>
-    <generator>Jekyll v3.1.6</generator>
+    <pubDate>Sat, 31 Dec 2016 23:14:23 +0530</pubDate>
+    <lastBuildDate>Sat, 31 Dec 2016 23:14:23 +0530</lastBuildDate>
+    <generator>Jekyll v3.1.3</generator>
+
   </channel>
 </rss>
diff --git a/_site/index.html b/_site/index.html
@@ -87,7 +87,7 @@ <h1><a href="/" class="site-title" >WnCC</a></h1>
 
 
 
-            <li><a href="/events" class="button special">Events</a></li>
+            <li><a href="/wiki" class="button special">Wiki</a></li>
         </ul>
     </nav>
 </header>
@@ -100,7 +100,7 @@ <h1><a href="/" class="site-title" >WnCC</a></h1>
 	    <h2>The Web and Coding Club</h2>
 	    <p> <a href="https://stab-iitb.org/wncc">IIT Bombay</a></p>
 	    <ul class="actions">
-	        <li><a href="/events" class="button big special">Events</a></li>
+	        <li><a href="/wiki" class="button big special">Wiki</a></li>
 	        <li><a href="/soc" class="button big special">Seasons of Code</a></li>
 	    </ul>
 	    </ul>

diff --git a/_site/info.php b/_site/info.php
diff --git a/_site/itsp-resources/index.html b/_site/itsp-resources/index.html
@@ -87,7 +87,7 @@ <h1><a href="/" class="site-title" >WnCC</a></h1>
 
 
 
-            <li><a href="/events" class="button special">Events</a></li>
+            <li><a href="/wiki" class="button special">Wiki</a></li>
         </ul>
     </nav>
 </header>

diff --git a/_site/left-sidebar.html b/_site/left-sidebar.html
@@ -87,7 +87,7 @@ <h1><a href="/" class="site-title" >WnCC</a></h1>
 
 
 
-            <li><a href="/events" class="button special">Events</a></li>
+            <li><a href="/wiki" class="button special">Wiki</a></li>
         </ul>
     </nav>
 </header>

diff --git a/_site/no-sidebar.html b/_site/no-sidebar.html
@@ -87,7 +87,7 @@ <h1><a href="/" class="site-title" >WnCC</a></h1>
 
 
 
-            <li><a href="/events" class="button special">Events</a></li>
+            <li><a href="/wiki" class="button special">Wiki</a></li>
         </ul>
     </nav>
 </header>

diff --git a/_site/readme.md b/_site/readme.md
@@ -1,4 +1,21 @@
-The official website for [WnCC](www.wncc-iitb.org) resides in this repository.
+# WnCC Website
+
+The official website for [WnCC: www.wncc-iitb.org](www.wncc-iitb.org) resides in this repository.  
+This website is completely static and runs on jekyll.
+
+## Content: 
+
+### [SoC- Seasons of Code](http://wncc-iitb.org/soc/)  
+Seasons of Code is a programme launched by the WnCC, along the lines of GSoC without much greenery though. The incentive is similar to ITSP, based on the current form of it, the fundamental difference is that one can choose from the ideas offered by mentors who are senior undergrads, doctorate students or professors, and in some exceptional cases, startups.
+
+### [Showcase](http://wncc-iitb.org/showcase/)  
+Some of the best projects, made by us. These could be hackathon ideas, applications that make your life easier or purely for fun, hobby projects.
+
+### [Wiki](http://wncc-iitb.org/wiki/)  
+Everyone needs a wiki! A light weight, beautiful looking wiki picked from [tiddlywiki](http://tiddlywiki.com/).
+
+### [Events](http://wncc-iitb.org/events/)  
+A list of events that are planned and are coming soon.
 
 ###Instructions for Contributing to WnCC website:
 
@@ -12,4 +29,4 @@ Please create a PR to WnCC:master. All content you add will go to your project p
 Add a relevant image to the `_images` folder and resize it if needed using the `resize.py` script. If it doesn't need to be resized add it to the ignored list inside `resize.py`. If in doubt or unable to do the above, mention it in the PR.
 
 #####If you are a collaborator:
-Please (jekyll) build and push to the master. Server is on auto-deploy and reflects everything built and pushed to production. **Do not forget to cherry-pick the last commits from master to gh-pages. Also checkout production and merge it with master.** If you don't want to do the above, just create a PR with the change to WnCC:master.
+Please (jekyll) build and push to the master. Server is on auto-deploy and reflects everything built and pushed to production. **Do not forget to cherry-pick the last commits from master to gh-pages. Also checkout production and merge it with master.** If you don't want to do the above, just create a PR with the change to WnCC:master.
diff --git a/_site/right-sidebar.html b/_site/right-sidebar.html
@@ -87,7 +87,7 @@ <h1><a href="/" class="site-title" >WnCC</a></h1>
 
 
 
-            <li><a href="/events" class="button special">Events</a></li>
+            <li><a href="/wiki" class="button special">Wiki</a></li>
         </ul>
     </nav>
 </header>

diff --git a/_site/showcase/index.html b/_site/showcase/index.html
@@ -87,7 +87,7 @@ <h1><a href="/" class="site-title" >WnCC</a></h1>
 
 
 
-            <li><a href="/events" class="button special">Events</a></li>
+            <li><a href="/wiki" class="button special">Wiki</a></li>
         </ul>
     </nav>
 </header>

diff --git a/_site/showcase_projects/1-HoldTheBeat-arpan.html b/_site/showcase_projects/1-HoldTheBeat-arpan.html
@@ -87,7 +87,7 @@ <h1><a href="/" class="site-title" >WnCC</a></h1>
 
 
 
-            <li><a href="/events" class="button special">Events</a></li>
+            <li><a href="/wiki" class="button special">Wiki</a></li>
         </ul>
     </nav>
 </header>

diff --git a/_site/showcase_projects/2-JARVIS-nihal.html b/_site/showcase_projects/2-JARVIS-nihal.html
@@ -87,7 +87,7 @@ <h1><a href="/" class="site-title" >WnCC</a></h1>
 
 
 
-            <li><a href="/events" class="button special">Events</a></li>
+            <li><a href="/wiki" class="button special">Wiki</a></li>
         </ul>
     </nav>
 </header>

diff --git a/_site/soc/index.html b/_site/soc/index.html
@@ -87,7 +87,7 @@ <h1><a href="/" class="site-title" >WnCC</a></h1>
 
 
 
-            <li><a href="/events" class="button special">Events</a></li>
+            <li><a href="/wiki" class="button special">Wiki</a></li>
         </ul>
     </nav>
 </header>

diff --git a/_site/soc_projects/10-yt-meet.html b/_site/soc_projects/10-yt-meet.html
@@ -87,7 +87,7 @@ <h1><a href="/" class="site-title" >WnCC</a></h1>
 
 
 
-            <li><a href="/events" class="button special">Events</a></li>
+            <li><a href="/wiki" class="button special">Wiki</a></li>
         </ul>
     </nav>
 </header>

diff --git a/_site/soc_projects/11-wncc-yt2-meet.html b/_site/soc_projects/11-wncc-yt2-meet.html
@@ -87,7 +87,7 @@ <h1><a href="/" class="site-title" >WnCC</a></h1>
 
 
 
-            <li><a href="/events" class="button special">Events</a></li>
+            <li><a href="/wiki" class="button special">Wiki</a></li>
         </ul>
     </nav>
 </header>

diff --git a/_site/soc_projects/12-aws-pardy.html b/_site/soc_projects/12-aws-pardy.html
@@ -87,7 +87,7 @@ <h1><a href="/" class="site-title" >WnCC</a></h1>
 
 
 
-            <li><a href="/events" class="button special">Events</a></li>
+            <li><a href="/wiki" class="button special">Wiki</a></li>
         </ul>
     </nav>
 </header>

diff --git a/_site/soc_projects/13-network-ashray.html b/_site/soc_projects/13-network-ashray.html
@@ -87,7 +87,7 @@ <h1><a href="/" class="site-title" >WnCC</a></h1>
 
 
 
-            <li><a href="/events" class="button special">Events</a></li>
+            <li><a href="/wiki" class="button special">Wiki</a></li>
         </ul>
     </nav>
 </header>

diff --git a/_site/soc_projects/14-kalpesh-cheeku.html b/_site/soc_projects/14-kalpesh-cheeku.html
@@ -87,7 +87,7 @@ <h1><a href="/" class="site-title" >WnCC</a></h1>
 
 
 
-            <li><a href="/events" class="button special">Events</a></li>
+            <li><a href="/wiki" class="button special">Wiki</a></li>
         </ul>
     </nav>
 </header>

diff --git a/_site/soc_projects/15-ip-ranveer.html b/_site/soc_projects/15-ip-ranveer.html
@@ -87,7 +87,7 @@ <h1><a href="/" class="site-title" >WnCC</a></h1>
 
 
 
-            <li><a href="/events" class="button special">Events</a></li>
+            <li><a href="/wiki" class="button special">Wiki</a></li>
         </ul>
     </nav>
 </header>

diff --git a/_site/soc_projects/16-iitbapp-abhijit.html b/_site/soc_projects/16-iitbapp-abhijit.html
@@ -87,7 +87,7 @@ <h1><a href="/" class="site-title" >WnCC</a></h1>
 
 
 
-            <li><a href="/events" class="button special">Events</a></li>
+            <li><a href="/wiki" class="button special">Wiki</a></li>
         </ul>
     </nav>
 </header>

diff --git a/_site/soc_projects/17-rattlesnake-ranveer.html b/_site/soc_projects/17-rattlesnake-ranveer.html
@@ -87,7 +87,7 @@ <h1><a href="/" class="site-title" >WnCC</a></h1>
 
 
 
-            <li><a href="/events" class="button special">Events</a></li>
+            <li><a href="/wiki" class="button special">Wiki</a></li>
         </ul>
     </nav>
 </header>

diff --git a/_site/soc_projects/20-qoc-kalpesh.html b/_site/soc_projects/20-qoc-kalpesh.html
@@ -87,7 +87,7 @@ <h1><a href="/" class="site-title" >WnCC</a></h1>
 
 
 
-            <li><a href="/events" class="button special">Events</a></li>
+            <li><a href="/wiki" class="button special">Wiki</a></li>
         </ul>
     </nav>
 </header>

diff --git a/_site/soc_projects/30-poisson-riddhish.html b/_site/soc_projects/30-poisson-riddhish.html
@@ -87,7 +87,7 @@ <h1><a href="/" class="site-title" >WnCC</a></h1>
 
 
 
-            <li><a href="/events" class="button special">Events</a></li>
+            <li><a href="/wiki" class="button special">Wiki</a></li>
         </ul>
     </nav>
 </header>

diff --git a/_site/soc_projects/31-photz-cheeku.html b/_site/soc_projects/31-photz-cheeku.html
@@ -87,7 +87,7 @@ <h1><a href="/" class="site-title" >WnCC</a></h1>
 
 
 
-            <li><a href="/events" class="button special">Events</a></li>
+            <li><a href="/wiki" class="button special">Wiki</a></li>
         </ul>
     </nav>
 </header>

diff --git a/_site/soc_projects/32-boost-riddhish.html b/_site/soc_projects/32-boost-riddhish.html
@@ -87,7 +87,7 @@ <h1><a href="/" class="site-title" >WnCC</a></h1>
 
 
 
-            <li><a href="/events" class="button special">Events</a></li>
+            <li><a href="/wiki" class="button special">Wiki</a></li>
         </ul>
     </nav>
 </header>

diff --git a/_site/soc_projects/33-MexMemInter-arjun.html b/_site/soc_projects/33-MexMemInter-arjun.html
@@ -87,7 +87,7 @@ <h1><a href="/" class="site-title" >WnCC</a></h1>
 
 
 
-            <li><a href="/events" class="button special">Events</a></li>
+            <li><a href="/wiki" class="button special">Wiki</a></li>
         </ul>
     </nav>
 </header>

diff --git a/_site/soc_projects/34-BlindSource-riddhish.html b/_site/soc_projects/34-BlindSource-riddhish.html
@@ -87,7 +87,7 @@ <h1><a href="/" class="site-title" >WnCC</a></h1>
 
 
 
-            <li><a href="/events" class="button special">Events</a></li>
+            <li><a href="/wiki" class="button special">Wiki</a></li>
         </ul>
     </nav>
 </header>

diff --git a/_site/soc_projects/40-competitive-shantanu.html b/_site/soc_projects/40-competitive-shantanu.html
@@ -87,7 +87,7 @@ <h1><a href="/" class="site-title" >WnCC</a></h1>
 
 
 
-            <li><a href="/events" class="button special">Events</a></li>
+            <li><a href="/wiki" class="button special">Wiki</a></li>
         </ul>
     </nav>
 </header>

diff --git a/_site/soc_projects/41-competitive-sandeep.html b/_site/soc_projects/41-competitive-sandeep.html
@@ -87,7 +87,7 @@ <h1><a href="/" class="site-title" >WnCC</a></h1>
 
 
 
-            <li><a href="/events" class="button special">Events</a></li>
+            <li><a href="/wiki" class="button special">Wiki</a></li>
         </ul>
     </nav>
 </header>

diff --git a/_site/soc_projects/42-competitive-rishabh.html b/_site/soc_projects/42-competitive-rishabh.html
@@ -87,7 +87,7 @@ <h1><a href="/" class="site-title" >WnCC</a></h1>
 
 
 
-            <li><a href="/events" class="button special">Events</a></li>
+            <li><a href="/wiki" class="button special">Wiki</a></li>
         </ul>
     </nav>
 </header>

diff --git a/_site/soc_projects/44-competitive-govind.html b/_site/soc_projects/44-competitive-govind.html
@@ -87,7 +87,7 @@ <h1><a href="/" class="site-title" >WnCC</a></h1>
 
 
 
-            <li><a href="/events" class="button special">Events</a></li>
+            <li><a href="/wiki" class="button special">Wiki</a></li>
         </ul>
     </nav>
 </header>

diff --git a/_site/soc_projects/50-netsec-manish.html b/_site/soc_projects/50-netsec-manish.html
@@ -87,7 +87,7 @@ <h1><a href="/" class="site-title" >WnCC</a></h1>
 
 
 
-            <li><a href="/events" class="button special">Events</a></li>
+            <li><a href="/wiki" class="button special">Wiki</a></li>
         </ul>
     </nav>
 </header>

diff --git a/index.html b/index.html
@@ -9,7 +9,7 @@
 	    <h2>The Web and Coding Club</h2>
 	    <p> <a href="https://stab-iitb.org/wncc">IIT Bombay</a></p>
 	    <ul class="actions">
-	        <li><a href="{{ '/events' | prepend: site.baseurl }}" class="button big special">Events</a></li>
+	        <li><a href="{{ '/wiki' | prepend: site.baseurl }}" class="button big special">Wiki</a></li>
 	        <li><a href="{{ '/soc' | prepend: site.baseurl }}" class="button big special">Seasons of Code</a></li>
 	    </ul>
 	    </ul>
-Original file line number
+Diff line change
@@ Expand Up / @@ -87,7 +87,7 @@ <h1><a href="/" class="site-title" >WnCC</a></h1> @@
-                <li><a href="/events" class="button special">Events</a></li>
+                <li><a href="/wiki" class="button special">Wiki</a></li>
             </ul>
         </nav>
     </header>
@@ Expand Down @@