ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-08-08 08:31:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
325 Commits 3 Branches 269 Tags
Commit Graph

313 Commits

Author SHA1 Message Date
Peter
b04ddea9c5 no message 2018-09-07 22:55:14 +03:00
Ilya Laktyushin
ac56816f4c Merge branch 'master' of github.com:peter-iakovlev/TelegramUI 2018-09-07 22:36:43 +03:00
Ilya Laktyushin
e35508a06c no message 2018-09-07 22:36:29 +03:00
overtake
97352aec85 no message 2018-09-07 19:58:25 +01:00
overtake
da6c1781b6 no message 2018-09-07 19:49:49 +01:00
Peter
1bde567623 no message 2018-09-07 14:26:46 +03:00
Peter
ba7ec36e0c Merge commit '2e5d6896a0adfc801eddd734ccb31fcfde77cc14' 
# Conflicts:
#	TelegramUI/UserInfoController.swift
 2018-09-07 01:33:23 +03:00
Ilya Laktyushin
2e5d6896a0 Merge branch 'master' of github.com:peter-iakovlev/TelegramUI 2018-09-07 01:09:13 +03:00
Peter
b15ce8cc3b Merge commit 'b83248d844d7d3fc178843f1f9cdc607004a5c68' 2018-09-07 01:07:52 +03:00
Peter
290105e637 Merge commit '7e6cff6a16edf3b6a12b4625d7cbb734da7be559' 2018-09-07 01:07:32 +03:00
Peter
bf38d1a77f no message 2018-09-07 01:07:09 +03:00
Ilya Laktyushin
c6682b1bd9 no message 2018-09-07 01:04:54 +03:00
overtake
b83248d844 no message 2018-09-06 22:58:58 +01: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
6b55ba645f no message 2018-09-06 22:22:31 +01: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
overtake
7e6cff6a16 no message 2018-09-06 00:43:45 +01:00
overtake
664a4d2d3c Merge branch 'master' of github.com:peter-iakovlev/TelegramUI 2018-09-05 18:34:40 +01:00
overtake
025ef8094d no message 2018-09-05 18:31:59 +01: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
bb69ec2997 Merge branch 'master' of github.com:peter-iakovlev/TelegramUI 2018-09-05 13:24:06 +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
overtake
54eb8f744e no message 2018-09-04 22:54:49 +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
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
overtake
b18b86bb34 no message 2018-09-03 01:05:41 +03:00
overtake
4d6272ce2f no message 2018-09-02 19:14:41 +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
fb786425ba some fixes 2018-09-01 00:07:02 +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 Iakovlev
a5e2b4fac4 Merge branch 'feature/secureid' into develop 2018-04-12 16:32:07 +04:00
Peter
e93d7791a7 no message 2018-04-11 23:43:31 +04:00