Skip to content

Commit

Permalink
Merge branch 'release/3.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
Bob Voorneveld committed Jun 8, 2016
2 parents f84d733 + a04c61b commit 5c474ad
Show file tree
Hide file tree
Showing 1,400 changed files with 11,404 additions and 154,714 deletions.
185 changes: 156 additions & 29 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
**/Snapshot-Constants.swift

# Local user specific env vars for fastlane
fastlane/.env
fastlane/.env*
!fastlane/.env.EXAMPLE

####
# fastlane specific as recommended at:
Expand All @@ -15,47 +16,104 @@ fastlane/report.xml
fastlane/Preview.html
Preview.html

# fastlane temporary build directory
fastlane/**/builds/

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

# scan temporary files
fastlane/test_output

# rbenv ruby version file
.ruby-version

#########################
# !! 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
# .gitignore file for Xcode4 and Xcode5 Source projects
#
# Apple bugs, waiting for Apple to fix/respond:
#
# 15564624 - what does the xccheckout file in Xcode5 do? Where's the documentation?
#
# Version 2.6
# For latest version, see: http://stackoverflow.com/questions/49478/git-ignore-file-for-xcode-projects
#
# 2015 updates:
# - Fixed typo in "xccheckout" line - thanks to @lyck for pointing it out!
# - Fixed the .idea optional ignore. Thanks to @hashier for pointing this out
# - Finally added "xccheckout" to the ignore. Apple still refuses to answer support requests about this, but in practice it seems you should ignore it.
# - minor tweaks from Jona and Coeur (slightly more precise xc* filtering/names)
# 2014 updates:
# - appended non-standard items DISABLED by default (uncomment if you use those tools)
# - removed the edit that an SO.com moderator made without bothering to ask me
# - researched CocoaPods .lock more carefully, thanks to Gokhan Celiker
# 2013 updates:
# - fixed the broken "save personal Schemes"
# - added line-by-line explanations for EVERYTHING (some were missing)
#
# NB: if you are storing "built" products, this WILL NOT WORK,
# and you should use a different .gitignore (or none at all)
# and you should use a different .gitignore (or none at all)
# This file is for SOURCE projects, where there are many extra
# files that we want to exclude
# files that we want to exclude
#
# For updates, see: http://stackoverflow.com/questions/49478/git-ignore-file-for-xcode-projects
#########################

#####
# OS X temporary files that should never be committed
#
# c.f. http://www.westwind.com/reference/os-x/invisibles.html

.DS_Store

# c.f. http://www.westwind.com/reference/os-x/invisibles.html

.Trashes

# c.f. http://www.westwind.com/reference/os-x/invisibles.html

*.swp
profile

#
# *.lock - this is used and abused by many editors for many different things.
# For the main ones I use (e.g. Eclipse), it should be excluded
# from source-control, but YMMV.
# (lock files are usually local-only file-synchronization on the local FS that should NOT go in git)
# c.f. the "OPTIONAL" section at bottom though, for tool-specific variations!
#
# In particular, if you're using CocoaPods, you'll want to comment-out this line:
*.lock


#
# profile - REMOVED temporarily (on double-checking, I can't find it in OS X docs?)
#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 @@ -66,22 +124,63 @@ 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: http://lists.apple.com/archives/xcode-users/2004/Jan/msg00193.html

*.pbxuser

# .mode1v3: http://lists.apple.com/archives/xcode-users/2007/Oct/msg00465.html

*.mode1v3

# .mode2v3: http://lists.apple.com/archives/xcode-users/2007/Oct/msg00465.html

*.mode2v3

# .perspectivev3: http://stackoverflow.com/questions/5223297/xcode-projects-what-is-a-perspectivev3-file

*.perspectivev3

# NB: also, whitelist the default ones, some projects need to use these
!default.pbxuser
!default.mode1v3
!default.mode2v3
!default.perspectivev3


####
# Xcode 4 - semi-personal settings, often included in workspaces
# Xcode 4 - semi-personal settings
#
# Apple Shared data that Apple put in the wrong folder
# c.f. http://stackoverflow.com/a/19260712/153422
# FROM ANSWER: Apple says "don't ignore it"
# FROM COMMENTS: Apple is wrong; Apple code is too buggy to trust; there are no known negative side-effects to ignoring Apple's unofficial advice and instead doing the thing that actively fixes bugs in Xcode
# Up to you, but ... current advice: ignore it.
*.xccheckout

#
#
# OPTION 1: ---------------------------------
# throw away ALL personal settings (including custom schemes!
# - unless they are "shared")
# As per build/ and DerivedData/, this ought to have a trailing slash
#
# NB: this is exclusive with OPTION 2 below
xcuserdata/

# OPTION 2: ---------------------------------
# get rid of ALL personal settings, but KEEP SOME OF THEM
# - NB: you must manually uncomment the bits you want to keep
#
# You can safely ignore the xcuserdata files - but do NOT ignore the files next to them
# NB: this *requires* git v1.8.2 or above; you may need to upgrade to latest OS X,
# or manually install git over the top of the OS X version
# NB: this is exclusive with OPTION 1 above
#
xcuserdata
#xcuserdata/**/*

# (requires option 2 above): Personal Schemes
#
#!xcuserdata/**/xcschemes/*

