Commit Graph

13022 Commits

Author SHA1 Message Date
Lukas Spieß
84142a471f Fix typo in Changelog 2016-05-06 03:37:30 +02:00
Lukas Spieß
a5dd30163c Merge branch 'master' into develop
# Conflicts:
#	Classes/BITMetricsManager.m
#	Classes/BITPersistence.m
#	HockeySDK-Source.podspec
#	HockeySDK.podspec
#	README.md
#	Support/buildnumber.xcconfig
#	docs/Changelog-template.md
#	docs/Guide-Installation-Setup-template.md
2016-05-06 03:27:49 +02:00
Lukas Spieß
56b1348f3b Merge branch 'release/4.0.1' 2016-05-06 03:11:35 +02:00
Lukas Spieß
63c9c7cf9e Add note to Readme 2016-05-06 03:08:39 +02:00
Lukas Spieß
61594c6d53 Update Changelog 2016-05-06 03:08:39 +02:00
Lukas Spieß
cc698da854 Update version and build numbers to 4.0.1 2016-05-06 03:08:39 +02:00
Lukas Spieß
2401cd25fc Fix function declaration position in BITHockeyHelper 2016-05-06 03:08:05 +02:00
Lukas Spieß
f14edc726b Merge pull request #293 from bitstadium/hotfix/exclude-subfolder-from-backup
Only exclude subfolder from backup
2016-05-06 02:17:01 +02:00
Lukas Spieß
c893884787 Set resourceValue after all directories have been created 2016-05-06 02:16:27 +02:00
Lukas Spieß
85a468acb6 Add tests for createDirectoryStructureIfNeeded 2016-05-06 02:16:27 +02:00
chrwend
375d70f698 Test if fix ignores removal of exclude-attribute if developer set flag in NSUserDefaults 2016-05-06 02:16:27 +02:00
chrwend
d26eed7e4f Test if fix removes exclude-attribute from folder 2016-05-06 02:16:27 +02:00
Lukas Spieß
bc9d9c463b Add logic to fix wrong flag on Application Support 2016-05-06 02:16:27 +02:00
Michael Schneider
cac4ed5626 Move layout of ASVideoNode to layout specs
- This should fix adjusting a custom play button position
- Fix sample project use of ASVideoNode
2016-05-05 16:49:01 -07:00
Erekle
e87fd7a998 first steps 2016-05-06 02:42:17 +04:00
Lukas Spieß
6520c77afd Fix scenario where wrong folder is excluded from backup 2016-05-05 23:34:30 +02:00
appleguy
62a853b3e9 Merge pull request #1618 from garrettmoon/fixLayoutDeadlock
[ASDisplayNode] Fix rare deadlock when performing layout on multiple threads with the same node.
2016-05-05 12:47:08 -07:00
Erekle
e9531986d4 Merge remote-tracking branch 'facebook/master' 2016-05-05 22:53:29 +04:00
Garrett Moon
dc56c060d0 Add comment for why lock is added. 2016-05-05 10:02:29 -07:00
Michael Schneider
bc8489528e Fix crash in delegate / dataSource proxies for ASCollectionView and ASTableView 2016-05-04 21:03:43 -07:00
Michael Schneider
90c3dbc324 Add better comments for deprecated ASTextNode properties 2016-05-04 21:03:31 -07:00
Michael Schneider
29ab87a1e4 Fix API ASTextNode API inconsistencies
- Deprecate attributedString in ASTextNode in favor of attributedText to be aligned with UILabel
- Deprecate truncationAttributedString in ASTextNode in favor of truncationAttributedText to be aligned with attributedText
2016-05-04 21:03:31 -07:00
Michael Schneider
cad221007e Remove extending NSObject protocol in ASPagerDelegate as ASCollectionDelegate already extends it 2016-05-04 21:03:13 -07:00
Michael Schneider
298b9a2be7 Fix ASPagerNode data source and delegate inconsistencies
- Change ASPagerNodeDataSource -> ASPagerDataSource
- Add ASPagerDelegate
2016-05-04 21:03:13 -07:00
appleguy
3ee6c88ae4 Merge pull request #1608 from Eke/master
[ASVideoNode] Several new delegate methods and ASVideoNodePlayerState to monitor and control playback
2016-05-04 20:33:23 -07:00
appleguy
f5a650d71d Merge pull request #1623 from Adlai-Holler/MapNodeDestroySnapshotter
[ASMapNode] Remove Retain Cycle, Cancel Snapshotting on Deallocation
2016-05-04 20:10:38 -07:00
Adlai Holler
646797e335 [ASMapNode: Snapshotting] Cancel on dealloc, avoid retaining self 2016-05-04 18:25:22 -07:00
Lukas Spieß
5c5e40e2a5 Merge pull request #292 from bitstadium/hotfix/fix-feedbackComposerPreparedItems
Fix a bug where preparedItemsForFeedbackManager: would not work
2016-05-05 02:37:30 +02:00
Erekle
5c3770e543 fixes 2016-05-05 02:03:03 +04:00
Erekle
82cc6f49f2 coding style fixes 2016-05-05 01:49:52 +04:00
Scott Goodson
f505c17efe [Build / Cocoapods] Presumably-final fix to AnimatedGIF project configuration. 2016-05-03 21:06:14 -07:00
Scott Goodson
7acdf6ab37 [Build / Cocoapods] Fix AnimatedGIF Podfile to use Sample as the target name, which is the correct one. 2016-05-03 20:42:15 -07:00
appleguy
631fa0e482 Merge pull request #1620 from maicki/FixBuildAnimatedGifExample
Fix AnimatedGIF example Podfile
2016-05-03 20:39:49 -07:00
Michael Schneider
23f0ded2bc Fix AnimatedGIF example Podfile 2016-05-03 20:38:11 -07:00
Scott Goodson
44ad32095b [Build / Cocoapods] Use new PINRemoteImage, but temporarily disable tvOS for 1.9.73 due to bulid warnings. 2016-05-03 19:35:57 -07:00
appleguy
58cf96ad67 Merge pull request #1617 from garrettmoon/updatePodspec
[Build / CocoaPods] Fix podspec linting, beta 2 of PINRemoteImage *should* work with tvos without a subspec
2016-05-03 19:32:07 -07:00
Lukas Spieß
55c78b27b8 Make sure preparedItems array is always initialized 2016-05-04 01:15:39 +02:00
Lukas Spieß
73da07140f Add tests for cases where feedbackComposerPreparedItems is nil 2016-05-04 01:15:39 +02:00
Garrett Moon
025dd55312 Dang, message local var, not ivar 2016-05-03 15:59:21 -07:00
Garrett Moon
938ecd9b6f Fix deadlock when laying out on multiple threads
Summary:
We observed a deadlock which occurred when two threads were laying out the same set of nodes.

