ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-15 10:53:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,782 Commits 3 Branches 294 Tags
Commit Graph

18 Commits

Author SHA1 Message Date
Peter
a085123ec1 Merge commit '565da7d4935740d12fc204aa061faf093831da1e' 
# Conflicts:
#	AsyncDisplayKit.xcodeproj/project.pbxproj
#	AsyncDisplayKit.xcodeproj/xcshareddata/xcschemes/AsyncDisplayKit.xcscheme
#	Source/ASDisplayNode.mm
#	Source/ASEditableTextNode.h
#	Source/ASImageNode.mm
#	Source/ASMapNode.h
#	Source/ASMapNode.mm
#	Source/Base/ASAssert.m
#	Source/Details/ASPhotosFrameworkImageRequest.h
#	Source/Details/ASPhotosFrameworkImageRequest.m
#	Source/Layout/ASLayoutElement.mm
 2018-10-08 22:42:45 +03:00
appleguy
465abb1ded [License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). (#1077) 
* [License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses)

With permission of the Facebook Open Source team, we are simplifying the Texture
license so that clients can rely on the Apache 2 terms that most of Texture is
already covered by. This means that code originally forked from AsyncDisplayKit
will be re-licensed from "BSD 3-clause + PATENTS v2" to Apache 2 without a
PATENTS file.

After getting confirmation that the updates to these core files look good, we'll
propagate this new license header to all files (in this same PR) and get sign-off
from all parties before landing.

* [License] Update all Texture source files to be pure Apache 2.

* Changelog entry for Apache 2 license update.

* Revert "[License] Update all Texture source files to be pure Apache 2."

This reverts commit ffa0fbbba9717d871dd16c4b07539f2f8208fc2b.

* [License] Update all Texture source files to be pure Apache 2, maintaining copyrights.

* [License] Update CONTRIBUTING, README, Podspec & Dangerfile.
 2018-08-28 07:39:18 -07:00
Peter
26fd19a7c0 Merge branch 'master' of https://github.com/TextureGroup/Texture 
# Conflicts:
#	Source/ASDisplayNode.h
#	Source/ASDisplayNode.mm
#	Source/ASDisplayNodeExtras.h
#	Source/ASImageNode.h
#	Source/Private/ASBatchFetching.h
 2018-07-21 21:13:16 +03:00
Michael Schneider
55abeed743
Introduce let / var macros and some further cleanup (#1012) 
* Introduce let / var and some further cleanup

* Address first comments

* Update changelog

* Move the const before auto
 2018-07-10 09:37:53 -07:00
Adlai Holler
a11506564a
Reduce usage of autorelease pools (#968) 
* Reduce reliance on the autorelease pool

* changelog

* A few more places

* Use it in another place
 2018-06-15 10:15:25 -07:00
Max Wang
9214e3c2ef Renew supplementary node on relayout (#842) 
* fix SIMULATE_WEB_RESPONSE not imported #449

* Fix to make rangeMode update in right time

* Renew supplementary node on relayout.

* Add support for layoutDelegate (ASCollectionLayout).

* revert space

* Update change log

* fix build error

* refactor

* set default size

* return early when can delegate
 2018-06-04 10:29:41 -07:00
Peter
34b6e37b8c Merge commit '131619de96190415aec89987d4493220c6d0305d' 
# Conflicts:
#	Source/ASDisplayNode+Deprecated.h
#	Source/ASDisplayNode.mm
#	Source/ASDisplayNodeExtras.h
#	Source/ASImageNode+AnimatedImage.mm
#	Source/Private/ASSection.h
#	Source/Private/_ASHierarchyChangeSet.mm
 2017-12-25 01:44:19 +04:00
Adlai Holler
4fc753a458
Make it possible to map between sections even if they're empty (#660) 
* Make section mapping work even for empty sections

* Unlock more cases and update changelog

* Fix complexity documentation
 2017-11-03 16:24:48 -07:00
Peter
587d2b2132 Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad' 
# Conflicts:
#	AsyncDisplayKit.xcodeproj/project.pbxproj
#	Source/ASDisplayNode.mm
#	Source/ASMapNode.mm
#	Source/Details/ASDataController.mm
#	Source/Details/ASPINRemoteImageDownloader.h
#	Source/Details/ASPINRemoteImageDownloader.m
 2017-08-04 13:12:06 +03:00
Adlai Holler
d00ed249e5 Introduce ASIntegerMap, improve our changeset handling #trivial (#405) 
* Introduce ASIntegerMap, improve our changeset handling

Rename to ASIntegerMap

License header

* Add unit tests for ASIntegerMap

* Address nit
 2017-07-05 13:29:02 -07:00
Adlai Holler
fcb293e049 Fix issue where supplementary elements don't track section changes (#404) 
* Fix collection view supplementary issue

* Add a fast-path

* Remove the old index path entry unconditionally

* Handle overwriting bug
 2017-07-01 10:55:59 -07:00
Garrett Moon
8013e25524 Update license v2 (#67) 
* Fixed license

* Update all licenses

* Update Dangerfile for new license

* Update already updated licenses

* Closer…

* Closer…

* Closer…

* Closer…

* Closer…

* Closer…

* Closer…

* Closer…

* Closer…

* Closer…

* Closer…
 2017-04-24 16:59:57 -07:00
Peter
7617b9a9f3 Merge commit 'e6ee24debcae89bd0066061b42ad1a6a73da9486' 
# Conflicts:
#	Source/ASDisplayNode.mm
#	Source/ASImageNode.mm
#	Source/Details/ASCollectionViewLayoutController.mm
 2017-03-15 13:31:39 +03:00
Adlai Holler
a0e67a8b15 ASMultidimensionalArrayUtils -> ASTwoDimensionalArrayUtils (#3157) 
* Requery subarray count less in ASMultidimensionalArrayUtils

* Simplify (gut) ASMultidimensionalArrayUtils

* Remove weird change

* Add bounds-checking for graceful failure
 2017-03-10 14:33:30 +00:00
Peter
429faedb45 no message 2017-03-01 18:33:48 +04:00
Adlai Holler
25bc97c5c8 Fix Issues Repopulating Supplementary Elements (#3098) 
* Fix issues repopulating supplementary elements

* Remove unrelated change

* Update comments
 2017-02-27 16:06:06 -08:00
Huy Nguyen
dc23aca30d Fix crashes in ASElementMap and ASMutableElementMap (#3090) 
* Fix crashes in ASElementMap and ASMutableElementMap

* testInitialRangeBounds to have a 10% maximum difference
 2017-02-27 09:07:23 -08:00
Adlai Holler
73ca6ab514 Shuffle & Cleanup Stuff (#3080) 2017-02-26 18:14:13 -08:00