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
Ilya Laktyushin
0e4a540192 Merge branch 'master' of github.com:peter-iakovlev/TelegramUI 
# Conflicts:
#	TelegramUI.xcodeproj/project.pbxproj
#	TelegramUI/ChatController.swift
#	TelegramUI/UserInfoController.swift
 2018-09-05 01:32:25 +03:00
Ilya Laktyushin
4c42a4c1c4 Merge branch 'master' of github.com:peter-iakovlev/TelegramCoreDev 2018-09-05 01:31:45 +03:00
Ilya Laktyushin
5786eb3bcd no message 2018-09-05 01:27:48 +03:00
Ilya Laktyushin
66de87a550 Merge commit '25cb418eb3e1bef98f90d5c77c42de1d3f27d0e2' 
# Conflicts:
#	TelegramUI/ChannelInfoController.swift
#	TelegramUI/SettingsController.swift
 2018-09-05 01:04:07 +03:00
Ilya Laktyushin
96e457ef28 no message 2018-09-05 00:59:04 +03:00
overtake
54eb8f744e no message 2018-09-04 22:54:49 +01:00
Peter
8a030c1579 no message 2018-09-05 00:53:07 +03:00
Ilya Laktyushin
1b16f14b77 Merge branch 'master' of bitbucket.org:iakovlevpeterp/legacycomponents 2018-09-05 00:51:57 +03:00
Ilya Laktyushin
4ede226d2f no message 2018-09-05 00:51:22 +03:00
Ilya Laktyushin
188e6f9e6b Merge branch 'master' of github.com:peter-iakovlev/TelegramCoreDev 2018-09-05 00:49:22 +03:00
Ilya Laktyushin
e6d646db71 no message 2018-09-05 00:49:02 +03:00
overtake
1d592e9348 Merge branch 'master' of github.com:peter-iakovlev/Display 2018-09-04 22:38:23 +01:00
overtake
7f1f2d08e6 no message 2018-09-04 22:37:57 +01:00
Peter
a5b6e48579 Merge commit 'aed91241e54eac239bcfe799960ef80995c772ab' 
# Conflicts:
#	TelegramUI/ChatController.swift
 2018-09-05 00:35:04 +03:00
Peter
8a9134fd66 no message 2018-09-05 00:31:25 +03:00
Peter
d41418ffe3 no message 2018-09-05 00:30:59 +03:00
Peter
6863422e3b no message 2018-09-05 00:29:52 +03:00
Peter
8143387989 no message 2018-09-05 00:29:01 +03:00
Peter
cc0a72de54 no message 2018-09-05 00:28:44 +03:00
Peter
5ea58cc662 no message 2018-09-05 00:28:29 +03:00
Peter
407d571348 no message 2018-09-05 00:21:25 +03:00
Peter
c014c5507a no message 2018-09-05 00:21:05 +03:00
Peter
1913e16c6d no message 2018-09-05 00:20:47 +03:00
Peter
928b9f4567 no message 2018-09-05 00:19:53 +03:00
overtake
aed91241e5 no message 2018-09-04 18:36:23 +01:00
overtake
6dd610e518 Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCore 2018-09-03 19:18:44 +03:00
Peter
886b3bbe2b Merge commit 'b18b86bb34fd8593277c7e4a615d118f01e5fbe9' 
# Conflicts:
#	TelegramUI/ChatMessageStickerItemNode.swift
 2018-09-03 01:16:19 +03:00
Peter
8115e36384 no message 2018-09-03 01:15:58 +03:00
Peter
d7b5f5c3cc Merge commit '0efbccc78cc68c963f9dfa8c19428dc20d0a5ab2' 2018-09-03 01:09:22 +03:00
Peter
d13958a831 no message 2018-09-03 01:08:35 +03:00
Peter
d4dbe03c48 Merge commit '64bac8278ba178d1d617e6e2b2ccb323472ab725' 2018-09-03 01:07:33 +03:00
overtake
64bac8278b no message 2018-09-03 01:06:04 +03:00
overtake
b18b86bb34 no message 2018-09-03 01:05:41 +03:00
overtake
0efbccc78c no message 2018-09-03 01:05:19 +03:00
Peter
afd3410331 no message 2018-09-03 00:50:33 +03:00
overtake
a00bb22da1 no message 2018-09-03 00:36:56 +03:00
overtake
e561a48eb3 no message 2018-09-02 19:15:27 +03:00
overtake
307a1257d6 no message 2018-09-02 19:14:56 +03:00
overtake
4d6272ce2f no message 2018-09-02 19:14:41 +03:00
Grishka
6053cf5dce added --enable-audio-callback to configure 2018-09-02 15:43:49 +03:00
Ilya Laktyushin
4ec048feac no message 2018-09-02 11:55:04 +03:00
overtake
25cb418eb3 tos and scroll to date first message 2018-09-01 22:28:37 +03:00
Grishka
64f14585e7 2.2.4 
- Added tests (using xcode)
- Added a define to enable callback-based audio I/O instead of using actual audio devices
- Fixed a crash on Windows when there's no access to the microphone
- Misc fixes
 2018-09-01 01:59:09 +03:00
overtake
fb786425ba some fixes 2018-09-01 00:07:02 +03:00
Max Wang
eba4e290a5 Allow to add interface state delegate in background. (#1090) 
* fix SIMULATE_WEB_RESPONSE not imported #449

* Fix to make rangeMode update in right time

* remove uncessary assert

* Allow to add interface state delegate in background threads.

* Allow to add interface state delegate in background threads.

* lock around _interfaceStateDelegates

* lock _interfaceStateDelegates to local variable

* Fix comments

* remove extra spaces
 2018-08-31 13:16:55 -07:00
overtake
dea3802122 secret chat consumable items fix 2018-08-31 20:26:19 +03:00
overtake
a81db7f96c - channel admin bug fixes 2018-08-31 20:25:37 +03:00
Garrett Moon
1fe241df91 #trivial Shouldn't hold the lock while adding subnodes (#1091) 
* Shouldn't hold the lock while adding subnodes

* Add comments, good call @nguyenhuy
 2018-08-30 22:04:40 -07:00
J.T. Burgess
b556b2f775 Fix a couple typos. (#1092) 2018-08-30 22:04:23 -07:00
Ilya Laktyushin
8fe41f324c Merge branch 'master' of github.com:peter-iakovlev/TelegramUI 
# Conflicts:
#	TelegramUI/ChatController.swift
#	TelegramUI/WebEmbedVideoContent.swift
 2018-08-31 04:40:42 +03:00