####
# XCode 4 workspaces - more detailed
Expand All @@ -90,25 +189,23 @@ xcuserdata
#
# Workspace layout is quite spammy. For reference:
#
# (root)/
# (project-name).xcodeproj/
# /(root)/
# /(project-name).xcodeproj/
# project.pbxproj
# project.xcworkspace/
# /project.xcworkspace/
# contents.xcworkspacedata
# xcuserdata/
# (your name)/xcuserdatad/
# xcuserdata/
# (your name)/xcuserdatad/
#
#
# /xcuserdata/
# /(your name)/xcuserdatad/
# UserInterfaceState.xcuserstate
# /xcshareddata/
# /xcschemes/
# (shared scheme name).xcscheme
# /xcuserdata/
# /(your name)/xcuserdatad/
# (private scheme).xcscheme
# xcschememanagement.plist
#
# Xcode 4 workspaces - SHARED
#
# This is UNDOCUMENTED (google: "developer.apple.com xcshareddata" - 0 results
# But if you're going to kill personal workspaces, at least keep the shared ones...
#
#
!xcshareddata

####
# Xcode 4 - Deprecated classes
Expand All @@ -120,9 +217,39 @@ xcuserdata
*.moved-aside

####
# UNKNOWN: recommended by others, but I can't discover what these files are
# OPTIONAL: Some well-known tools that people use side-by-side with Xcode / iOS development
#
# ...none. Everything is now explained.
*.xccheckout
.xccheckout
./*.xccheckout
# NB: I'd rather not include these here, but gitignore's design is weak and doesn't allow
# modular gitignore: you have to put EVERYTHING in one file.
#
# COCOAPODS:
#
# c.f. http://guides.cocoapods.org/using/using-cocoapods.html#what-is-a-podfilelock
# c.f. http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control
#
Pods/
!Podfile
!Podfile.lock

#
# RUBY:
#
# c.f. http://yehudakatz.com/2010/12/16/clarifying-the-roles-of-the-gemspec-and-gemfile/
#
#!Gemfile.lock
#
# IDEA:
#
# c.f. https://www.jetbrains.com/objc/help/managing-projects-under-version-control.html?search=workspace.xml
#
#.idea/workspace.xml
#
# TEXTMATE:
#
# -- UNVERIFIED: c.f. http://stackoverflow.com/a/50283/153422
#
#tm_build_errors

####
# UNKNOWN: recommended by others, but I can't discover what these files are
#
31 changes: 22 additions & 9 deletions Branding/Voys/Config.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,17 @@
<dict>
<key>Tint colors</key>
<dict>
<key>SideMenuHeaderBackgroundColor</key>
<array>
<integer>247</integer>
<integer>247</integer>
<integer>247</integer>
</array>
<key>NumberPadButtonPressedColor</key>
<array>
<integer>145</integer>
<integer>145</integer>
<integer>145</integer>
<integer>255</integer>
<integer>255</integer>
<integer>255</integer>
</array>
<key>LogInViewControllerButtonBorderColor</key>
<array>
Expand All @@ -23,6 +29,19 @@
<integer>255</integer>
<real>0.5</real>
</array>
<key>ActivateSIPAccountViewControllerButtonBorderColor</key>
<array>
<integer>255</integer>
<integer>255</integer>
<integer>255</integer>
</array>
<key>ActivateSIPAccountViewControllerButtonBackgroundColorForPressedState</key>
<array>
<integer>255</integer>
<integer>255</integer>
<integer>255</integer>
<real>0.5</real>
</array>
<key>NumberPadButtonTextColor</key>
<array>
<integer>255</integer>
Expand Down Expand Up @@ -71,12 +90,6 @@
<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>
Expand Down
2 changes: 2 additions & 0 deletions Branding/Voys/Voys-Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@
<array>
<string>UIInterfaceOrientationPortrait</string>
</array>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>UIViewControllerBasedStatusBarAppearance</key>
<true/>
</dict>
Expand Down
4 changes: 2 additions & 2 deletions Pods/VialerSIPLib-iOS/LICENSE → LICENSE.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -631,7 +631,7 @@ to attach them to the start of each source file to most effectively
state the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.

VialerSIPLib. An objective-c wrapper for pjsip.
Vialer. A softphone for the VoIPGRID platform.
Copyright (C) 2016 Devhouse Spindle

This program is free software: you can redistribute it and/or modify
Expand All @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
If the program does terminal interaction, make it output a short
notice like this when it starts in an interactive mode:

VialerSIPLib Copyright (C) 2016 Devhouse Spindle
Vialer Copyright (C) 2016 Devhouse Spindle
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
Expand Down
16 changes: 12 additions & 4 deletions Podfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,30 @@ platform :ios, '9.0'
# Uncomment this line if you're using Swift
# use_frameworks!

target 'Vialer' do
def default_pods
pod 'AFNetworkActivityLogger'
pod 'AFNetworking'
pod 'Google/Analytics', '~> 1.0.7'
pod 'Google/Analytics'
pod 'HDLumberjackLogFormatter', :git => 'https://hd-apps@bitbucket.org/hd-apps/hdlumberjacklogformatter.git'
pod 'HTCopyableLabel'
pod 'MMDrawerController+Storyboard', :git => 'https://github.com/TomSwift/MMDrawerController-Storyboard.git'
pod 'PBWebViewController'
pod 'Reachability'
pod 'SSKeychain'
pod 'SimulatorStatusMagic'
pod 'SimulatorStatusMagic', :configurations => ['Debug', 'AdHocDistribution']
pod 'SVProgressHUD'
pod 'VialerSIPLib-iOS'
end

target 'Vialer' do
default_pods
end

target 'Voys' do
default_pods
end

target 'VialerTests' do
pod 'CocoaLumberjack'
pod 'OCMock'
pod 'OHHTTPStubs'
end
Expand Down
Loading

0 comments on commit 5c474ad

Please sign in to comment.