Commit Graph

13022 Commits

Author SHA1 Message Date
overtake
2e63934914 Merge branch 'master' of https://github.com/peter-iakovlev/Postbox 2017-03-09 22:30:24 +03:00
overtake
2cba4c7b0c access 2017-03-09 22:30:19 +03:00
Peter
1c6f0ce185 no message 2017-03-09 22:29:33 +03:00
Adlai Holler
3155d72882 When converting index paths, only wait if asked (#3155) 2017-03-09 10:56:35 -08:00
overtake
a7e752e7b9 Merge branch 'master' of https://github.com/peter-iakovlev/Postbox 2017-03-09 21:15:36 +03:00
overtake
8da40d0b01 some passcode changes 2017-03-09 21:15:30 +03:00
Peter
54d3af26b1 no message 2017-03-09 21:14:48 +03:00
Peter
ba2e6ae0d3 Merge commit '4830bdeb05b2b8b4946e9f4f41fdaa1892e96172' 2017-03-09 21:14:06 +03:00
Peter
7caa5add94 no message 2017-03-09 21:14:01 +03:00
overtake
98e376cdd7 passcode 2017-03-09 10:22:57 +03:00
Peter
6e6a71dabb Merge commit '056de30392d16a29cce16c0a240271f30093e528' 2017-03-09 01:02:30 +03:00
Peter
18fae85e67 no message 2017-03-09 01:02:25 +03:00
Adlai Holler
44d9415ab7 Don't Eagerly Trigger Relayout in Wait (#3134)
* Don’t eagerly reload data in wait

* Update tests to account for new reloadData behavior
2017-03-08 10:43:38 -08:00
Huy Nguyen
dd8cac4414 Add a concurrent flag to ASStackLayoutSpec that is off by default (#3148) 2017-03-08 16:33:50 +00:00
Huy Nguyen
21953c97ef -actionForLayer:forKey: of ASDisplayNode should return nil to avoid the node being animated by CA when it's being moved from one supernode to another (#3146)
This reverts commit 1d21c0bd55 introduced in #3063.
2017-03-08 14:02:12 +00:00
overtake
056de30392 Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCore 2017-03-08 09:10:09 +03:00
Peter
deca9e61de no message 2017-03-08 01:05:38 +03:00
Peter
f5c7871b05 no message 2017-03-08 01:03:20 +03:00
Peter
c5d34b17f0 no message 2017-03-08 01:03:03 +03:00
Michael Schneider
cbd8714260 Fix crashes while subclassing ASDisplayNode and subclasses in Swift (#3143) 2017-03-07 07:36:08 -08:00
overtake
4985373538 Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCore 2017-03-07 18:00:35 +03:00
Peter
624b6e160f no message 2017-03-07 18:00:11 +03:00
Peter
2d14089ca5 Fix for rare stuck on bad tcp 2017-03-07 17:59:54 +03:00
overtake
4830bdeb05 Merge branch 'master' of https://github.com/peter-iakovlev/Postbox 2017-03-07 16:12:05 +03:00
overtake
16ce327863 Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCore 2017-03-07 16:12:00 +03:00
Peter
c60255eaa3 no message 2017-03-07 16:10:56 +03:00
Peter
55d3f0cc75 no message 2017-03-07 16:10:43 +03:00
overtake
4508ce5278 Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCore 2017-03-07 16:00:35 +03:00
overtake
86d259e7c9 check media changes after copy to mediabox 2017-03-07 15:58:57 +03:00
Peter
976f82204d Merge commit 'c63302459dbfd7c543b9bd7260f53eb3c34bacb6' 2017-03-07 15:58:40 +03:00
Peter
9af14df09e no message 2017-03-07 15:58:35 +03:00
overtake
c63302459d - no message 2017-03-07 10:09:50 +03:00
Benjamin Scholtysik (Reimold)
52ff733692 Merge pull request #401 from bitstadium/fix/readme-carthage-config
Fix configuration name in carthage section
2017-03-06 17:33:03 -08:00
Benjamin Scholtysik (Reimold)
610138b1b8 Remove AssetsLibrary from default subspec 2017-03-06 15:37:07 -08:00
overtake
76ba7baa5b Merge branch 'master' of https://github.com/peter-iakovlev/Postbox 2017-03-07 01:43:26 +03:00
Peter
36adf94aef no message 2017-03-07 01:42:21 +03:00
Peter
3fb612596f no message 2017-03-07 01:38:03 +03:00
overtake
dafd483f1c Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCore 2017-03-07 01:37:46 +03:00
Peter
be625d8f96 no message 2017-03-07 01:36:35 +03:00
Peter
d57b82cc15 no message 2017-03-07 01:36:18 +03:00
overtake
4d49e3be12 deployment target 2017-03-06 21:55:26 +03:00
overtake
3665a36fea Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCore 2017-03-06 21:47:28 +03:00
Peter
d6025daae8 no message 2017-03-06 21:43:07 +03:00
Adlai Holler
1d6221c52b Don't Cache ConstrainedSize in ASCollectionView (#3136)
* Never reuse constrained sizes when measuring collection view items

* Assert main thread

* Fix the build
2017-03-06 10:11:56 -08:00
Adlai Holler
d59ea3902d Initial Work for Range Controller to Support Supplementary Elements (#3140)
* Initial work supporting supplementaries in range controller

* Rename indexPathForElementIfItem
2017-03-06 10:11:00 -08:00
overtake
e41b8bfe47 Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCore 2017-03-06 18:37:15 +03:00
overtake
37d74068d1 delplyment target changes to 10.11 2017-03-06 18:37:10 +03:00
Michael Schneider
d0ad24808b Fix setting selectedBackgroundView in collection view (#3131) 2017-03-06 07:19:44 -08:00
Peter
f5a6cfdc1b Merge commit '4c7d17b3dd6c6450058e9e8822e56134832a7059' 2017-03-06 17:23:07 +03:00
Peter
91ed2e4bd0 no message 2017-03-06 17:22:54 +03:00