ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2026-01-26 22:11:27 +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
Peter
fd960fea04 no message 2016-04-18 01:03:38 +03:00
Peter
81a073645c no message 2016-04-18 01:03:23 +03:00
Peter
93b8ccac9d no message 2016-04-18 01:03:09 +03:00
Peter
ecd4831a7f Merge commit 'edfe64f5a2663ed9a0e6234cbd79418ff7d521de' 2016-04-18 01:01:46 +03:00
Peter
6701328c56 no message 2016-04-18 01:01:38 +03:00
Peter
3ea022e8e2 no message 2016-04-18 01:01:14 +03:00
Peter
3a096b43b1 Merge commit '30a0c471ca989dbec4c4a04aefff7f1388b910c7' 
Conflicts:
	AsyncDisplayKit.xcodeproj/project.pbxproj
 2016-04-18 00:59:53 +03:00
Peter
35a3cb9b25 no message 2016-04-18 00:57:41 +03:00
appleguy
30a0c471ca Merge pull request #1528 from ejensen/instancetype 
[Refactoring] Replace id with instancetype in initializers
 2016-04-16 20:53:41 -07:00
appleguy
c51907879d Merge pull request #1530 from hannahmbanana/500pxgram 
[ASDKgram example update] Use -fetchData in PhotoCellNode to load Comments & addressed PR comments
 2016-04-16 20:48:32 -07:00
appleguy
d38145a5ab Merge pull request #1540 from maicki/FixProjectPodspecC++Flag 
[Build] Fix podspec vs xcodeproj inconsistency with c++ build flag
 2016-04-16 16:56:07 -07:00
appleguy
954ea7597f Merge pull request #1538 from nguyenhuy/remove_ASDisplayNodeExtraIvars 
[ASDisplayNode][Refactoring] Remove ASDisplayNodeExtraIvars
 2016-04-16 16:54:49 -07:00
appleguy
46fbc6cc7c Merge pull request #1539 from nguyenhuy/remove_ASDisplayNode_async_sizing 
[ASDisplayNode][Refactoring] Remove internal and unused async sizing methods
 2016-04-16 16:53:55 -07:00
Aaron Schubert
5897c1e1b4 [ASMapNode] Remove false assert. This handles #1534 2016-04-16 13:19:07 +01:00
appleguy
fcdc7966cc Merge pull request #1536 from garrettmoon/upstream-renderer-lock 
[ASTextNode] Add locking around NSTextContainer's constrainedSize
 2016-04-15 20:57:32 -07:00
appleguy
254ac7e24c Merge pull request #1527 from maicki/FixTrailingRectDeadlock 
[ASTextNode] Fix deadlock calling trailingRect
 2016-04-15 20:54:11 -07:00
Michael Schneider
9c525179ec Fix podspec vs xcodeproj inconsistency with the c++ build flag 2016-04-15 13:24:08 -07:00
Huy Nguyen
5a677915ba ASDisplayNode should bail early if a scheduled transition was invalidated before its block executes 
- Idea borrowed from _enqueueAsyncSizingWithSentinel
 2016-04-15 22:08:48 +03:00
Huy Nguyen
a35647b200 Remove unused _enqueueAsyncSizingWithSentinel and asyncSizingQueue methods of ASDisplayNode 2016-04-15 22:08:21 +03:00
Huy Nguyen
3dc2ceb0ad Remove ASDisplayNodeExtraIvars 2016-04-15 21:48:11 +03:00
Garrett Moon
dd998b086f I think this needs a lock. 
Summary: Looks like this isn't being locked when it should be.

Reviewers: ricky, levi, scottg, schneider

Reviewed By: scottg, schneider

Subscribers: jenkins

Differential Revision: https://phabricator.pinadmin.com/D84952
 2016-04-15 10:41:31 -07:00
Michael Schneider
c0927f8028 Create helper function to get text range rects without locking 
Add helper function that should be called within performBlockWithLockedTextKitComponents: in
 an already locked state to prevent a deadlock
 2016-04-15 09:57:24 -07:00
Michael Schneider
9fdce828c1 Small improvements for ASLayoutSpec 
- Add nullable for returning children
- Store default child and children as properties
- Use vector for creating final children
 2016-04-15 07:11:24 -07:00