On one thread, layout would occur on a leaf node. It would lock and as part of this layout
process, ASDK walks up the node tree and calls __setNeedsLayout on its supernode until it
reaches the supernode with no supernode. When the supernode gets its call to __setNeedsLayout
it also locks. So leaf node locks and then awaits supernode lock.

On another thread, we're doing a layout pass on the supernode in the above thread. This locks
the supernode and attempts to lock the leaf node. This deadlocks (remember the above thread
is holding onto the leaf lock and awaiting the supernode lock. This thread is holding onto
the supernode lock and awaiting the leaf lock).

This is all exacerbated by the use of recursive locks.
2016-05-03 15:56:38 -07:00
Lukas Spieß
f2648e96f2 Fix typo in Readme 2016-05-04 00:52:14 +02:00
Lukas Spieß
2f4b52fba2 Improve setLogHandler example code 2016-05-04 00:48:39 +02:00
Garrett Moon
dd87885269 beta 2 of PINRemoteImage *should* work with tvos without a subspec 2016-05-03 15:47:54 -07:00
Lukas Spieß
261b995dd9 Start Simulator manually before tests to avoid timeouts 2016-05-03 21:12:50 +02:00
Erekle
b3af10d4ad Merge remote-tracking branch
# Conflicts:
#	AsyncDisplayKit/ASVideoNode.mm
2016-05-03 22:59:54 +04:00
Lukas Spieß
a20e70c50b Copy Readme changes to Instllation guide 2016-05-03 20:47:56 +02:00
Lukas Spieß
736aeef75f Merge pull request #290 from navdove/patch-1
Update README.md
2016-05-03 20:34:25 +02:00
Navdeep Singh
1edc7c435c Update README.md 2016-05-03 14:32:45 -04:00
chrwend
7330d7a320 Update readme: Remove semicolons from swift code examples 2016-05-03 10:33:03 -07:00
appleguy
a9e742c92f Merge pull request #1606 from wendylu/render_fix
[ASNetworkImageNode] Fix threading issue in current image quality
2016-05-02 18:02:29 -07:00