Skip to content

Commit

Permalink
Merge pull request #14 from ZeusWPI/development
Browse files Browse the repository at this point in the history
Release of version 2.1
  • Loading branch information
feliciaan authored Sep 21, 2016
2 parents d94abb1 + 7e5644e commit d5c1236
Show file tree
Hide file tree
Showing 181 changed files with 11,326 additions and 4,935 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,6 @@ profile
*.moved-aside

Pods

# Protect secret keys
UGentOAuthConfig.plist
Binary file not shown.
4 changes: 2 additions & 2 deletions External/SORelativeDateTransformer.m
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ - (id) init
[__calendar retain];
#endif

__unitFlags = NSYearCalendarUnit | NSMonthCalendarUnit | NSWeekCalendarUnit | NSDayCalendarUnit | NSHourCalendarUnit | NSMinuteCalendarUnit | NSSecondCalendarUnit;
__dateComponentSelectorNames = [[NSArray alloc] initWithObjects:@"year", @"month", @"week", @"day", @"hour", @"minute", @"second", nil];
__unitFlags = NSCalendarUnitYear | NSCalendarUnitMonth | NSCalendarUnitWeekOfMonth | NSCalendarUnitDay | NSCalendarUnitHour | NSCalendarUnitMinute | NSCalendarUnitSecond;
__dateComponentSelectorNames = [[NSArray alloc] initWithObjects:@"year", @"month", @"weekOfMonth", @"day", @"hour", @"minute", @"second", nil];

return self;
}
Expand Down
42 changes: 42 additions & 0 deletions GoogleService-Info.plist
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>TRACKING_ID</key>
<string>UA-25444917-3</string>
<key>AD_UNIT_ID_FOR_BANNER_TEST</key>
<string>ca-app-pub-3940256099942544/2934735716</string>
<key>AD_UNIT_ID_FOR_INTERSTITIAL_TEST</key>
<string>ca-app-pub-3940256099942544/4411468910</string>
<key>CLIENT_ID</key>
<string>758079297428-en5q4eupkqkqci5ojbcshqs22dcm2dk1.apps.googleusercontent.com</string>
<key>REVERSED_CLIENT_ID</key>
<string>com.googleusercontent.apps.758079297428-en5q4eupkqkqci5ojbcshqs22dcm2dk1</string>
<key>API_KEY</key>
<string>AIzaSyASj-xXi7PIwJxZrY8JgESgw3_AhiKR4bA</string>
<key>GCM_SENDER_ID</key>
<string>758079297428</string>
<key>PLIST_VERSION</key>
<string>1</string>
<key>BUNDLE_ID</key>
<string>be.ugent.zeus.Hydra</string>
<key>PROJECT_ID</key>
<string>hydra-142516</string>
<key>STORAGE_BUCKET</key>
<string>hydra-142516.appspot.com</string>
<key>IS_ADS_ENABLED</key>
<true/>
<key>IS_ANALYTICS_ENABLED</key>
<true/>
<key>IS_APPINVITE_ENABLED</key>
<true/>
<key>IS_GCM_ENABLED</key>
<true/>
<key>IS_SIGNIN_ENABLED</key>
<true/>
<key>GOOGLE_APP_ID</key>
<string>1:758079297428:ios:9a4bdee4f64f1ef8</string>
<key>DATABASE_URL</key>
<string>https://hydra-142516.firebaseio.com</string>
</dict>
</plist>
31 changes: 27 additions & 4 deletions Hydra-Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@
<true/>
</dict>
<key>CFBundleIdentifier</key>
<string>be.ugent.zeus.${PRODUCT_NAME:rfc1034identifier}${CUSTOM_IDENTIFIER_SUFFIX}</string>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>${PRODUCT_NAME}</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>2.0.1</string>
<string>2.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
Expand All @@ -38,11 +38,30 @@
<string>fb146947948791011</string>
</array>
</dict>
<dict>
<key>CFBundleTypeRole</key>
<string>Editor</string>
<key>CFBundleURLName</key>
<string>hydra-ugent</string>
<key>CFBundleURLSchemes</key>
<array>
<string>hydra-ugent</string>
</array>
</dict>
</array>
<key>CFBundleVersion</key>
<string>2.0.15</string>
<string>2.1.9</string>
<key>FacebookAppID</key>
<string>146947948791011</string>
<key>FacebookDisplayName</key>
<string>Hydra</string>
<key>LSApplicationQueriesSchemes</key>
<array>
<string>fbapi</string>
<string>fb-messenger-api</string>
<string>fbauth2</string>
<string>fbshareextension</string>
</array>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSAppTransportSecurity</key>
Expand All @@ -59,12 +78,16 @@
</dict>
<key>NSLocationWhenInUseUsageDescription</key>
<string>We hebben uw locatie nodig om deze te kunnen tonen op de kaarten.</string>
<key>UIAppFonts</key>
<array>
<string>LeagueGothic-Regular.otf</string>
</array>
<key>UIBackgroundModes</key>
<array>
<string>audio</string>
</array>
<key>UILaunchStoryboardName</key>
<string>MainStoryboard</string>
<string>LaunchScreen</string>
<key>UIPrerenderedIcon</key>
<true/>
<key>UIRequiresFullScreen</key>
Expand Down
722 changes: 558 additions & 164 deletions Hydra.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

13 changes: 0 additions & 13 deletions Hydra/ActivitiesController.h

This file was deleted.

Loading

0 comments on commit d5c1236

Please sign in to comment.