Peter
3a31aa07f3
no message
2017-03-15 16:25:21 +03:00
Peter
b5e9acd96c
Merge commit '657567195261427c43f77d40bc9808b2cc47f157'
2017-03-15 13:33:12 +03:00
Peter
8a2f76f328
no message
2017-03-15 13:32:53 +03:00
Peter
c31ea00f17
no message
2017-03-15 13:32:32 +03:00
Peter
7617b9a9f3
Merge commit 'e6ee24debcae89bd0066061b42ad1a6a73da9486'
...
# Conflicts:
# Source/ASDisplayNode.mm
# Source/ASImageNode.mm
# Source/Details/ASCollectionViewLayoutController.mm
2017-03-15 13:31:39 +03:00
overtake
6575671952
some changes
2017-03-15 00:43:20 +03:00
Peter
3730bfa820
no message
2017-03-14 22:12:11 +03:00
Michael Schneider
e6ee24debc
[ASDisplayNode] Improve locking in ASDisplayNode ( #3172 )
...
* Improve locking in ASDisplayNode
* Address first bunch of comments
* Changed `view` and `layer` methods for locking
* Adress comments
2017-03-14 07:27:34 -07:00
Peter
652832e32b
Merge commit '3ca08f7aae8e4c108730926be5954d371b4d5ef7'
...
# Conflicts:
# TelegramCore/StoreMessage_Telegram.swift
2017-03-14 17:22:32 +03:00
Peter
b7bd388ff4
no message
2017-03-14 17:21:25 +03:00
overtake
3ca08f7aae
forward messages fro channel with unsigned messages
2017-03-14 17:14:49 +03:00
Ahmed Denison-Afifi
b1cfd76cee
Update example podfile platform to match AsyncDisplayKit ( #3176 )
...
* Update podfile platform
2017-03-14 12:34:06 +00:00
overtake
45c19fbc4c
changes
2017-03-14 11:50:09 +03:00
Benjamin Scholtysik (Reimold)
77ef59e666
Merge pull request #400 from bitstadium/master
...
Master
2017-03-13 13:18:01 -07:00
overtake
edd14a8f41
no message
2017-03-13 19:43:35 +03:00
Michael Schneider
dae3a72d4b
[Tests] Add launch image back for test host app ( #3171 )
...
* Add launch image back
* Add TestHostResources back to BUCK file
* Use the new launch image in Buck
2017-03-13 09:10:55 -07:00
Michael Schneider
be74cd8231
Cell nodes can be used without using it within a collection or table view. In this case if a size change happened we should call super as there is no interactionDelegate ( #3168 )
2017-03-13 07:33:06 -07:00
overtake
5f9643aa18
Merge branch 'master' of https://github.com/peter-iakovlev/Postbox
2017-03-12 22:39:16 +03:00
Peter
246bf1bc33
no message
2017-03-12 22:38:46 +03:00
overtake
178cab30d8
Merge branch 'master' of https://github.com/peter-iakovlev/Postbox
2017-03-12 21:54:33 +03:00
Peter
53f23831cc
no message
2017-03-12 21:53:41 +03:00
overtake
02269ab60e
Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCore
2017-03-12 21:07:50 +03:00
Peter
6457c89007
no message
2017-03-12 21:03:01 +03:00
overtake
f99074c62d
for migration
2017-03-12 19:04:13 +03:00
overtake
ff5c66e7bb
Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCore
2017-03-12 19:03:56 +03:00
overtake
6532d1115e
Merge branch 'master' of https://github.com/peter-iakovlev/Postbox
2017-03-12 19:03:46 +03:00
Peter
b424fae986
no message
2017-03-12 19:02:36 +03:00
Peter
44ff4fe420
no message
2017-03-12 19:01:07 +03:00
overtake
94ec63f287
Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCore
2017-03-12 15:19:17 +03:00
Peter
e840d27434
no message
2017-03-12 13:28:38 +03:00
Huy Nguyen
326c97a0c1
When update title of a button node, need to get title node via setter ( #3167 )
...
* When update title of a button node, need to get title node via setter
* Explain why we need to call self.titleNode
* Fix previous comment
2017-03-11 09:12:00 -08:00
Huy Nguyen
74b9b56632
flexShrinkAdjustment lambda must always return CGFloat ( #3166 )
2017-03-11 06:58:04 -08:00
overtake
9d7eb29039
Merge branches 'master' and 'master' of https://github.com/peter-iakovlev/Postbox
2017-03-11 12:46:32 +03:00
overtake
b3da75142a
remove selectWithKey duplicate
2017-03-11 12:46:26 +03:00
Peter
a3c5fed024
no message
2017-03-11 12:44:37 +03:00
overtake
2b252f340b
Merge branch 'master' of https://github.com/peter-iakovlev/Postbox
2017-03-10 21:44:11 +03:00
overtake
b84989e58c
no message
2017-03-10 21:44:05 +03:00
overtake
d3a0226f72
Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCore
...
Conflicts:
TelegramCore/ProcessSecretChatIncomingDecryptedOperations.swift
2017-03-10 21:43:46 +03:00
overtake
678236b6bc
- no message
2017-03-10 21:43:11 +03:00
Peter
c4021393ea
no message
2017-03-10 21:34:58 +03:00
Peter
7f5a4ac3e1
no message
2017-03-10 21:34:39 +03:00
Michael Schneider
0540c863ca
Improve locking situation in ASDisplayNode subclasses ( #3159 )
...
* Improve locking situation in ASDisplayNode subclasses
* Adress first number of comments
* Don’t hold the lock while calling _updateComposedTruncationText
2017-03-10 17:29:09 +00:00
Michael Schneider
0d0176d376
ASControlNode should not receive any touches if it’s disabled ( #3161 )
2017-03-10 17:14:20 +00:00
Adlai Holler
bfe35fc0b1
Add production workaround for missing elements ( #3158 )
2017-03-10 14:35:20 +00:00
Adlai Holler
a0e67a8b15
ASMultidimensionalArrayUtils -> ASTwoDimensionalArrayUtils ( #3157 )
...
* Requery subarray count less in ASMultidimensionalArrayUtils
* Simplify (gut) ASMultidimensionalArrayUtils
* Remove weird change
* Add bounds-checking for graceful failure
2017-03-10 14:33:30 +00:00
Huy Nguyen
54325ecf66
Minor fix in ASStackLayoutSpecSnapshotTests ( #3160 )
2017-03-09 14:21:29 -08:00
Huy Nguyen
18c906aa5c
Some bug fixes for ASStackLayoutSpec: ( #3153 )
...
- Avoid returning a NaN flexShrinkAdjustment.
- Bail early (instead of assert) if a line has a positive `flexFactorSum` but then no flexible item can be found via flex adjustments, for example because the flexible items have zero size.
- Continue flexing other lines when one line is inflexible.
- Add unit test for the first 2 fixes.
2017-03-09 13:35:17 -08:00
Huy Nguyen
4f440a34e0
Gratefully handle unknown headers and footers in collection view ( #3154 )
...
- UICollectionViewFlowLayout asks its delegate, which is ASCollectionView, for reference size of headers and footers. If a header or footer is unavailable, its backing collection element will be nil and a zero size should be returned immediately.
2017-03-09 13:35:08 -08:00
Michael Schneider
f0de855970
[ASControlNode] Align touch and tracking system in ASControlNode to UIControl ( #3145 )
...
* Align touch and tracking system in ASControlNode to UIControl
Currently the touch and tracking system of ASControlNode does not align with the system of UIControl. ASControlNode does not even consider `beginTrackingWithTouch:withEvent:` or `continueTrackingWithTouch:withEvent:`.
This commit will change the ASControlNode logic around touch event handling and tracking to align with UIControl.
* Add assertion for layer backed nodes that would like to add an action target for a control event
* Adress comments
2017-03-09 12:43:29 -08:00
Adlai Holler
7ec293d590
Add Validation to ASElementMap to Avoid Crashes in Production ( #3156 )
...
* Add validation to ASElementMap to avoid production crashes
* Only assert sometimes
2017-03-09 12:19:28 -08:00
