ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-06-16 05:55:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
367 Commits 2 Branches 260 Tags
Commit Graph

131 Commits

Author SHA1 Message Date
Peter
86d8e59ad8 Merge commit 'c6a489edf8b50a3b7aa015e2a6a090d7d4a918fb' 2018-09-20 00:11:15 +01:00
Ilya Laktyushin
8407cd1c5f no message 2018-09-17 20:38:17 +01:00
Peter
6a039d5f43 Merge commit '7ec24554d4a73ada3c6691b999dfe24e7637b503' 2018-09-14 17:03:23 +03:00
Peter
144450d295 no message 2018-09-12 18:46:11 +03:00
overtake
da6c1781b6 no message 2018-09-07 19:49:49 +01:00
Peter
ba7ec36e0c Merge commit '2e5d6896a0adfc801eddd734ccb31fcfde77cc14' 
# Conflicts:
#	TelegramUI/UserInfoController.swift
 2018-09-07 01:33:23 +03:00
Peter
b15ce8cc3b Merge commit 'b83248d844d7d3fc178843f1f9cdc607004a5c68' 2018-09-07 01:07:52 +03:00
Peter
bf38d1a77f no message 2018-09-07 01:07:09 +03:00
Ilya Laktyushin
9fc21e5b5f Merge branch 'master' of github.com:peter-iakovlev/TelegramUI 2018-09-07 00:37:49 +03:00
Ilya Laktyushin
43bbabfcbc no message 2018-09-07 00:35:43 +03:00
overtake
5788e272b7 no message 2018-09-06 22:00:57 +01:00
Ilya Laktyushin
1fc691a800 Merge branch 'master' of github.com:peter-iakovlev/TelegramUI 2018-09-06 12:45:06 +03:00
Ilya Laktyushin
2a432ddcf4 no message 2018-09-05 19:37:37 +03:00
Peter
7a114f229c no message 2018-09-05 19:00:52 +03:00
Ilya Laktyushin
258f992051 no message 2018-09-05 13:05:17 +03:00
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
66de87a550 Merge commit '25cb418eb3e1bef98f90d5c77c42de1d3f27d0e2' 
# Conflicts:
#	TelegramUI/ChannelInfoController.swift
#	TelegramUI/SettingsController.swift
 2018-09-05 01:04:07 +03: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
overtake
aed91241e5 no message 2018-09-04 18:36:23 +01: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
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
overtake
a81db7f96c - channel admin bug fixes 2018-08-31 20:25:37 +03: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
Ilya Laktyushin
5833833664 Merge branch 'master' of github.com:peter-iakovlev/TelegramUI 
# Conflicts:
#	TelegramUI/ChatMessageWebpageBubbleContentNode.swift
#	TelegramUI/InstantPageSettingsNode.swift
 2018-08-31 04:35:21 +03:00
Peter
368a96b291 no message 2018-08-31 04:26:44 +03:00
Ilya Laktyushin
a1b592611d no message 2018-08-31 00:42:24 +03:00
Peter
ab261ecbc7 no message 2018-08-03 23:23:02 +03:00
Peter
07fc80ef3a no message 2018-07-21 21:31:48 +03:00
Peter
01ba13b13b no message 2018-06-29 20:19:01 +03:00
Peter
faefdd54fe no message 2018-06-16 20:03:02 +03:00
Peter Iakovlev
45d9e738a5 no message 2018-04-21 00:20:56 +04:00
Peter
e93d7791a7 no message 2018-04-11 23:43:31 +04:00
Peter Iakovlev
1c6cfdb7f6 no message 2018-03-21 00:56:38 +04:00
Peter
1fa79c3c2d no message 2018-03-12 22:53:22 +04:00
Peter Iakovlev
a878bead42 no message 2018-03-03 11:22:45 +04:00
Peter Iakovlev
b39986a1ee no message 2018-03-02 20:55:22 +04:00
Peter Iakovlev
e54bb8c34a no message 2018-02-24 16:27:31 +04:00
Peter Iakovlev
d36e7e3a6e no message 2018-02-23 20:28:31 +04:00
Peter Iakovlev
252530cd3e no message 2018-02-08 14:25:39 +04:00
Peter Iakovlev
47cd4b0d76 no message 2018-01-31 20:40:55 +04:00
Peter Iakovlev
f8afc46bef no message 2018-01-12 12:48:06 +04:00
Peter
3a998955b7 no message 2018-01-11 22:44:38 +04:00
Peter
6a47e739a3 no message 2018-01-09 13:18:08 +04:00
Peter
0f26dc36a7 no message 2017-10-03 15:57:32 +03:00
Peter
46295401ff no message 2017-09-26 03:01:24 +03:00
Peter
baf29247eb no message 2017-09-05 21:27:04 +03:00
Peter
cbbcb12b3b no message 2017-08-15 14:44:14 +03:00