ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2026-01-21 03:29:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,022 Commits 3 Branches 309 Tags
18fd644c15008d044ef94de3c2eea388bd3f1913
Commit Graph

13022 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adlai Holler
03648d12a8 Clarify ASCellNode docs that it is for use with collection view as well 2015-09-17 12:30:31 -07:00
Adlai Holler
309ecca444 In ASLayoutOptions, make initWithLayoutable: take a nullable argument 2015-09-17 11:42:38 -07:00
Adlai Holler
717df1cfd2 Merge latest master and update Layout headers 2015-09-17 11:39:59 -07:00
Adlai Holler
cde790124d Merge branch 'master' into update-objc 2015-09-17 11:27:27 -07:00
Peter
12408852a5 no message 2015-09-17 19:19:38 +03:00
appleguy
f8e43ea07a Merge pull request #660 from nguyenhuy/ASViewController 
Add ASViewController
 2015-09-17 15:16:54 +02:00
Huy Nguyen
a864341710 Remove nonnull and nuulable annotations in ASViewController. Travis don't recognize them (yet). 2015-09-17 16:07:43 +03:00
Huy Nguyen
1ef1b647c9 Remove unnecessary import in ScreenNode.m 2015-09-17 15:59:38 +03:00
Huy Nguyen
8ebc3bdf67 Fix Multiplex sample does not load image: screenNode must be started before its -fetchData method is called. 2015-09-17 15:59:38 +03:00
Huy Nguyen
fcd76dbd19 Use nonnull annotation, instead of sanity check, for node property in ASViewController. 2015-09-17 15:59:37 +03:00
Huy Nguyen
72d108cd98 Minor fixes in ASViewController and Multiplex sample. 2015-09-17 15:58:21 +03:00
Huy Nguyen
07c0d78c71 Add ASViewController and update Multiplex sample to use it. 2015-09-17 15:58:21 +03:00
Peter
008ad99279 no message 2015-09-17 15:01:12 +03:00
appleguy
21bdbbe12f Merge pull request #665 from jflinter/jack-build-phase-cleanup 
Clean up Cocoa Touch framework target
 2015-09-17 10:15:21 +02:00
appleguy
43b03e74bd Merge pull request #663 from rcancro/functionName 
Changed copyIntoOptions to copyFromOptions
 2015-09-17 10:12:22 +02:00
appleguy
f74eb4e800 Merge pull request #662 from adly-holler/indentation-settings 
Update project indentation settings
 2015-09-17 10:11:40 +02:00
appleguy
6282b8607b Merge pull request #661 from nguyenhuy/DisableFailingTableViewTest 
Disable an unstable test in ASTableViewTests.
 2015-09-17 10:10:03 +02:00
Jack Flintermann
b84c371211 fix breaking test imports 2015-09-16 23:39:19 -04:00
Jack Flintermann
5c4a506af4 fix .DS_Store in gitignore 2015-09-16 23:33:56 -04:00
Jack Flintermann
ce33149548 make additional private headers actually private; import all public headers in AsyncDisplayKit.h 2015-09-16 23:31:48 -04:00
Jack Flintermann
ff1be72e04 add module.modulemap 2015-09-16 20:15:48 -04:00
Jack Flintermann
2c7ac3bf0c add UICollectionView+ASConvenience.h 2015-09-16 20:09:03 -04:00
Jack Flintermann
d95f0ea1bd synchronize target build phases 2015-09-16 20:05:10 -04:00
Adlai Holler
6bcd245c6d Bump the .travis.yml OS X image requirement for Xcode 7 2015-09-16 17:03:33 -07:00
Jack Flintermann
b217f7c28a remove .ms from header build phases 2015-09-16 19:52:31 -04:00
Jack Flintermann
1b25cdd1eb clean up compile sources phase 2015-09-16 19:45:00 -04:00
Adlai Holler
e4dc823c0d hitTest:withEvent: return value should be nullable 2015-09-16 16:21:07 -07:00
Adlai Holler
a7240bac27 More objective-C cleanup 2015-09-16 15:41:56 -07:00
Adlai Holler
30ed0bd64a Restore old ASCollectionNode init 2015-09-16 15:39:06 -07:00
Adlai Holler
04690c0a4c Re-add nil tests 2015-09-16 15:36:52 -07:00
Adlai Holler
262d65eea9 More updates 2015-09-16 15:34:24 -07:00
Adlai Holler
814f72535c Add nullability annotations for public API 2015-09-16 15:21:35 -07:00
rcancro
7e3a0b3223 Changed copyIntoOptions to copyFromOptions 
I thought I already did this. I think copyFrom is a better name.
 2015-09-16 14:33:54 -07:00
Adlai Holler
b1dfaa1eff Update project indentation settings 2015-09-16 14:17:52 -07:00
Andreas Linde
6eda4257c1 Update build number 2015-09-16 22:36:00 +02:00
Andreas Linde
b1518cb218 Merge branch 'release/3.8.1' 2015-09-16 22:35:26 +02:00
Andreas Linde
a94ce3d327 Merge tag '3.8.1' into develop 
Version 3.8.1
 2015-09-16 22:35:26 +02:00
Andreas Linde
359f67acdd 3.8.1 release and documentation updates 2015-09-16 22:35:17 +02:00
Andreas Linde
56e6932d6d Update PLCR build using Xcode 7 (7AA220) 2015-09-16 22:12:13 +02:00
Huy Nguyen
dfbaa35706 Disable an unstable test in ASTableViewTests. 2015-09-16 23:04:18 +03:00
appleguy
f275d858ae Merge pull request #632 from paulyoung/compiler-warnings 
Add missing imports to address compiler warnings.
 2015-09-16 21:48:33 +02:00
Paul Young
77d74e60f0 Update header imports. 2015-09-16 12:17:01 -07:00
Paul Young
77dfd222d3 Merge branch 'master' into compiler-warnings 2015-09-16 12:13:50 -07:00
Paul Young
8426ab1122 Use a shared header for the static library and dynamic framework. 2015-09-16 12:12:21 -07:00
Andreas Linde
e584eb8281 Update build number 2015-09-16 19:01:01 +02:00
Andreas Linde
f7eeecbab1 Merge branch 'release/3.8' 2015-09-16 19:00:09 +02:00
Andreas Linde
26abf594c5 Merge tag '3.8' into develop 
Version 3.8
 2015-09-16 19:00:09 +02:00
Andreas Linde
2a894c801c 3.8 release and documentation updates 2015-09-16 18:59:59 +02:00
Dasmer Singh
d326c66a72 Merge remote-tracking branch 'upstream/master' 2015-09-16 10:19:26 -04:00
appleguy
b557075371 Merge pull request #655 from nguyenhuy/relayout_editing_mode 
Relayout table view cell nodes if there is a mismatch between content view size and the node's constrained size
 2015-09-16 15:20:48 +02:00