Commit Graph

13022 Commits

Author SHA1 Message Date
Adlai Holler
a1ffa499cb Assert against the user trying to set isLayerBacked on ASEditableTextNode 2015-09-21 00:15:03 -07:00
Adlai Holler
441a0e6928 Update types for drawParameters 2015-09-20 22:32:04 -07:00
Adlai Holler
9d6b3b6e14 Merge branch 'master' into update-objc
Conflicts:
	AsyncDisplayKit/Details/ASTextNodeTextKitHelpers.h
2015-09-20 21:55:54 -07:00
appleguy
48b0525f76 Merge pull request #667 from levi/patch-2
Update Podspec to support Cocoapods 0.38.x
2015-09-20 21:48:47 -07:00
appleguy
233e9c69ae Merge pull request #673 from adly-holler/ceil-text-size
Align ASEditableTextNode to pixel boundaries
2015-09-20 21:44:53 -07:00
Adlai Holler
efe198e814 Use ceilSize in ASEditableTextNode 2015-09-20 21:18:06 -07:00
Adlai Holler
4ef2e572e6 Elevate ceilPixel functions to ASTextNodeTextKitHelpers.h, add ceilSize 2015-09-20 21:17:24 -07:00
Levi McCallum
a9539fea1a Update Travis' Cocoapods version to 0.38.2 2015-09-20 10:01:08 -07:00
Levi McCallum
debb178043 Update Podspec to support Cocoapods 0.38.x
Fixes #659
2015-09-20 10:00:40 -07:00
Peter
92651bf1ee no message 2015-09-20 13:12:25 +03:00
appleguy
ca9b1caca4 Merge pull request #672 from adly-holler/fix-collectionview-update-crash
Fix collection view data inconsistency
2015-09-20 11:21:15 +02:00
appleguy
aee6709229 Merge pull request #668 from adly-holler/imagenode-opaque-bg
Fill image context with background color if image node is opaque
2015-09-20 11:06:53 +02:00
Adlai Holler
86c1fa3981 Rename flag, default it to true, shorten some comment lines 2015-09-19 14:21:33 -07:00
Adlai Holler
7cd79e6e6f Tweak comment 2015-09-19 13:43:18 -07:00
Adlai Holler
f0f26d3dab Tweak the new pendingReload flag 2015-09-19 13:40:41 -07:00
Adlai Holler
77490e11c0 ASCollectionView: Suspend updates while reload data is pending 2015-09-19 13:35:57 -07:00
Adlai Holler
a1236a90c1 Update Swift example 2015-09-19 13:10:40 -07:00
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 ffbf84f13b.
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