ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-01 04:08:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
782 Commits 3 Branches 294 Tags
Commit Graph

732 Commits

Author SHA1 Message Date
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
Peter
f4758d0b0d no message 2018-06-08 15:13:14 +03:00
Peter
a78c348248 no message 2018-06-08 00:12:20 +03:00
overtake
853a7d3ca7 Merge branch 'quickfix-01-06' of https://github.com/peter-iakovlev/TelegramCoreDev into quickfix-01-06 2018-06-05 20:09:09 +03:00
overtake
2b1d560c66 no message 2018-06-05 20:09:03 +03:00
Peter
a9cfcc79d8 no message 2018-06-05 20:08:19 +03:00
overtake
d4f6fbdca8 Merge branch 'quickfix-01-06' of https://github.com/peter-iakovlev/TelegramCoreDev into quickfix-01-06 2018-06-05 13:33:14 +03:00
overtake
bf5d4b2466 Merge branch 'feature/secureid' into quickfix-01-06 
# Conflicts:
#	TelegramCore/RequestChatContextResults.swift
 2018-06-05 13:31:58 +03:00
Peter
0acc1c2c89 no message 2018-06-05 13:31:08 +03:00
Peter
94cf46514d no message 2018-06-05 02:08:06 +03:00
Peter
849299fdcf no message 2018-06-03 00:09:59 +03:00
Peter
4c87427ade no message 2018-06-02 03:13:42 +03:00
Peter
30e00abb5c no message 2018-06-01 20:28:51 +03:00
Peter
5aff913b59 Merge branch 'quickfix-25-05' into quickfix-01-06 
# Conflicts:
#	TelegramCore.xcodeproj/project.pbxproj
#	TelegramCore/Api3.swift
#	TelegramCore/TermsOfService.swift
 2018-06-01 12:42:15 +03:00
overtake
dd188e35ac Merge branch 'feature/secureid' of https://github.com/peter-iakovlev/TelegramCoreDev into feature/secureid 2018-05-31 16:34:05 +03:00
Peter
8a6bfd44ea no message 2018-05-31 16:22:57 +03:00
overtake
aac307bfbf no message 2018-05-30 15:49:38 +03:00
Peter
c265e81118 no message 2018-05-25 11:31:59 +02:00
Peter
075d965857 no message 2018-05-22 20:37:24 +02:00
Peter
ec6c3b451d no message 2018-05-20 23:10:26 +02:00
Peter
1bd781669c no message 2018-05-17 20:58:04 +01:00
Peter
b436bb2641 no message 2018-05-11 21:36:59 +03:00
Peter
b2fab70dca Merge commit '842b15dd9e4faf1dd08bb9f4e7b7ce4d27ce25b2' into feature/secureid 2018-05-06 14:39:02 +03:00
Peter
9274e38643 no message 2018-05-06 14:38:57 +03:00
Mikhail Filimonov
842b15dd9e - secure id some fixes 2018-05-04 17:50:27 +04:00