Skip to content

Commit

Permalink
Merge pull request #207 from ZeusWPI/info/2015
Browse files Browse the repository at this point in the history 
Update info for academic year 2015
  • Loading branch information
@feliciaan
feliciaan committed Sep 8, 2015
2 parents 775054f + afb40e7 commit 7c6266a
Show file tree
Hide file tree
Showing 10 changed files with 695 additions and 600 deletions.
4 changes: 2 additions & 2 deletions iOS/Hydra-Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.1.1</string>
<string>1.2</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
Expand All @@ -40,7 +40,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>1.1.13</string>
<string>1.2.1</string>
<key>FacebookAppID</key>
<string>146947948791011</string>
<key>LSRequiresIPhoneOS</key>
Expand Down
70 changes: 18 additions & 52 deletions iOS/Resources/Associations.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,6 @@
"internalName": "GEOLOGIC",
"parentAssociation": "FKCENTRAAL"
},
{
"displayName": "Germania",
"internalName": "GERMANIA",
"parentAssociation": "FKCENTRAAL"
},
{
"displayName": "Gentse Farma Kring",
"internalName": "GFK",
Expand Down Expand Up @@ -90,11 +85,6 @@
"internalName": "POLITEIA",
"parentAssociation": "FKCENTRAAL"
},
{
"displayName": "Romania",
"internalName": "ROMANIA",
"parentAssociation": "FKCENTRAAL"
},
{
"displayName": "Slavia",
"internalName": "SLAVIA",
Expand Down Expand Up @@ -200,6 +190,12 @@
"internalName": "AIESEC",
"parentAssociation": "IKCENTRAAL"
},
{
"displayName": "BEST",
"fullName": "Board of European Students of Technology Ghent",
"internalName": "BEST",
"parentAssociation": "IKCENTRAAL"
},
{
"displayName": "ChiSAG",
"fullName": "Chinese Students Organisation",
Expand Down Expand Up @@ -228,6 +224,12 @@
"internalName": "ISAG",
"parentAssociation": "IKCENTRAAL"
},
{
"displayName": "Iaas",
"fullName": "International Association of Agricultural Students",
"internalName": "Iaas",
"parentAssociation": "IKCENTRAAL"
},
{
"displayName": "Students' Welcome Club",
"internalName": "SWC",
Expand Down Expand Up @@ -533,14 +535,8 @@
"parentAssociation": "WVKCENTRAAL"
},
{
"displayName": "Amnesty",
"fullName": "Amnesty International Studenten Gent",
"internalName": "AIS",
"parentAssociation": "WVKCENTRAAL"
},
{
"displayName": "Asante",
"internalName": "ASANTE",
"displayName": "180DC",
"internalName": "OEDC",
"parentAssociation": "WVKCENTRAAL"
},
{
Expand Down Expand Up @@ -579,11 +575,6 @@
"internalName": "FLYSE",
"parentAssociation": "WVKCENTRAAL"
},
{
"displayName": "Gentse Interculturele Studenten Associatie",
"internalName": "GISA",
"parentAssociation": "WVKCENTRAAL"
},
{
"displayName": "Groene Kring",
"internalName": "GK",
Expand All @@ -595,11 +586,6 @@
"internalName": "IEEE",
"parentAssociation": "WVKCENTRAAL"
},
{
"displayName": "Jong EVA",
"internalName": "JONGEVA",
"parentAssociation": "WVKCENTRAAL"
},
{
"displayName": "Kajira",
"internalName": "KAJIRA",
Expand All @@ -610,19 +596,14 @@
"internalName": "KK",
"parentAssociation": "WVKCENTRAAL"
},
{
"displayName": "LingForum",
"internalName": "LINGFORUM",
"parentAssociation": "WVKCENTRAAL"
},
{
"displayName": "MaCht",
"internalName": "MACHT",
"parentAssociation": "WVKCENTRAAL"
},
{
"displayName": "Milieu Aktie Forum",
"internalName": "MAF",
"displayName": "Moeder Theepot",
"internalName": "THEEPOT",
"parentAssociation": "WVKCENTRAAL"
},
{
Expand All @@ -646,13 +627,8 @@
"parentAssociation": "WVKCENTRAAL"
},
{
"displayName": "Studenten Tegen Racisme",
"internalName": "STER",
"parentAssociation": "WVKCENTRAAL"
},
{
"displayName": "Symposium Culturele Vereniging",
"internalName": "SYMPOSIUM",
"displayName": "Sense",
"internalName": "SENSE",
"parentAssociation": "WVKCENTRAAL"
},
{
Expand All @@ -665,16 +641,6 @@
"internalName": "VVN",
"parentAssociation": "WVKCENTRAAL"
},
{
"displayName": "Werkgroep Electronica",
"internalName": "WELEC",
"parentAssociation": "WVKCENTRAAL"
},
{
"displayName": "Werkgroep Sterrenkunde",
"internalName": "WS",
"parentAssociation": "WVKCENTRAAL"
},
{
"displayName": "Werkgroepen & Verenigingen Konvent",
"internalName": "WVKCENTRAAL",
Expand Down
106 changes: 26 additions & 80 deletions iOS/Resources/Associations.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,6 @@
<key>parentAssociation</key>
<string>FKCENTRAAL</string>
</dict>
<dict>
<key>displayName</key>
<string>Germania</string>
<key>internalName</key>
<string>GERMANIA</string>
<key>parentAssociation</key>
<string>FKCENTRAAL</string>
</dict>
<dict>
<key>displayName</key>
<string>Gentse Farma Kring</string>
Expand Down Expand Up @@ -148,14 +140,6 @@
<key>parentAssociation</key>
<string>FKCENTRAAL</string>
</dict>
<dict>
<key>displayName</key>
<string>Romania</string>
<key>internalName</key>
<string>ROMANIA</string>
<key>parentAssociation</key>
<string>FKCENTRAAL</string>
</dict>
<dict>
<key>displayName</key>
<string>Slavia</string>
Expand Down Expand Up @@ -324,6 +308,16 @@
<key>parentAssociation</key>
<string>IKCENTRAAL</string>
</dict>
<dict>
<key>displayName</key>
<string>BEST</string>
<key>fullName</key>
<string>Board of European Students of Technology Ghent</string>
<key>internalName</key>
<string>BEST</string>
<key>parentAssociation</key>
<string>IKCENTRAAL</string>
</dict>
<dict>
<key>displayName</key>
<string>ChiSAG</string>
Expand Down Expand Up @@ -370,6 +364,16 @@
<key>parentAssociation</key>
<string>IKCENTRAAL</string>
</dict>
<dict>
<key>displayName</key>
<string>Iaas</string>
<key>fullName</key>
<string>International Association of Agricultural Students</string>
<key>internalName</key>
<string>Iaas</string>
<key>parentAssociation</key>
<string>IKCENTRAAL</string>
</dict>
<dict>
<key>displayName</key>
<string>Students&apos; Welcome Club</string>
Expand Down Expand Up @@ -862,19 +866,9 @@
</dict>
<dict>
<key>displayName</key>
<string>Amnesty</string>
<key>fullName</key>
<string>Amnesty International Studenten Gent</string>
<string>180DC</string>
<key>internalName</key>
<string>AIS</string>
<key>parentAssociation</key>
<string>WVKCENTRAAL</string>
</dict>
<dict>
<key>displayName</key>
<string>Asante</string>
<key>internalName</key>
<string>ASANTE</string>
<string>OEDC</string>
<key>parentAssociation</key>
<string>WVKCENTRAAL</string>
</dict>
Expand Down Expand Up @@ -936,14 +930,6 @@
<key>parentAssociation</key>
<string>WVKCENTRAAL</string>
</dict>
<dict>
<key>displayName</key>
<string>Gentse Interculturele Studenten Associatie</string>
<key>internalName</key>
<string>GISA</string>
<key>parentAssociation</key>
<string>WVKCENTRAAL</string>
</dict>
<dict>
<key>displayName</key>
<string>Groene Kring</string>
Expand All @@ -962,14 +948,6 @@
<key>parentAssociation</key>
<string>WVKCENTRAAL</string>
</dict>
<dict>
<key>displayName</key>
<string>Jong EVA</string>
<key>internalName</key>
<string>JONGEVA</string>
<key>parentAssociation</key>
<string>WVKCENTRAAL</string>
</dict>
<dict>
<key>displayName</key>
<string>Kajira</string>
Expand All @@ -986,14 +964,6 @@
<key>parentAssociation</key>
<string>WVKCENTRAAL</string>
</dict>
<dict>
<key>displayName</key>
<string>LingForum</string>
<key>internalName</key>
<string>LINGFORUM</string>
<key>parentAssociation</key>
<string>WVKCENTRAAL</string>
</dict>
<dict>
<key>displayName</key>
<string>MaCht</string>
Expand All @@ -1004,9 +974,9 @@
</dict>
<dict>
<key>displayName</key>
<string>Milieu Aktie Forum</string>
<string>Moeder Theepot</string>
<key>internalName</key>
<string>MAF</string>
<string>THEEPOT</string>
<key>parentAssociation</key>
<string>WVKCENTRAAL</string>
</dict>
Expand Down Expand Up @@ -1044,17 +1014,9 @@
</dict>
<dict>
<key>displayName</key>
<string>Studenten Tegen Racisme</string>
<key>internalName</key>
<string>STER</string>
<key>parentAssociation</key>
<string>WVKCENTRAAL</string>
</dict>
<dict>
<key>displayName</key>
<string>Symposium Culturele Vereniging</string>
<string>Sense</string>
<key>internalName</key>
<string>SYMPOSIUM</string>
<string>SENSE</string>
<key>parentAssociation</key>
<string>WVKCENTRAAL</string>
</dict>
Expand All @@ -1074,22 +1036,6 @@
<key>parentAssociation</key>
<string>WVKCENTRAAL</string>
</dict>
<dict>
<key>displayName</key>
<string>Werkgroep Electronica</string>
<key>internalName</key>
<string>WELEC</string>
<key>parentAssociation</key>
<string>WVKCENTRAAL</string>
</dict>
<dict>
<key>displayName</key>
<string>Werkgroep Sterrenkunde</string>
<key>internalName</key>
<string>WS</string>
<key>parentAssociation</key>
<string>WVKCENTRAAL</string>
</dict>
<dict>
<key>displayName</key>
<string>Werkgroepen &amp; Verenigingen Konvent</string>
Expand Down
6 changes: 3 additions & 3 deletions iOS/Resources/info-fietsen.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<body>
<h2>Herstelplaatsen</h2>
<p>
<h3>Centraal verhuurdepot Kattenberg</h3>
<h3>Centrale verhuurlocatie Kattenberg</h3>
Kattenberg 2 (<a href="https://www.google.com/maps/place/Kattenberg+2,+9000+Gent,+België">kaart</a>)<br />
Tel: <a href="tel:092691898">09 269 18 98</a><br />
E-mail: <a href="mailto:[email protected]">[email protected]</a>
Expand All @@ -22,7 +22,7 @@ <h3>Herstelplaats UGent Blandijnberg</h3>
Tel: <a href="tel:092643670">09 264 36 70</a>
</p>
<p>
<h3>Mobiele herstelplaats campus HUB-KAHO (15 oktober tot 5 juni)</h3>
<h3>Mobiele herstelplaats campus Odisee &amp; KU Leuven (15 oktober tot 5 juni)</h3>
KAHO Sint-Lieven, ingang Bargiekaai (<a href="https://www.google.be/maps/place/Bargiekaai,+9000+Gent">kaart</a>)<br />
Tel: <a href="tel:0494590322">0494 59 03 22</a>
</p>
Expand Down Expand Up @@ -60,7 +60,7 @@ <h3>Fietspunt vzw Max Mobiel Gent-Dampoort</h3>
E-mail: <a href="mailto:[email protected]">[email protected]</a>
</p>

<h2>Openingsuren centraal verhuurdepot (Kattenberg)</h2>
<h2>Openingsuren centrale verhuurlocatie (Kattenberg)</h2>
<ul>
<li>maandag: 9u - 12u en 13u - 16u</li>
<li>dinsdag: 12u - 16u</li>
Expand Down
Loading

0 comments on commit 7c6266a

Please sign in to comment.