Skip to content

Commit

Permalink
Merge branch 'release/2.1.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
Bob Voorneveld committed Feb 2, 2016
2 parents 01b825d + 09d057e commit f84d733
Show file tree
Hide file tree
Showing 1,444 changed files with 118,152 additions and 7,580 deletions.
49 changes: 28 additions & 21 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,30 @@
# Own additions to the .gitignore
#####
# Ignoring own private constant files
**/Snapshot-Constants.swift

# Local user specific env vars for fastlane
fastlane/.env

####
# fastlane specific as recommended at:
# https://github.com/fastlane/fastlane/blob/master/docs/Gitignore.md
fastlane/report.xml

# deliver temporary files
fastlane/Preview.html
Preview.html

# snapshot generated screenshots
fastlane/**/screenshots/**/*.png
fastlane/**/screenshots/screenshots.html

# scan temporary files
fastlane/test_output

#########################
# !! The .gitignore obtained from stackoverflow starts here.
# !! When implementing an update, do not remove the lines above ^^.
#########################
# .gitignore file for Xcode4 / OS X Source projects
#
Expand All @@ -11,32 +38,24 @@

#####
# OS X temporary files that should never be committed

.DS_Store
*.swp
profile


####
# Xcode temporary files that should never be committed
#
#
# NB: NIB/XIB files still exist even on Storyboard projects, so we want this...

*~.nib


####
# Xcode build files -
#
# NB: slash on the end, so we only remove the FOLDER, not any files that were badly named "DerivedData"

DerivedData/

# NB: slash on the end, so we only remove the FOLDER, not any files that were badly named "build"

build/


#####
# Xcode private settings (window sizes, bookmarks, breakpoints, custom executables, smart groups)
#
Expand All @@ -47,7 +66,6 @@ build/
# saved in this file.
# 99% of projects do NOT use those, so they do NOT want to version control this file.
# ..but if you're in the 1%, comment out the line "*.pbxuser"

*.pbxuser
*.mode1v3
*.mode2v3
Expand All @@ -58,16 +76,13 @@ build/
!default.mode2v3
!default.perspectivev3


####
# Xcode 4 - semi-personal settings, often included in workspaces
#
# You can safely ignore the xcuserdata files - but do NOT ignore the files next to them
#

xcuserdata


####
# XCode 4 workspaces - more detailed
#
Expand Down Expand Up @@ -95,7 +110,6 @@ xcuserdata
#
!xcshareddata


####
# Xcode 4 - Deprecated classes
#
Expand All @@ -105,17 +119,10 @@ xcuserdata

*.moved-aside


