Skip to content

Commit

Permalink
Merge pull request #613 from hello/develop
Browse files Browse the repository at this point in the history
1.4.4 RC 1
  • Loading branch information
jimmymlu authored Jun 29, 2016
2 parents d795a81 + 1ff8631 commit 29a4f00
Show file tree
Hide file tree
Showing 172 changed files with 17,486 additions and 50,138 deletions.
36 changes: 36 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,41 @@
# Changelog

## 1.4.4.3

New:

* Routing app reviews to Amazon UK for UK region
* Added analytics for sharing

Fixes:

* Fixes the alignment of the close / share button when controller is shown above insight

## 1.4.4.2

New:

* Reuse confirmations for Timeline / Sleep Score sharing
* Add share button, when shareable, to the Insight detail screen
* Add a subject line for sharing Insights through the Mail app

Fixes:

* No longer showing a shared conformation for anything else besides Twitter
* Fixed capalization on the text that surround the Insights share url

## 1.4.4.1

New:

* Changed layout of Insight card to include share button
* Share insight with native options
* Show confirmation when shared / copied

Fixes:

* Removed local storage for alarms to fix issue with restores from backup

## 1.4.3.9

Misc:
Expand Down
73 changes: 39 additions & 34 deletions Podfile
Original file line number Diff line number Diff line change
@@ -1,42 +1,47 @@
source 'https://github.com/CocoaPods/Specs.git'

platform :ios, '8.0'

ENV['COCOAPODS_DISABLE_STATS'] = '1'

# Integrations
pod 'FBSDKLoginKit', '~> 4.11.0'
pod 'FBSDKCoreKit', '~> 4.11.0'

# UI
pod 'SORelativeDateTransformer', '~> 1.1.10'
pod 'UIImageEffects', '~> 0.0.1'
pod 'SVWebViewController', :git => 'https://github.com/TransitApp/SVWebViewController.git'
pod 'MSDynamicsDrawerViewController', '1.5.1'
pod 'ZendeskSDK', :git => 'https://github.com/zendesk/zendesk_sdk_ios.git',
:tag => '1.5.4.1'
pod 'UICountingLabel', '~> 1.2.0'
pod 'CGFloatType', '~> 1.3.1'
pod 'Analytics', '3.0.7'
pod 'Bugsnag', '~> 4.1.0'

# Private
pod 'NAPickerView', :git => 'git@github.com:hello/NAPickerView.git'
pod 'BEMSimpleLineGraph', :git => 'git@github.com:hello/BEMSimpleLineGraph.git'
pod 'SHSProtoBuf', :git => 'git@github.com:hello/protobuf-objc.git'
pod 'LGBluetooth', :git => 'git@github.com:hello/LGBluetooth.git'
pod 'SenseKit', :git => 'git@github.com:hello/SenseKit.git'
# pod 'SenseKit', :path => '../SenseKit'
pod 'AttributedMarkdown', :git => 'git@github.com:hello/AttributedMarkdown.git',
:inhibit_warnings => true
abstract_target 'SenseApp' do

pod 'SHSProtoBuf', :git => 'git@github.com:hello/protobuf-objc.git'
pod 'LGBluetooth', :git => 'git@github.com:hello/LGBluetooth.git'
pod 'SenseKit', :git => 'git@github.com:hello/SenseKit.git'
#pod 'SenseKit', :path => '../SenseKit'
pod 'AttributedMarkdown', :git => 'git@github.com:hello/AttributedMarkdown.git', :inhibit_warnings => true
pod 'CGFloatType', '~> 1.3.1'
pod 'SORelativeDateTransformer', '~> 1.1.10'

# the actual Sense iOS app
target 'Sense' do
pod 'FBSDKLoginKit', '~> 4.11.0'
pod 'FBSDKCoreKit', '~> 4.11.0'
pod 'UIImageEffects', '~> 0.0.1'
pod 'SVWebViewController', :git => 'https://github.com/TransitApp/SVWebViewController.git'
pod 'MSDynamicsDrawerViewController', '1.5.1'
pod 'ZendeskSDK', :git => 'https://github.com/zendesk/zendesk_sdk_ios.git', :tag => '1.5.4.1'
pod 'UICountingLabel', '~> 1.2.0'
pod 'Analytics', '3.0.7'
pod 'Bugsnag', '~> 4.1.0'
pod 'NAPickerView', :git => 'git@github.com:hello/NAPickerView.git'
pod 'BEMSimpleLineGraph', :git => 'git@github.com:hello/BEMSimpleLineGraph.git'
end

# the Sense iOS today extension
target 'SenseWidget' do

end

# tests for the app
target 'Tests' do
inherit! :search_paths
pod 'Kiwi'
pod 'Nocilla'
end

end

post_install do |installer|
require 'fileutils'
FileUtils.cp_r('Pods/Target Support Files/Pods/Pods-acknowledgements.plist',
FileUtils.cp_r('Pods/Target Support Files/Pods-SenseApp-Sense/Pods-SenseApp-Sense-acknowledgements.plist',
'SleepModel/Settings.bundle/Acknowledgements.plist', :remove_destination => true)
end

target 'Tests', :exclusive => true do
pod 'Kiwi'
pod 'Nocilla'
end
6 changes: 4 additions & 2 deletions Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ CHECKOUT OPTIONS:
:commit: 0451b5e67dec46b8bc48fcad63d9f844cae1bf19
:git: git@github.com:hello/NAPickerView.git
SenseKit:
:commit: 1cdfd20f77edceae4a1caa7752c42beda31159f7
:commit: cb15d84b4e691f3632db3624476f6583ce3db876
:git: git@github.com:hello/SenseKit.git
SHSProtoBuf:
:commit: 86b2e176097f76d130c858164eca42e15b779073
Expand Down Expand Up @@ -174,4 +174,6 @@ SPEC CHECKSUMS:
UIImageEffects: 37b99fa461e4965f332ca82e92f2c22a1075ee84
ZendeskSDK: 45b7a2812a04c3c5c2510aeeeded5818e6e705a5

COCOAPODS: 0.38.2
PODFILE CHECKSUM: 9e98f8d35cf60de1af744d427b629dcf92eb2bb9

COCOAPODS: 1.0.1
1 change: 1 addition & 0 deletions Pods/Headers/Private/SenseKit/SENAPIShare.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Pods/Headers/Private/SenseKit/SENShareable.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Pods/Headers/Public/SenseKit/SENAPIShare.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Pods/Headers/Public/SenseKit/SENShareable.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions Pods/Manifest.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 29a4f00

Please sign in to comment.