ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-08-28 00:20:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
756 Commits 3 Branches 281 Tags
Commit Graph

197 Commits

Author SHA1 Message Date
Mikhail Filimonov
e91ca3f86b no message 2018-03-28 22:13:42 +04:00
Mikhail Filimonov
e425c69db4 Merge branch 'feature/secureid' of https://github.com/peter-iakovlev/TelegramCoreDev into feature/secureid 2018-03-28 16:01:41 +04:00
Peter Iakovlev
152a139727 no message 2018-03-28 15:01:20 +04:00
Peter Iakovlev
33cc8132be no message 2018-03-27 12:03:39 +04:00
Peter Iakovlev
d67854a097 no message 2018-03-23 03:11:22 +04:00
Peter Iakovlev
bd1ab209ab no message 2018-03-21 00:58:01 +04:00
Mikhail Filimonov
bb0c2da7b7 no message 2018-03-20 17:02:06 +04:00
Peter
96a5ec6ecc no message 2018-03-12 22:53:08 +04:00
Peter
a277b328f8 no message 2018-03-07 15:21:40 +01:00
Peter Iakovlev
3306b36ddb no message 2018-03-01 03:54:11 +04:00
Peter Iakovlev
a4692499c4 no message 2018-02-28 01:19:26 +04:00
Peter Iakovlev
309d0b84ad Merge commit 'cf4f84a1b78e324d59abf25f0965d219b354ca11' into group_calls 
# Conflicts:
#	TelegramCore/Download.swift
#	TelegramCore/MultipartUpload.swift
#	TelegramCore/RecentAccountSessions.swift
 2018-02-07 14:14:09 +04:00
Mikhail Filimonov
cf4f84a1b7 no message 2018-02-07 13:39:41 +04:00
Peter Iakovlev
dfcfa3772c no message 2018-02-01 05:18:26 +04:00
Mikhail Filimonov
82783ba8ba Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCoreDev 2018-01-24 12:17:47 +04:00
Peter Iakovlev
bcfea1396b no message 2018-01-23 22:58:32 +04:00
Mikhail Filimonov
c8fa120b1d Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCoreDev 
# Conflicts:
#	TelegramCore/Api.swift
#	TelegramCore/ExportMessageLink.swift
#	TelegramCore/SearchMessages.swift
#	TelegramCore/SearchPeers.swift
#	TelegramCore/Serialization.swift
 2018-01-19 01:08:38 +04:00
Peter Iakovlev
50c0158683 no message 2018-01-19 00:39:08 +04:00
Peter Iakovlev
d93a30380e no message 2018-01-12 15:32:00 +04:00
Peter
ecec26abd6 no message 2018-01-09 13:14:59 +04:00
Peter
ebe6de5f58 Merge commit '1a852fd26a235a10ef498fd6b8e13d4e8b49fa28' 
# Conflicts:
#	TelegramCore/Authorization.swift
 2018-01-02 14:09:43 +04:00
overtake
5e5fefeb0f no message 2017-12-29 14:22:35 +04:00
overtake
58d76cb2c0 no message 2017-12-23 11:22:49 +04:00
Peter
f43e0ad143 no message 2017-12-21 16:45:01 +04:00
Peter
89310ee56f no message 2017-12-01 15:22:22 +04:00
overtake
6fafcf3e13 Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCore 
* 'master' of https://github.com/peter-iakovlev/TelegramCore:
  no message
 2017-11-16 19:21:06 +04:00
overtake
4f6b69fbde no message 2017-11-16 19:21:00 +04:00
Peter
f5f5f058f8 no message 2017-11-16 18:13:01 +03:00
Peter
d5ec231184 no message 2017-11-14 20:39:11 +03:00
Peter
00c3e87b11 no message 2017-10-10 18:42:50 +03:00
overtake
0671c33ab8 no message 2017-09-19 19:46:19 +03:00
Peter
9645d068bc no message 2017-09-19 15:17:16 +03:00
Peter
98632adefd no message 2017-09-11 00:07:36 +03:00
overtake
f2edf323c8 Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCore 2017-08-29 17:21:11 +03:00
overtake
b3376cb619 no message 2017-08-29 17:21:04 +03:00
Peter
8fd5b0f7cc no message 2017-08-29 17:20:33 +03:00
Peter
d02b75a0c5 no message 2017-08-21 23:28:37 +03:00
Peter
b0d55fdea7 no message 2017-08-15 14:45:34 +03:00
Peter
0d0c3fff9c no message 2017-07-14 15:26:25 +03:00
Peter
085ce892b0 no message 2017-06-27 17:18:08 +03:00
overtake
380f8518b6 no message 2017-06-20 18:03:22 +03:00
Peter
76caa41f75 no message 2017-06-18 01:47:40 +03:00
overtake
16c84c3d2a Merge branch 'devel' of https://github.com/peter-iakovlev/TelegramCore into devel 
Conflicts:
	TelegramCore/ChannelAdmins.swift
	TelegramCore/ChannelBlacklist.swift
	TelegramCore/ChannelMembers.swift
	TelegramCore/ChannelParticipants.swift
 2017-06-13 22:00:49 +03:00
Peter
93fe592eb9 no message 2017-06-13 21:45:17 +03:00
overtake
ef2035cd74 - admins reform 2017-06-09 05:57:18 +03:00
Peter
70d51f5f7a no message 2017-06-06 12:47:22 +03:00
Peter
7fc8503af5 Merge commit 'e328b1b736cf1903535d89a252eba0c3711b2f97' 2017-05-29 16:18:32 +03:00
Peter
6d17725856 no message 2017-05-29 16:18:00 +03:00
overtake
d918b53ab3 Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCore 
Conflicts:
	TelegramCore/EnqueueMessage.swift
	TelegramCore/TelegramMediaAction.swift
 2017-05-26 13:20:06 +03:00
overtake
c7a8f89335 no message 2017-05-26 13:18:57 +03:00