Michael Schneider
a9d0542d8f If trailing rect was set early return 2016-04-15 07:10:22 -07:00
Michael Schneider
91b6995987 Fix deadlock calling trailingRect on a ASTextNode 2016-04-15 07:10:22 -07:00
appleguy
402c5fe25a Merge pull request #1485 from garrettmoon/addAnimatedImage 
[ASImageNode] Add support for animated GIFs, planning for future animated formats as well.
 2016-04-15 00:05:43 -07:00
Hannah Troisi
c981aeb09d [ASMapNode] snapshot can be triggered before layout and cause exception (e.g. setAnnotations) 2016-04-14 23:05:35 -07:00
Hannah Troisi
83a3a835b9 Merge remote-tracking branch 'facebook/master' 2016-04-14 23:04:29 -07:00
Lukas Spieß
11fac24d0e Merge pull request #261 from bitstadium/feature/image-annotation-fixes 
Fix issues when adding arrow annotation
 2016-04-15 02:35:44 +02:00
Lukas Spieß
9feefdfcee Merge pull request #269 from bitstadium/feature/prepareditems-feedbackmanager-delegate 
Add delegate method to FeedbackManager to add items to feedback
 2016-04-15 02:35:00 +02:00
Lukas Spieß
1be53e0971 Add test for feedbackComposeViewController 2016-04-15 00:42:32 +02:00
Lukas Spieß
0230f5945d Update FeedbackManagerTests to use property 2016-04-15 00:42:32 +02:00
Lukas Spieß
580feff6aa Deprecate feedbackComposerPreparedItems in favor of delegate method 2016-04-15 00:42:32 +02:00
Lukas Spieß
c6da440509 Add preparedItemsForFeedbackManager: delegate method 2016-04-15 00:41:57 +02:00
Hannah Troisi
9474ea0432 Merge remote-tracking branch 'facebook/master' into 500pxgram 2016-04-14 13:33:30 -07:00
appleguy
ba01104ed7 Merge pull request #1522 from HeEAaD/core-subspec 
[AsyncDisplayKit Build / Cocoapods] Add Core subspec that excludes PINRemoteImage etc.
 2016-04-14 13:09:22 -07:00
Lukas Spieß
f068d0528e Add linting to TravisCI setup 2016-04-14 16:08:56 +02:00
Lukas Spieß
f20419f187 Fix issues when adding arrow annotation 
When starting to draw the annotation error, sizes and lengths are 0 which results in several structures containing NaN which CoreGraphics does not like very much.
 2016-04-14 14:47:19 +02:00
Lukas Spieß
2309a39442 Add Carthage to Readme 2016-04-14 14:37:59 +02:00
Lukas Spieß
2aa7e6d594 Merge pull request #266 from bitstadium/feature/travis-logging 
Improve Travis CI logs
 2016-04-14 14:34:12 +02:00
Hannah Troisi
4e8d835280 [ASDKgram example update] addressed PR comments 
- overrode the -(void)fetchData method in PhotoCellNode.m to download the photo’s comments. This method gets called with the PhotoCellNode enters ASInterfaceStateFetchData, which is set by the rangeController.
    - UIKIT COMPARISON: I left the comment bulk download (for all photos in a page load) in the PhotoFeedViewController side for UIKit because when implemented in the PhotoTableViewCell, each cell jumped around as it changed size when it came on screen.
- minor appearance updates
    - updated color scheme
    - fixed status bar style to darkBackgroundColor
- cleaned up layoutSpecThatFits: in PhotoCellNode
 2016-04-14 00:52:05 -07:00
Hannah Troisi
90cfc94023 Merge remote-tracking branch 'facebook/master' into 500pxgram 2016-04-13 22:53:22 -07:00
Garrett Moon
cf20ca4ce9 Missed header is iOS framework 2016-04-13 14:43:05 -07:00
Garrett Moon
755c5feaf8 Levi's comments 2016-04-13 14:23:02 -07:00
Garrett Moon
482ba3cbb0 Fix ASAnimatedImage Sample 2016-04-13 14:23:02 -07:00
Garrett Moon
24c26014a7 Fix example builds 2016-04-13 14:23:02 -07:00
Garrett Moon
b56e20853b Prevent retain cycle, clear out animatedImage on _clearImage. 2016-04-13 14:23:02 -07:00
Garrett Moon
59b18efc76 Needs to be named Sample.xcodeproj 2016-04-13 14:23:02 -07:00
Garrett Moon
2e30091236 Didn't mean to change this. 2016-04-13 14:23:02 -07:00
Garrett Moon
e9b57d9da4 Address comments and cleanup 2016-04-13 14:23:02 -07:00