ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-09-13 23:54:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,123 Commits 2 Branches 281 Tags
Commit Graph

3123 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Jensen
d3c33a38bb Add missing nullability annotations to headers related to display node transitions (#1688) 2016-05-21 11:10:07 +08:00
Erekle
49b2726632 fixed old examples 2016-05-20 12:21:57 +04:00
Jonas Schmid
94b88ad1ab Removed DevelopmentTeam setting in sample (#1682) 2016-05-19 13:20:37 -07:00
Erekle
100d2b4f26 moved spinner to ASVIdeoPlayerNode 2016-05-19 15:07:39 +04:00
Erekle
3d5385dad3 replaced deprecated methods 2016-05-19 13:40:09 +04:00
Erekle
053b14992c Merge remote-tracking branch 'facebook/master' into ASVideoPlayerNode 
# Conflicts:
#	AsyncDisplayKit/ASVideoNode.h
#	AsyncDisplayKit/ASVideoNode.mm
 2016-05-19 11:57:16 +04:00
appleguy
4036904869 Merge pull request #1676 from Xinchi/patch-3 
[ASVideoNode] API improvements: new delegate methods related to recovering from buffering stalls, etc.
 2016-05-18 22:16:34 -07:00
Max Gu
73b41ee450 Renaming the delegate flags for the deprecated methods 2016-05-18 22:10:06 -07:00
Max Gu
1c64a4a785 Surpressing deprecated methods warning 2016-05-18 16:39:45 -07:00
Max Gu
90877847c2 Adding deprecated methods back 2016-05-18 14:05:08 -07:00
Max Gu
a93bc72e25 Updating and adding a few APIs for ASVideoNode 2016-05-18 08:40:58 -07:00
Max Gu
772cf15b83 Merge branch 'master' into patch-3 2016-05-18 08:37:24 -07:00
Max Gu
b91f1f8336 Merge remote-tracking branch 'upstream/master' 2016-05-18 08:37:11 -07:00
Max Gu
325e37020c Adding startup loading state in ASVideoNode 2016-05-17 15:31:30 -07:00
Erekle
39e287f0d6 fixes suggested by levi 2016-05-18 00:45:40 +04:00
Erekle
d9b84db614 Merge remote-tracking branch 'facebook/master' into ASVideoPlayerNode 2016-05-17 23:34:20 +04:00
Max Gu
74584e2f8e Merge branch 'ASVideoPlayerNode' of https://github.com/Eke/AsyncDisplayKit into ASVideoPlayerNode 2016-05-17 11:10:22 -07:00
Erekle
8c8fc3dba0 Adding ASVideoPlayerNode 2016-05-17 11:08:53 -07:00
Scott Goodson
9c5b2fcb18 [Cocoapods] Update podspec to version 1.9.74. 2016-05-17 11:01:09 -07:00
Scott Goodson
d26b489529 [Examples] Move several simpler, single-purpose examples to extras to ensure Travis does not time out. 2016-05-17 10:52:43 -07:00
appleguy
a5d1e04b3c Merge pull request #1672 from rcancro/traitCrash 
[ASAvailability.h] Add kCFCoreFoundationVersionNumber_iOS_9_0 define
 2016-05-16 20:23:02 -07:00
Hannah Troisi
97f95e6799 Fix category name collision (Travis error). 2016-05-16 17:35:41 -07:00
ricky
14bbfe6f38 [ASAvailability.h] Add kCFCoreFoundationVersionNumber_iOS_9_0 define 
My implementation of AS_AT_LEAST_IOS9 broke when 8.4.1 was released.

I ran the iOS 9.0 simulator to find the proper `kCFCoreFoundationVersionNumber` value for iOS9, added this as `kCFCoreFoundationVersionNumber_iOS_9_0` and updated the `AS_AT_LEAST_IOS9` macro
 2016-05-16 17:05:17 -07:00
appleguy
a330f0e480 Merge pull request #1670 from garrettmoon/undoRevertOfTraitCollection 
Revert "ASViewController.m -> ASViewController.mm upstream"
 2016-05-16 17:00:45 -07:00
Garrett Moon
8d4959bd76 Revert "ASViewController.m -> ASViewController.mm upstream" 
This reverts commit b34e8d78de20ea11b2b07a24df3b12d2936d1a5e.

In attempting to rebase my visibility patch, I overwrote all of Ricky's
changes to ASViewController. This puts them back in.
 2016-05-16 15:03:15 -07:00
Erekle
d9e1e7cc0a example 2016-05-17 01:26:40 +04:00
Erekle
7872d85ab0 tap proxy 2016-05-17 00:01:14 +04:00
Erekle
e1544f0f59 minor fixes. ensure size in layoutSpecThatFits: 2016-05-16 11:33:46 +04:00
Hannah Troisi
37d4c5e475 Fixing a bug in both debug tools (image scaling, tappable area) in which I don't check that the overlay exists before creating it. 2016-05-15 23:28:39 -07:00
Hannah Troisi
a18ffc64ab [AsyncDisplayKit+Debug.h] Moving hitTestDebug tool code out of ASControlNode and into debug file 
- unifying ASControlNode, ASImageNode debugging categories into debug file to simplify base classes
 2016-05-15 23:18:46 -07:00
Hannah Troisi
ae29cd2721 Merge remote-tracking branch 'facebook/master' 2016-05-15 20:58:16 -07:00
Erekle
f30bf32a47 minor fixis 2016-05-14 17:01:06 +04:00
Erekle
e30584d215 ASDefaultPlaybackButton 2016-05-14 16:41:32 +04:00
Erekle
b3360a5daf Merge remote-tracking branch 'facebook/master' into ASVideoPlayerNode 2016-05-14 12:26:01 +04:00
appleguy
4cfe3f750a Merge pull request #1661 from maicki/MatchSubarrayContextsNodesCreation 
[ASDataController] Match creation of subarrays for nodes and contexts in ASDataController
 2016-05-13 23:47:41 -07:00
appleguy
50bdaa2442 Merge pull request #1658 from henish/ascollectionview_mutation_during_enumeration 
[Sample] Resolve mutation during enumeration issue
 2016-05-13 16:21:46 -07:00
Max Gu
9eb9336351 Merge remote-tracking branch 'upstream/master' 2016-05-13 14:42:04 -07:00
Michael Schneider
eee2262262 Match creation of subarrays for nodes and contexts in ASDataController 2016-05-13 22:51:40 +02:00
Henish Shah
41a53887d7 [Sample] Resolve mutation during enumeration issue 
- Mutating a dictionary using -enumerateKeysAndObjectsUsingBlock:
  can have unintended consequences.
- Using a copy of the keys to iterate over the values inside the
  dictionary instead.
 2016-05-13 16:14:19 -04:00
appleguy
60b71a604c Merge pull request #1660 from maicki/FixWrongConstrainedSize 
Fix passing wrong constrained size to nodes
 2016-05-13 13:06:29 -07:00
Michael Schneider
33b76bbce0 Use calloc’d array for subarray of contexts 2016-05-13 21:38:25 +02:00
Michael Schneider
7d902d98c9 Fix passing wrong constrained size to nodes 
In _layoutNodesFromContexts:ofKind:completion: we pass the full array of contexts to _layoutNodes:fromContexts:atIndexesOfRange:ofKind: but for nodes we pass a subarray of nodes instead based on the batchCount. As batchRange we always start from 0 to batchCount. We now use the same indexes that we use to create the subarray of nodes to get a subarray of contexts that we pass to _layoutNodes:fromContexts:atIndexesOfRange:ofKind:.
 2016-05-13 21:06:16 +02:00
Henish Shah
8e38e225c8 [Sample] Resolve mutation during enumeration issue 
- Mutating a dictionary using -enumerateKeysAndObjectsUsingBlock:
  can have unintended consequences.
- Using a copy of the keys to iterate over the values inside the
  dictionary instead.
 2016-05-13 11:51:01 -04:00
Erekle
3e45f41710 ASVideoNode property proxy 2016-05-13 18:43:24 +04:00
appleguy
0bef0d09e7 Merge pull request #1653 from garrettmoon/visibility 
[ASViewController] Add visibility depth management
 2016-05-12 22:42:27 -07:00
Max Gu
c8a759e3f4 Merge remote-tracking branch 'upstream/master' 2016-05-12 16:03:36 -07:00
Max Gu
88efa56097 Revert "Adding scrollViewWillBeginDragging and scrollViewDidEndDragging callbac to ASCellNode instances" 
This reverts commit 1fba62da0eff538794c17fc20f9d64c96944b071.
 2016-05-12 16:02:38 -07:00
Max Gu
5805bdb239 Merge 2016-05-12 15:53:09 -07:00
Erekle
658d376d7b ASVideoNode public methods proxy 2016-05-13 02:14:12 +04:00
appleguy
38b07612d9 Merge pull request #1655 from rcancro/lockFix 
[ASEnvironment] Remove unneeded locking on environmentState
 2016-05-12 15:09:29 -07:00