15805 Commits

Author SHA1 Message Date
Adlai Holler
a14267ebf2 Bump the .travis.yml OS X image requirement for Xcode 7 2015-09-19 12:59:58 -07:00
Adlai Holler
3f12162b1f Bump SDK in build.sh 2015-09-19 12:57:44 -07:00
Adlai Holler
37e2a530ad Merge branch 'master' into update-objc 2015-09-19 12:53:06 -07:00
Adlai Holler
d0f4bacc67 ImageNode: fill background more efficiently 2015-09-19 12:23:51 -07:00
appleguy
4e86ca2024 Merge pull request #670 from facebook/FixTextBuild
Fix building test / profile under Xcode 7
2015-09-19 20:57:23 +02:00
Scott Goodson
a8924a2977 Fix building test / profile under Xcode 7
It is strictly enforcing this unused variable (when asserts are compiled out).
2015-09-19 20:55:40 +02:00
Adlai Holler
70c5582af7 Bump SDK in build.sh 2015-09-19 11:14:45 -07:00
Adlai Holler
dc5650d6fa Revert "Point travis at 9.0 SDK"
This reverts commit ffbf84f13b54a44dbd0b7ef64e3450901648794d.
2015-09-19 11:14:22 -07:00
Adlai Holler
ffbf84f13b Point travis at 9.0 SDK 2015-09-19 11:05:01 -07:00
Adlai Holler
f37a88d2e4 Give a prefix to make ASImageIdentifier typealias 2015-09-18 23:32:52 -07:00
Lukas Spieß
8d945beedf Merge branch 'develop' into feature/telemetry
Conflicts:
	HockeySDK-Source.podspec
	README.md
	Support/buildnumber.xcconfig
	Support/release.xcconfig
	docs/Changelog-template.md
	docs/Guide-Installation-Setup-template.md
2015-09-18 16:43:15 +02:00
Lukas Spieß
141668cf62 Use filePath instead of path in more places 2015-09-18 16:33:43 +02:00
Andreas Linde
dc7666b28d Merge branch 'hotfix/3.8.2' 2015-09-18 16:17:32 +02:00
Andreas Linde
48fe938023 Merge tag '3.8.2' into develop
Version 3.8.2
2015-09-18 16:17:32 +02:00
Andreas Linde
2d04db5388 Fix compile error with Xcode 6.4 2015-09-18 16:17:20 +02:00
Andreas Linde
251249800a Fix compile error with Xcode 6.4 2015-09-18 16:15:03 +02:00
Andreas Linde
cbc9356517 Update build number 2015-09-18 15:54:50 +02:00
Andreas Linde
df3feaf4d1 Merge tag '3.8.2' into develop
Version 3.8.2
2015-09-18 15:54:15 +02:00
Andreas Linde
e8cd219db0 Merge branch 'release/3.8.2' 2015-09-18 15:54:14 +02:00
Andreas Linde
c9d4cabc1b 3.8.2 release and documentation updates 2015-09-18 15:54:05 +02:00
Andreas Linde
3d0185bdb0 Update PLCrashReporter build
Removed Bitcode from simulator slices to make the same build work with Xcode 6.4
2015-09-18 15:52:04 +02:00
Andreas Linde
686d008b78 Don't include Bitcode in simulator builds 2015-09-18 15:06:53 +02:00
Lukas Spieß
10b1c9050d Properly chain cascading of GCC preprocessor defs 2015-09-18 14:16:51 +02:00
Lukas Spieß
de22b30aac Only refrain from running debugger test when on CI 2015-09-18 14:16:51 +02:00
appleguy
a6dba104df Merge pull request #666 from adly-holler/fix-ascell-doc
Clarify ASCellNode docs
2015-09-18 14:02:35 +02:00
appleguy
2ef40e1a60 Merge pull request #434 from dasmer/master
Generate slather/Coveralls test coverage stats
2015-09-18 14:00:45 +02:00
Adlai Holler
c872485459 Fill image context with background color if image node is opaque 2015-09-17 21:59:52 -07:00
Adlai Holler
f20a0d4bc0 Add some nullables in ASTextNode 2015-09-17 19:56:21 -07:00
Adlai Holler
fd3a90a3ed Make image download token optional 2015-09-17 14:56:39 -07:00
Adlai Holler
ba9a742999 Fix nullability of ASImageDownloaderProtocol to conform to ASBasicImageDownloader behavior 2015-09-17 14:48:51 -07:00
Lukas Spieß
0ca2a2d6fd Update HockeySDK.scheme Run configuration 2015-09-17 23:38:49 +02:00
Adlai Holler
38706d0962 Fix nullability in ASImageDownloaderProtocol completion handler 2015-09-17 14:22:29 -07:00
Adlai Holler
c010ddad3b Update all the files in the Details group 2015-09-17 13:30:28 -07:00
Adlai Holler
03648d12a8 Clarify ASCellNode docs that it is for use with collection view as well 2015-09-17 12:30:31 -07:00
Adlai Holler
309ecca444 In ASLayoutOptions, make initWithLayoutable: take a nullable argument 2015-09-17 11:42:38 -07:00
Adlai Holler
717df1cfd2 Merge latest master and update Layout headers 2015-09-17 11:39:59 -07:00
Adlai Holler
cde790124d Merge branch 'master' into update-objc 2015-09-17 11:27:27 -07:00
Peter
12408852a5 no message 2015-09-17 19:19:38 +03:00
appleguy
f8e43ea07a Merge pull request #660 from nguyenhuy/ASViewController
Add ASViewController
2015-09-17 15:16:54 +02:00
Huy Nguyen
a864341710 Remove nonnull and nuulable annotations in ASViewController. Travis don't recognize them (yet). 2015-09-17 16:07:43 +03:00
Huy Nguyen
1ef1b647c9 Remove unnecessary import in ScreenNode.m 2015-09-17 15:59:38 +03:00
Huy Nguyen
8ebc3bdf67 Fix Multiplex sample does not load image: screenNode must be started before its -fetchData method is called. 2015-09-17 15:59:38 +03:00
Huy Nguyen
fcd76dbd19 Use nonnull annotation, instead of sanity check, for node property in ASViewController. 2015-09-17 15:59:37 +03:00
Huy Nguyen
72d108cd98 Minor fixes in ASViewController and Multiplex sample. 2015-09-17 15:58:21 +03:00
Huy Nguyen
07c0d78c71 Add ASViewController and update Multiplex sample to use it. 2015-09-17 15:58:21 +03:00
Peter
008ad99279 no message 2015-09-17 15:01:12 +03:00
appleguy
21bdbbe12f Merge pull request #665 from jflinter/jack-build-phase-cleanup
Clean up Cocoa Touch framework target
2015-09-17 10:15:21 +02:00
appleguy
43b03e74bd Merge pull request #663 from rcancro/functionName
Changed copyIntoOptions to copyFromOptions
2015-09-17 10:12:22 +02:00
appleguy
f74eb4e800 Merge pull request #662 from adly-holler/indentation-settings
Update project indentation settings
2015-09-17 10:11:40 +02:00
appleguy
6282b8607b Merge pull request #661 from nguyenhuy/DisableFailingTableViewTest
Disable an unstable test in ASTableViewTests.
2015-09-17 10:10:03 +02:00