Skip to content

Commit

Permalink
Merge pull request #703 from hello/develop
Browse files Browse the repository at this point in the history
1.5.4 RC
  • Loading branch information
jimmymlu authored Oct 14, 2016
2 parents c234085 + 350d986 commit b5ea7ea
Show file tree
Hide file tree
Showing 165 changed files with 6,483 additions and 1,717 deletions.
65 changes: 65 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,70 @@
# Changelog

## 1.5.4.6

New:

* Hiding lights expansion integration in alarms for now, until next release

## 1.5.4.5

Fixes:

* Fixes frequent time outs on Pill DFU flow
* Fix action sheet blocking the UI in expansion configuration selection

## 1.5.4.4

New:

* Added lights option to Alarm view, when available (selection depends on server to work)

Fixes:

* Pill DFU should no longer unexpectedly complete on iOS 10
* Sense pairing screen in upgrade path should properly display blue or purple copy
* Pill DFU scanning should time out if pill not found within 15s

## 1.5.4.3

New:

* Added error state when list of expansions cannot be retrieved
* Updated the UI of Alarms to prepare for introduction of expansion integration
* Updated copy references to purple during onboarding
* Updated copy of errors that may occur within Expansion configuration
* Updated copy for various Expansion screens

Fixes:

* Fixed issue that prevented user from taken action on an Expansion setting right after connecting to it
* Fixed issue that would cause the enable switch to not reflect current state after selecting a configuration

## 1.5.4.2

New:

* Design tweaks from design review
* Added controls for the web view that controls the third party oauth pages for expansions
* Added voice attribution to alarms, when available
* Updated copy

## 1.5.4.1

New:

* Expansions settings
* Expansions view
* Expansions connect flow
* Expansions removal
* Expansions ability to enable/disable
* Expansions ability to change configuration

Fixes:

* Fixed issue that causes a crash in Pill DFU when binary cannot be downloaded
* Fixed issue where Pill DFU will sometime report that it completed, when it didn't

## 1.5.3.11

Fixes:
Expand Down
4 changes: 2 additions & 2 deletions Extensions/RoomConditions/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
<key>CFBundlePackageType</key>
<string>XPC!</string>
<key>CFBundleShortVersionString</key>
<string>1.5.3</string>
<string>1.5.4</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1.5.3.11</string>
<string>1.5.4.6</string>
<key>NSExtension</key>
<dict>
<key>NSExtensionMainStoryboard</key>
Expand Down
2 changes: 1 addition & 1 deletion Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ 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 'SenseKit', :path => '../SenseKit'
pod 'AttributedMarkdown', :git => 'git@github.com:hello/AttributedMarkdown.git', :inhibit_warnings => true
pod 'CGFloatType', '~> 1.3.1'
pod 'SORelativeDateTransformer', :git => 'git@github.com:jrmiddle/SORelativeDateTransformer.git', :commit => '51f53d591b7c19da1fcea5a91e5c044089c99410'
Expand Down
4 changes: 2 additions & 2 deletions Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ CHECKOUT OPTIONS:
:commit: 0451b5e67dec46b8bc48fcad63d9f844cae1bf19
:git: git@github.com:hello/NAPickerView.git
SenseKit:
:commit: 7f4f134b067e79adaa4842b35e5eb0c27f45e0d5
:commit: 8a3fbfc31af2088fe1ce06338c1154846ee41475
:git: git@github.com:hello/SenseKit.git
SHSProtoBuf:
:commit: 86b2e176097f76d130c858164eca42e15b779073
Expand Down Expand Up @@ -199,6 +199,6 @@ SPEC CHECKSUMS:
ZendeskSDK: 45b7a2812a04c3c5c2510aeeeded5818e6e705a5
Zip: 670419a5ba9faaf5f24ed3650c4c38b4136e996b

PODFILE CHECKSUM: e16372ef4b4e609ae0d74aa00128fa9c376e518e
PODFILE CHECKSUM: 7d5242e2506ba12f31affb1fcd9b590909277712

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

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

1,392 changes: 708 additions & 684 deletions Pods/Pods.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions Pods/SenseKit/Pod/Classes/API/API.h

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

18 changes: 7 additions & 11 deletions Pods/SenseKit/Pod/Classes/API/SENAPIAlarms.h

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

128 changes: 22 additions & 106 deletions Pods/SenseKit/Pod/Classes/API/SENAPIAlarms.m

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

32 changes: 32 additions & 0 deletions Pods/SenseKit/Pod/Classes/API/SENAPIExpansion.h

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

Loading

0 comments on commit b5ea7ea

Please sign in to comment.