4386 Commits

Author SHA1 Message Date
Ali
22b04a7ffb [WIP] Chat Import 2021-01-23 22:45:41 +04:00
Ali
8eaf939a92 Merge commit '095a6a45adadf5404d50aa15e2c22133b34fd243' 2021-01-22 21:59:06 +04:00
Ali
04513a7624 [WIP] Chat Import 2021-01-22 21:59:03 +04:00
overtake
095a6a45ad Merge branch 'master' of gitlab.com:peter-iakovlev/telegram-ios 2021-01-22 19:58:22 +03:00
Ali
00cea76464 General fixes 2021-01-22 20:56:19 +04:00
overtake
07242442fc Merge branch 'master' of gitlab.com:peter-iakovlev/telegram-ios 2021-01-22 19:02:10 +03:00
overtake
e0feb1b0a4 fix muted 2021-01-22 19:02:02 +03:00
Ali
6e545763df Chat import fixes 2021-01-22 18:55:50 +04:00
Ali
e169107a9e Display placeholder screen while loading data 2021-01-22 18:00:33 +04:00
Ali
2c7c8155ab Merge commit '9a2253d7fd36f396b9d16b23a7727e06e59e49f0' 2021-01-22 17:40:52 +04:00
Ali
38af188ce2 [WIP] Chat Import 2021-01-22 17:22:50 +04:00
Ilya Laktyushin
9a2253d7fd Add "Add Members" suggestion panel 2021-01-22 16:14:21 +03:00
Ilya Laktyushin
0c093d48ff Merge branch 'master' of gitlab.com:peter-iakovlev/telegram-ios 2021-01-22 15:55:15 +03:00
Ilya Laktyushin
c7e1d3762f Invite Links Improvements 2021-01-22 15:54:06 +03:00
Ilya Laktyushin
cba5b9b5e1 Update API [skip ci] 2021-01-22 15:52:41 +03:00
Ali
428766c75b [WIP] Chat Import 2021-01-22 01:34:37 +04:00
Ali
b3740d69b3 Fix build 2021-01-21 20:25:51 +04:00
Ali
6ea5baa2a5 Fix build 2021-01-21 20:16:50 +04:00
Ali
f8bf225170 Merge commit 'aed14676171da506a0429e92b7eb9c4ebe2f62b0' 2021-01-21 20:06:19 +04:00
Ali
85402a67cb [WIP] Chat Import 2021-01-21 20:04:13 +04:00
Ilya Laktyushin
aed1467617 Update API 2021-01-21 17:06:12 +03:00
Ilya Laktyushin
74eeea3002 Merge branch 'master' of gitlab.com:peter-iakovlev/telegram-ios 2021-01-21 16:38:07 +03:00
Ilya Laktyushin
d6777d68eb Invite Links Improvements 2021-01-21 16:28:51 +03:00
overtake
5840b0828e Merge branch 'master' of gitlab.com:peter-iakovlev/telegram-ios 2021-01-21 13:48:44 +03:00
overtake
597b8d6358 fake support 2021-01-21 13:48:18 +03:00
Ali
fe491b6831 [WIP] Chat Import 2021-01-21 00:23:07 +04:00
Ali
da2faa5967 [WIP] Chat import 2021-01-20 22:25:20 +04:00
Ali
347cc10a6e Merge commit '2266e38d691b345f49ae3c2cf9cc669c808b31d6' 2021-01-20 00:27:52 +04:00
Ali
8a02b588d8 Initial history import support 2021-01-20 00:10:53 +04:00
overtake
2266e38d69 -return method for macos 2021-01-19 19:52:21 +03:00
overtake
d66a80670a Merge branch 'master' of gitlab.com:peter-iakovlev/telegram-ios 2021-01-19 18:16:03 +03:00
Ilya Laktyushin
ebb613fb9d Invite Links Fixes 2021-01-19 17:35:46 +03:00
overtake
56ebab264e Merge branch 'master' of gitlab.com:peter-iakovlev/telegram-ios
# Conflicts:
#	submodules/TelegramCore/Sources/InvitationLinks.swift
2021-01-19 16:03:02 +03:00
Ilya Laktyushin
56d6357364 Invite Links Fixes 2021-01-19 14:04:44 +03:00
Ilya Laktyushin
e795712279 Invite Links Fixes 2021-01-19 14:01:28 +03:00
Ilya Laktyushin
176eaa451f Invite Links Fixes 2021-01-19 12:45:47 +03:00
overtake
3eec8d9ab8 - struct init visibility 2021-01-19 11:42:12 +03:00
Ilya Laktyushin
935f931034 Invite Links Fixes 2021-01-19 10:52:48 +03:00
Ilya Laktyushin
426e8724dc Invite Links Fixes 2021-01-18 23:06:49 +03:00
overtake
c7292fa83f Merge branches 'master' and 'master' of gitlab.com:peter-iakovlev/telegram-ios 2021-01-18 18:58:49 +03:00
overtake
be617b770c - small fix 2021-01-18 18:58:39 +03:00
Ilya Laktyushin
a59f9e1969 Invite Links Fixes 2021-01-18 11:38:07 +03:00
Ilya Laktyushin
ebe05a1e8a Invite Links Improvements 2021-01-18 11:18:12 +03:00
overtake
f3821d11bf Merge branch 'master' of gitlab.com:peter-iakovlev/telegram-ios 2021-01-17 12:00:01 +03:00
overtake
3fee517ffa no message 2021-01-17 11:59:52 +03:00
Ilya Laktyushin
d5a25602ce Merge branch 'master' of gitlab.com:peter-iakovlev/telegram-ios 2021-01-17 10:21:02 +03:00
Ilya Laktyushin
fa125d0192 Various Improvements 2021-01-17 10:18:10 +03:00
Ali
820a243108 Merge commit 'a616805a514290bf8dfa6e4a7a9140fdea9a7cf0' 2021-01-16 00:39:13 +04:00
Ali
fa3be5d99b Merge commit '4b34a6643f212dab03affe205b8636ae8a6c687e'
Update widget
2021-01-15 22:40:32 +04:00
overtake
a616805a51 - export invitations bug fixes 2021-01-15 16:38:57 +03:00