ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2026-02-03 09:55:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,847 Commits 3 Branches 309 Tags
fb270badddda290181072f17cff77f4aed5e8b59
Commit Graph

6 Commits

Author SHA1 Message Date
Peter Iakovlev
fb270baddd Merge commit '771c068ad67a2ecde7f0da2bf727e0326d156c54' 
# Conflicts:
#	Source/ASVideoPlayerNode.h
#	Source/Details/ASElementMap.mm
#	Source/Details/_ASCollectionReusableView.mm
#	Source/Details/_ASCollectionViewCell.mm
#	Source/Private/ASMutableElementMap.mm
 2018-11-16 14:41:49 +04:00
Adlai Holler
d0ba092a77 Convert the codebase to Objective-C++ (#1206) 
* Convert the codebase to Objective-C++ throughout. One language is better than two.

* Put it back

* Fix linker

* Point explicitly to updated Weaver to unblock build

* Revert "Point explicitly to updated Weaver to unblock build"

This reverts commit fdc25296e8794d4e6e56c35f5fe6da2be3f71dbc.

* Revert "Fix linker"

This reverts commit 7be25f91519b8497ef42de79f115bcfbdb965c39.

* Add in the frameworks

* no message

* Address spec lint warnings

* Fix tvos build

* Put that back

* Address Michael's review

* Add comment to kick CI
 2018-11-02 12:04:14 -07: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
appleguy
edd2ce98f7 [ASRangeController] Optimize calls into UICollectionViewLayout via union rect technique. (#3102) 
Details in https://github.com/facebook/AsyncDisplayKit/issues/3082
 2017-03-01 21:06:18 -08:00
Peter
d1ab6976b5 Merge commit 'a08d9dc7328bef8cfc1b50b36cc05edb09af25a3' 
# Conflicts:
#	AsyncDisplayKit.xcodeproj/project.pbxproj
#	AsyncDisplayKit/ASPagerFlowLayout.m
#	AsyncDisplayKit/AsyncDisplayKit.modulemap
#	AsyncDisplayKit/Details/ASCollectionDataController.h
#	AsyncDisplayKit/Details/ASCollectionDataController.mm
#	AsyncDisplayKit/Details/ASDataController.mm
#	AsyncDisplayKit/Private/ASDataController+Subclasses.h
#	AsyncDisplayKit/module.modulemap
#	Source/Debug/AsyncDisplayKit+Debug.h
#	Source/Details/ASCollectionElement.mm
#	Source/module.modulemap
 2017-03-01 15:57:40 +04:00
Adlai Holler
73ca6ab514 Shuffle & Cleanup Stuff (#3080) 2017-02-26 18:14:13 -08:00