ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2026-01-19 18:56:31 +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
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
d9d5b12475 Improve locking situation in ASVideoPlayerNode (#1042) 
* Improve locking in ASVideoPlayerNode

* Address comments
 2018-07-20 15:27:28 -07:00
Rasul Tataev
5fef6a17a6 Changed lost images to existing one. (#981) 
New images taken from http://texturegroup.org/docs/automatic-layout-containers.html.
 2018-07-20 15:19:23 -07:00
Flatout73
4b5b90f7a0 [ASTextNode] One more check variables before calling delegate method #trivial (#922) 2018-07-20 15:15:50 -07:00
Peter
c9d67629f0 Merge commit '39fe84064d0e985769b138a967d40ee304ad00fa' 2018-07-20 21:17:58 +03:00
Peter
32c4cc1b99 no message 2018-07-20 21:17:36 +03:00
overtake
673f5855ed Merge branch 'master' of https://github.com/peter-iakovlev/Signals 2018-07-20 17:57:09 +03:00
Ilya Laktyushin
0fbe8ab3a2 no message 2018-07-20 17:56:41 +03:00
Peter
bb0c514735 no message 2018-07-20 17:55:32 +03:00
overtake
f6965e93d1 Merge branch 'master' of https://github.com/peter-iakovlev/Signals 2018-07-20 17:55:23 +03:00
Peter
26a1164939 Merge branch 'master' into feature/secureid 2018-07-20 14:16:37 +03:00
Peter
1af33ce618 no message 2018-07-20 14:16:30 +03:00
Peter
92d81fb6fd Merge branch 'master' into feature/secureid 2018-07-20 14:08:34 +03:00
Peter
3b5b3c6671 no message 2018-07-20 14:08:24 +03:00
Peter
ca8d705b08 Merge branch 'feature/secureid' 2018-07-20 14:01:54 +03:00
Peter
d5f1cbc959 no message 2018-07-20 14:01:49 +03:00
Peter
07623e0d9d no message 2018-07-20 14:00:13 +03:00
Peter
7e5b5b4616 Merge branch 'master' into feature/secureid 
# Conflicts:
#	TelegramCore/DeleteMessages.swift
 2018-07-20 13:54:09 +03:00
Peter
d47a174cd8 no message 2018-07-20 13:46:18 +03:00
Peter
3c1ea52b82 no message 2018-07-20 13:42:48 +03:00
Peter
27b09f3374 no message 2018-07-20 13:42:12 +03:00
Peter
a3cbfbb553 Merge branch 'master' into feature/secureid 2018-07-20 13:28:48 +03:00
Peter
59fba9d7c6 no message 2018-07-20 13:27:34 +03:00
Peter
cbe8943bc7 no message 2018-07-20 13:09:56 +03:00
Peter
668515bf88 Merge commit '0e23dc8edb43c2129f76190b7a8f8b9a7f111070' 2018-07-20 13:06:48 +03:00
Peter
cc9ae629ec no message 2018-07-20 13:06:38 +03:00
Peter
af6d976d3e no message 2018-07-20 01:50:33 +03:00
Ilya Laktyushin
39fe84064d Merge branch 'master' of bitbucket.org:iakovlevpeterp/legacycomponents 2018-07-20 01:29:43 +03:00
Peter
e8585526ea no message 2018-07-20 00:52:40 +03:00
Peter
c822708d9e Merge commit 'edee78b9afde47561dd8304f55ea3dff264f4102' 2018-07-20 00:51:43 +03:00
Peter
af2af08357 no message 2018-07-20 00:51:30 +03:00
Grishka
100f7ecbd8 Fixed crash 2018-07-19 14:52:55 +03:00
overtake
0e23dc8edb clearing cache fix 2018-07-19 14:13:16 +03:00
Gregory K
73ba39958a Merge pull request #49 from vkryl/public 
More flexibility of tg_voip_jni.cpp
 2018-07-19 12:55:56 +03:00
default
632975bf34 removed .DS_Store & added it to .gitignore 2018-07-18 18:40:08 +03:00
default
2f98701c68 More flexibility of tg_voip_jni.cpp: TGVOIP_NO_GROUP_CALLS, TGVOIP_PACKAGE_PATH, TGVOIP_PEER_TAG_VARIABLE_NAME, TGVOIP_FUNC 2018-07-18 18:24:27 +03:00
Ilya Laktyushin
0e2fdf3d22 no message 2018-07-18 17:26:30 +03:00
Michael Schneider
736e200407 Fix warning for ASLayout method override for the designated initializer of the superclass '-init' not found #trivial (#1036) 
* Fix warning for ASLayout method override for the designated initializer of the superclass '-init' not found

* Move unavailable init into header
 2018-07-18 02:57:35 -07:00
Michael Schneider
b1f6030e86 Create and set delegate for clip corner layers within ASDisplayNode (#1029) 
* Create and use ASDisplayNodeCornerLayerDelegate

* Return kCFNull for actionForLayer:forKey:
 2018-07-18 02:56:37 -07:00
Grishka
7dbad08354 Fix build on Android 2018-07-18 12:34:06 +03:00
Adlai Holler
db0f515812 Revert unreleased layout debug method name change from #1030 #trivial (#1039) 
* Revert unreleased layout debugging method name change from #1030 #trivial

* Eh make less changes
 2018-07-17 21:08:29 -07:00
Ilya Laktyushin
80225450da no message 2018-07-18 06:54:47 +03:00
Adlai Holler
9958aac5de Pin OCMock version to 3.4.1 because 3.4.2 has issues (#1038) 2018-07-17 19:51:05 -07:00
Andrew Yates
cf78dc6d84 Fix & update ASCollectionNode constrained size doc. (#1037) 2018-07-17 19:03:51 -07:00
Grishka
5380aaba0d 2.2 
- Refactored audio I/O to allow sharing a common context between input and output, for those OSes that require this
- Rewritten periodic operation handling to use a "run loop" thingy instead of an ugly loop formerly known as tick thread
- Fixed a bunch of compiler warnings (closes #13)
- Added automake so you no longer need to use the GYP file for standalone builds (closes #43)
 2018-07-17 19:48:21 +03:00
Adlai Holler
cf810acaa3 Fix the bug I introduced in #1030 (#1035) 2018-07-16 20:43:58 -07:00
Ilya Laktyushin
230284c4df no message 2018-07-16 22:14:34 +03:00
Adlai Holler
6ed5ba29f8 Turn off exceptions to reduce binary size (-600KB for arm64) (#1033) 
* Turn off exceptions to reduce binary size

* Changelog
 2018-07-16 09:38:12 -07:00
Adlai Holler
f2912ecb48 Update lock-checking flag logic (#1032) 2018-07-15 19:57:12 -07:00
Adlai Holler
0b9f12716e Remove NSMutableArray for retaining sublayout elements (#1030) 
* Remove NSMutableArray for retaining sublayout elements

* Kick the CI

* Kick the CI again

* Smash that CI button

* Murder the CI
 2018-07-15 18:41:23 -07:00