####
# UNKNOWN: recommended by others, but I can't discover what these files are
#
# ...none. Everything is now explained.
*.xccheckout
.xccheckout
./*.xccheckout

####
# Ignoring PJSIP src
#
/pjsip/src

0 Vialer/Vialer/Config.plist → Branding/Vialer/Config.plist
View file
File renamed without changes.
24 changes: 24 additions & 0 deletions Branding/Vialer/GoogleService-Info.plist
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?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-60726618-2</string>
<key>PLIST_VERSION</key>
<string>1</string>
<key>BUNDLE_ID</key>
<string>com.voipgrid.vialer</string>
<key>IS_ADS_ENABLED</key>
<false/>
<key>IS_ANALYTICS_ENABLED</key>
<true/>
<key>IS_APPINVITE_ENABLED</key>
<false/>
<key>IS_GCM_ENABLED</key>
<false/>
<key>IS_SIGNIN_ENABLED</key>
<false/>
<key>GOOGLE_APP_ID</key>
<string>1:97495933012:ios:56d040edacefd8fb</string>
</dict>
</plist>
0 Vialer/Vialer/Vialer-Info.plist → Branding/Vialer/Vialer-Info.plist
View file
File renamed without changes.
0 ...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json
View file
File renamed without changes.
0 ...aler.xcassets/AppIcon.appiconset/Icon.png → ...aler.xcassets/AppIcon.appiconset/Icon.png
View file
File renamed without changes
0 ...r.xcassets/AppIcon.appiconset/Icon@2x.png → ...r.xcassets/AppIcon.appiconset/Icon@2x.png
View file
File renamed without changes
0 ....xcassets/AppIcon.appiconset/icon-120.png → ....xcassets/AppIcon.appiconset/icon-120.png
View file
File renamed without changes
0 Vialer/Vialer/Vialer.xcassets/Contents.json → ...ding/Vialer/Vialer.xcassets/Contents.json
View file
File renamed without changes.
0 ...ets/LaunchImage.launchimage/Contents.json → ...ets/LaunchImage.launchimage/Contents.json
View file
File renamed without changes.
0 ...unchImage.launchimage/Default-568h@2x.png → ...unchImage.launchimage/Default-568h@2x.png
View file
File renamed without changes
0 ...unchImage.launchimage/Default-667h@2x.png → ...unchImage.launchimage/Default-667h@2x.png
View file
File renamed without changes
0 ...unchImage.launchimage/Default-736h@3x.png → ...unchImage.launchimage/Default-736h@3x.png
View file
File renamed without changes
0 ...ssets/LaunchImage.launchimage/Default.png → ...ssets/LaunchImage.launchimage/Default.png
View file
File renamed without changes
0 ...ts/LaunchImage.launchimage/Default@2x.png → ...ts/LaunchImage.launchimage/Default@2x.png
View file
File renamed without changes
0 ...aler.xcassets/logo.imageset/Contents.json → ...aler.xcassets/logo.imageset/Contents.json
View file
File renamed without changes.
0 ...ler.xcassets/logo.imageset/logo-small.png → ...ler.xcassets/logo.imageset/logo-small.png
View file
File renamed without changes
0 ....xcassets/logo.imageset/logo-small@2x.png → ....xcassets/logo.imageset/logo-small@2x.png
View file
File renamed without changes
0 ....xcassets/logo.imageset/logo-small@3x.png → ....xcassets/logo.imageset/logo-small@3x.png
View file
File renamed without changes
0 ...ets/logoBlackWhite.imageset/Contents.json → ...ets/logoBlackWhite.imageset/Contents.json
View file
File renamed without changes.
0 ...assets/logoBlackWhite.imageset/clouds.png → ...assets/logoBlackWhite.imageset/clouds.png
View file
File renamed without changes
0 ...ets/logoBlackWhite.imageset/clouds@2x.png → ...ets/logoBlackWhite.imageset/clouds@2x.png
View file
File renamed without changes
0 ...ets/logoBlackWhite.imageset/clouds@3x.png → ...ets/logoBlackWhite.imageset/clouds@3x.png
View file
File renamed without changes
0 ...ssets/sideMenuLogo.imageset/Contents.json → ...ssets/sideMenuLogo.imageset/Contents.json
View file
File renamed without changes.
0 ...ts/sideMenuLogo.imageset/phone-slider.png → ...ts/sideMenuLogo.imageset/phone-slider.png
View file
File renamed without changes
0 ...sideMenuLogo.imageset/phone-slider@2x.png → ...sideMenuLogo.imageset/phone-slider@2x.png
View file
File renamed without changes
0 ...sideMenuLogo.imageset/phone-slider@3x.png → ...sideMenuLogo.imageset/phone-slider@3x.png
View file
File renamed without changes
0 ...assets/vialer-logo.imageset/Contents.json → ...assets/vialer-logo.imageset/Contents.json
View file
File renamed without changes.
0 ...sets/vialer-logo.imageset/vialer-logo.png → ...sets/vialer-logo.imageset/vialer-logo.png
View file
File renamed without changes
0 ...s/vialer-logo.imageset/vialer-logo@2x.png → ...s/vialer-logo.imageset/vialer-logo@2x.png
View file
File renamed without changes
0 ...s/vialer-logo.imageset/vialer-logo@3x.png → ...s/vialer-logo.imageset/vialer-logo@3x.png
View file
File renamed without changes
23 changes: 23 additions & 0 deletions Branding/Vialer/Vialer.xcassets/wifi-phone.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "wifi-phone.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "wifi-phone@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "wifi-phone@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
0 ...epscreen/wifi-phone.imageset/Untitled.png → ...assets/wifi-phone.imageset/wifi-phone.png
View file
File renamed without changes
0 ...creen/wifi-phone.imageset/Untitled@2x.png → ...ets/wifi-phone.imageset/wifi-phone@2x.png
View file
File renamed without changes
0 ...creen/wifi-phone.imageset/Untitled@3x.png → ...ets/wifi-phone.imageset/wifi-phone@3x.png
View file
File renamed without changes
198 changes: 198 additions & 0 deletions Branding/Voys/Config.plist
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,198 @@
<?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>Tint colors</key>
<dict>
<key>NumberPadButtonPressedColor</key>
<array>
<integer>145</integer>
<integer>145</integer>
<integer>145</integer>
</array>
<key>LogInViewControllerButtonBorderColor</key>
<array>
<integer>255</integer>
<integer>255</integer>
<integer>255</integer>
</array>
<key>LogInViewControllerButtonBackgroundColorForPressedState</key>
<array>
<integer>255</integer>
<integer>255</integer>
<integer>255</integer>
<real>0.5</real>
</array>
<key>NumberPadButtonTextColor</key>
<array>
<integer>255</integer>
<integer>255</integer>
<integer>255</integer>
</array>
<key>TabBarBackgroundColor</key>
<array>
<integer>247</integer>
<integer>247</integer>
<integer>247</integer>
</array>
<key>TabBarTintColor</key>
<array>
<integer>46</integer>
<integer>49</integer>
<integer>146</integer>
</array>
<key>NavigationBarTintColor</key>
<array>
<integer>46</integer>
<integer>49</integer>
<integer>146</integer>
</array>
<key>ContactsTableSectionIndexColor</key>
<array>
<integer>46</integer>
<integer>49</integer>
<integer>146</integer>
</array>
<key>RecentsSegmentedControlTintColor</key>
<array>
<integer>46</integer>
<integer>49</integer>
<integer>146</integer>
</array>
<key>SideMenuTintColor</key>
<array>
<integer>46</integer>
<integer>49</integer>
<integer>146</integer>
</array>
<key>SideMenuButtonPressedState</key>
<array>
<integer>247</integer>
<integer>247</integer>
<integer>247</integer>
</array>
<key>SideMenuButtonPressedState</key>
<array>
<integer>247</integer>
<integer>247</integer>
<integer>247</integer>
</array>
<key>NavigationBarBarTintColor</key>
<array>
<integer>248</integer>
<integer>248</integer>
<integer>248</integer>
</array>
<key>AvailabilityTableViewTintColor</key>
<array>
<integer>46</integer>
<integer>49</integer>
<integer>146</integer>
</array>
<key>RecentsTableViewTintColor</key>
<array>
<integer>46</integer>
<integer>49</integer>
<integer>146</integer>
</array>
<key>ContactSearchBarTintColor</key>
<array>
<integer>0</integer>
<integer>0</integer>
<integer>0</integer>
</array>
<key>ContactSearchBarBarTintColor</key>
<array>
<integer>46</integer>
<integer>49</integer>
<integer>146</integer>
</array>
<key>LeftDrawerButtonTintColor</key>
<array>
<integer>46</integer>
<integer>49</integer>
<integer>146</integer>
</array>
<key>RecentsFilterControlTintColor</key>
<array>
<integer>46</integer>
<integer>49</integer>
<integer>146</integer>
</array>
<key>TwoStepScreenInfoBarBackgroundColor</key>
<array>
<string>229</string>
<string>229</string>
<string>229</string>
</array>
<key>TwoStepScreenVialerIconColor</key>
<array>
<string>46</string>
<string>49</string>
<string>146</string>
</array>
<key>TwoStepScreenBubblingColor</key>
<array>
<string>61</string>
<string>65</string>
<string>84</string>
</array>
<key>TwoStepScreenSideAIconColor</key>
<array>
<string>61</string>
<string>65</string>
<string>84</string>
</array>
<key>TwoStepScreenSideBIconColor</key>
<array>
<string>46</string>
<string>49</string>
<string>146</string>
</array>
<key>TwoStepScreenBackgroundHeaderColor</key>
<array>
<string>46</string>
<string>49</string>
<string>146</string>
</array>
<key>ReachabilityBarBackgroundColor</key>
<array>
<integer>178</integer>
<integer>177</integer>
<integer>184</integer>
</array>
<key>GradientBackgroundColors</key>
<dict>
<key>GradientStart</key>
<array>
<integer>46</integer>
<integer>49</integer>
<integer>146</integer>
</array>
<key>GradientEnd</key>
<array>
<integer>42</integer>
<integer>45</integer>
<integer>169</integer>
</array>
<key>GradientAngle</key>
<integer>300</integer>
</dict>
</dict>
<key>URLS</key>
<dict>
<key>Middelware BaseLink</key>
<string>https://vialerpush.voipgrid.nl</string>
<key>API</key>
<string>https://api.voipgrid.nl/api</string>
<key>Partner</key>
<string>https://freedom.voys.nl</string>
<key>SIP domain</key>
<string>sipproxy.voipgrid.nl</string>
<key>onboarding-nl</key>
<string>https://www.voys.nl/app-info</string>
<key>onboarding-en</key>
<string>https://www.voys.nl/en/app-info</string>
</dict>
</dict>
</plist>
24 changes: 24 additions & 0 deletions Branding/Voys/GoogleService-Info.plist
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?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-401436-28</string>
<key>PLIST_VERSION</key>
<string>1</string>
<key>BUNDLE_ID</key>
<string>com.voys.app</string>
<key>IS_ADS_ENABLED</key>
<false/>
<key>IS_ANALYTICS_ENABLED</key>
<true/>
<key>IS_APPINVITE_ENABLED</key>
<false/>
<key>IS_GCM_ENABLED</key>
<false/>
<key>IS_SIGNIN_ENABLED</key>
<false/>
<key>GOOGLE_APP_ID</key>
<string>1:1088426131543:ios:65ad463e19edf623</string>
</dict>
</plist>
Loading

0 comments on commit f84d733

Please sign in to comment.