ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2026-02-01 08:45:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,012 Commits 3 Branches 309 Tags
e8d94de9ce4bb10fca1ccbf17f562f361e2bea35
Commit Graph

25012 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ilya Laktyushin
2ace780b67 Merge branch 'master' of bitbucket.org:iakovlevpeterp/legacycomponents 2018-09-25 12:54:58 +01:00
Ilya Laktyushin
edce41c4b8 no message 2018-09-25 12:54:54 +01:00
Ilya Laktyushin
4c028908e1 Merge branch 'master' of github.com:peter-iakovlev/TelegramUI 2018-09-25 12:29:58 +01:00
Ilya Laktyushin
92d95510c7 no message 2018-09-25 12:29:53 +01:00
Ilya Laktyushin
be6f4b6a86 no message 2018-09-25 12:28:51 +01:00
Ilya Laktyushin
664def281f Merge branch 'master' of github.com:peter-iakovlev/TelegramCoreDev 2018-09-25 12:28:45 +01:00
Peter
1f29ac5f27 Merge commit 'cb30aa60a85dd2083fa5203491a94690013f7fbf' 
# Conflicts:
#	TelegramUI/PresenceStrings.swift
 2018-09-25 01:38:02 +01:00
Peter
97fc5d83e1 no message 2018-09-25 01:36:44 +01:00
Peter
ab8ce7dcf6 Merge commit 'ead9a21e57377eececd55edbfdf3a4f8768be78c' 2018-09-25 01:36:18 +01:00
Peter
d7ff3e80fa no message 2018-09-25 01:36:14 +01:00
Peter
b5d1421842 no message 2018-09-25 01:35:25 +01:00
Peter
ebc1068939 no message 2018-09-25 01:35:07 +01:00
Peter
e56e4c2aee no message 2018-09-25 01:34:42 +01:00
Ilya Laktyushin
f3c966308f no message 2018-09-24 17:22:43 +01:00
Ilya Laktyushin
cc3934f637 no message 2018-09-24 17:20:33 +01:00
Ilya Laktyushin
a61a29f6f6 no message 2018-09-24 17:18:34 +01:00
Ilya Laktyushin
ead9a21e57 no message 2018-09-23 14:47:19 +01:00
Ilya Laktyushin
cb30aa60a8 Merge branch 'master' of github.com:peter-iakovlev/TelegramUI 2018-09-23 14:46:54 +01:00
Ilya Laktyushin
53ec081c05 no message 2018-09-23 14:46:45 +01:00
Peter
c55d7615a3 Merge commit '91a7d1271a59ec1e59f1379309c25da9ce87d9c9' 2018-09-23 00:18:38 +01:00
Peter
8afe773e02 no message 2018-09-23 00:18:33 +01:00
Peter
103d1719dc Merge commit '5b75d7bf0eb8d40ab029209c4739c7901274bbf8' 2018-09-23 00:18:10 +01:00
Peter
5a5c721bcf no message 2018-09-23 00:18:05 +01:00
overtake
91a7d1271a no message 2018-09-21 18:25:03 +01:00
overtake
5b75d7bf0e no message 2018-09-21 18:24:08 +01:00
Ilya Laktyushin
26a8b5e72f Merge branch 'master' of github.com:peter-iakovlev/TelegramUI 2018-09-21 09:07:45 +01:00
Ilya Laktyushin
f7963c166c no message 2018-09-21 09:04:02 +01:00
Ilya Laktyushin
11dbfac6dd no message 2018-09-21 09:03:20 +01:00
Huy Nguyen
5dd5611c2c Add missing comma in ASExperimentalFeatures #trivial (#1137) 2018-09-20 15:46:39 -07:00
Peter
4e7b02568e Merge commit 'f82e4c1c7cb2aeea71aff222ec247eae880960b6' 2018-09-20 22:32:09 +01:00
Peter
f45ddf449d no message 2018-09-20 22:32:04 +01:00
Ilya Laktyushin
f82e4c1c7c Merge branch 'master' of github.com:peter-iakovlev/TelegramUI 2018-09-20 21:29:50 +01:00
Peter
0163e793b9 no message 2018-09-20 21:26:59 +01:00
Peter
30037f8360 no message 2018-09-20 21:26:45 +01:00
Peter
ded0bc895f no message 2018-09-20 21:26:29 +01:00
Ilya Laktyushin
8f258abf28 no message 2018-09-20 21:26:13 +01:00
Peter
92b501ae13 no message 2018-09-20 21:26:09 +01:00
Michael Schneider
4708522bd0 Add ASExperimentalSkipClearData #trivial (#1136) 
* Add ASExperimentalSkipClearData

* Move the experiment check within the if clause
 2018-09-20 09:22:18 -07:00
Eric Jensen
696f344301 Fix compilation warnings #trivial (#1132) 
* Apply recommended warnings

* Squelch designated initializer warning in ASViewController

* Remove unused compiler flag

clang: warning: argument unused during compilation: '-fno-objc-arc-exceptions' [-Wunused-command-line-argument]

* Fix warning about overriding an instance variable within a category

Instance method 'methodOverrides' in category from _ASDisplayView.o overrides method from class in ASDisplayNode.o
 2018-09-20 07:54:10 -07:00
Peter
454267e7be Merge commit '0b842574bbc317690767c7ff249e12ca09156df9' 2018-09-20 00:12:29 +01:00
Peter
7c9b33e112 no message 2018-09-20 00:12:02 +01:00
Peter
2487877be3 no message 2018-09-20 00:11:33 +01:00
Peter
86d8e59ad8 Merge commit 'c6a489edf8b50a3b7aa015e2a6a090d7d4a918fb' 2018-09-20 00:11:15 +01:00
ernestmama
71ef0fc3ed Fix downloader method name mismatch #trivial (#1134) 2018-09-19 13:07:06 -07:00
Adlai Holler
ceed2d2008 Remove reliance on shared_ptr for ASDisplayNodeLayouts (#1131) 
* Remove reliance on shared_ptr for ASDisplayNodeLayouts

* Fix up

* Fix in yoga

* Back to let

* Returns inner pointer

* Trivial change to kick the CI
 2018-09-19 11:23:19 -07:00
Michael Schneider
cd608c9b18 Remove necessity to use view to access rangeController in ASTableNode, ASCollectionNode (#1103) 2018-09-19 07:51:46 -07:00
subhransu mohanty
e341c2cf57 lottie: make animation class constructor private. 
we can't use make_unique to create the animation object anymore because the constructor is private.
so used unique_ptr constructor instead.

Change-Id: I23b68c68d1b960085800365662ebb1cc676731cc
 2018-09-19 11:29:26 +09:00
Peter
f990f3f8bc no message 2018-09-19 01:07:09 +01:00
Peter
d6ec7ef839 no message 2018-09-19 01:06:49 +01:00
overtake
c6a489edf8 Merge branch 'master' of github.com:peter-iakovlev/TelegramUI 2018-09-18 22:34:52 +01:00