ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-11-29 03:21:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
756 Commits 3 Branches 294 Tags
Commit Graph

706 Commits

Author SHA1 Message Date
Peter
81892e714e no message 2018-08-22 15:44:18 +03:00
overtake
de8b1adfb6 Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCoreDev into feature/secureid 2018-08-20 20:19:58 +03:00
Peter
7d32314cba no message 2018-08-20 20:19:10 +03:00
overtake
4b8e908bc0 Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCoreDev into feature/secureid 2018-08-20 20:10:10 +03:00
overtake
10d72feae6 no message 2018-08-20 20:10:01 +03:00
Peter
7e593e715a no message 2018-08-20 17:36:54 +03:00
overtake
e7b4f3c59f Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCoreDev into feature/secureid 2018-08-20 15:42:16 +03:00
Peter
d730e16897 no message 2018-08-17 19:29:07 +03:00
Peter
d2ed3a95af no message 2018-08-17 14:45:03 +03:00
overtake
9ab8b6788a Merge commit '3b4fa7456125b3f35b4d73896dd152dacc30495e' into feature/secureid 
* commit '3b4fa7456125b3f35b4d73896dd152dacc30495e':
  no message
 2018-08-16 23:47:06 +03:00
overtake
cace41b10e no message 2018-08-16 23:46:26 +03:00
Peter
3b4fa74561 no message 2018-08-16 13:31:58 +03:00
Peter
e38551b534 Fixed macOS build 2018-08-14 14:42:02 +03:00
overtake
6b05a0e2cc no message 2018-08-14 13:04:13 +03:00
Peter
01ed96e839 no message 2018-08-14 12:56:40 +03:00
Peter
da464a3286 Current network type detection 
Small changes in Postbox API
 2018-08-07 14:02:38 +03:00
Peter
4a80fec8b0 no message 2018-08-03 23:22:39 +03:00
Peter
152d25f4ff no message 2018-07-21 21:31:04 +03:00
Peter
26a1164939 Merge branch 'master' into feature/secureid 2018-07-20 14:16:37 +03:00
Peter
1af33ce618 no message 2018-07-20 14:16:30 +03:00
Peter
92d81fb6fd Merge branch 'master' into feature/secureid 2018-07-20 14:08:34 +03:00
Peter
3b5b3c6671 no message 2018-07-20 14:08:24 +03:00
Peter
ca8d705b08 Merge branch 'feature/secureid' 2018-07-20 14:01:54 +03:00
Peter
d5f1cbc959 no message 2018-07-20 14:01:49 +03:00
Peter
7e5b5b4616 Merge branch 'master' into feature/secureid 
# Conflicts:
#	TelegramCore/DeleteMessages.swift
 2018-07-20 13:54:09 +03:00
Peter
d47a174cd8 no message 2018-07-20 13:46:18 +03:00
Peter
3c1ea52b82 no message 2018-07-20 13:42:48 +03:00
Peter
27b09f3374 no message 2018-07-20 13:42:12 +03:00
Peter
a3cbfbb553 Merge branch 'master' into feature/secureid 2018-07-20 13:28:48 +03:00
Peter
59fba9d7c6 no message 2018-07-20 13:27:34 +03:00
Peter
cbe8943bc7 no message 2018-07-20 13:09:56 +03:00
Peter
c192cd39e4 Merge commit '3700bb909e458165c34619321b613474f8de37e2' into feature/secureid 2018-06-29 20:17:03 +03:00
Peter
827f23b20d no message 2018-06-29 20:16:58 +03:00
overtake
3700bb909e no message 2018-06-29 13:32:55 +03:00
overtake
3737a01ba0 Merge branch 'feature/secureid' of https://github.com/peter-iakovlev/TelegramCoreDev into feature/secureid 2018-06-20 13:08:51 +03:00
Peter
4190cf8759 no message 2018-06-20 00:06:38 +01:00
overtake
c6a696732d Merge branch 'feature/secureid' of https://github.com/peter-iakovlev/TelegramCoreDev into feature/secureid 2018-06-19 17:54:12 +03:00
Peter
2734a8a2ad no message 2018-06-19 15:53:53 +01:00
overtake
d3549b385a Merge branch 'feature/secureid' of https://github.com/peter-iakovlev/TelegramCoreDev into feature/secureid 2018-06-19 16:29:06 +03:00
Peter
fbe8936d6f no message 2018-06-19 14:12:45 +01:00
overtake
805f019364 Merge branch 'feature/secureid' of https://github.com/peter-iakovlev/TelegramCoreDev into feature/secureid 2018-06-15 23:17:38 +03:00
overtake
4b3f89b467 no message 2018-06-15 23:17:26 +03:00
Peter
760861b8d2 no message 2018-06-15 21:57:40 +03:00
overtake
38f04aff40 Merge commit '42ca134f327a1ca219f5561142075d6c37a78ce2' into feature/secureid 
# Conflicts:
#	TelegramCore/RequestChatContextResults.swift
 2018-06-14 12:51:10 +03:00
Peter
42ca134f32 no message 2018-06-14 12:49:11 +03:00
overtake
071c9e7812 Merge branch 'feature/secureid' of https://github.com/peter-iakovlev/TelegramCoreDev into feature/secureid 
# Conflicts:
#	TelegramCore/RequestChatContextResults.swift
 2018-06-13 16:20:47 +03:00
Peter
f114b5d0ef no message 2018-06-13 15:24:04 +03:00
overtake
2f12575a5f Merge commit '4c2f395ee6ae18e137dc5d072f1374e88290646e' into quickfix-01-06 2018-06-08 19:30:33 +03:00
Peter
4c2f395ee6 no message 2018-06-08 19:28:27 +03:00
overtake
812f43f861 Merge commit 'f4758d0b0dfafa5cfc96ff104e0980222ab80bf9' into quickfix-01-06 2018-06-08 15:14:37 +03:00