ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2026-01-19 10:46:35 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,022 Commits 3 Branches 309 Tags
18fd644c15008d044ef94de3c2eea388bd3f1913
Commit Graph

13022 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Peter
b1d6217dd7 Merge commit '182ee3fe196f78195070f6f74f3ab6cbe65029e9' 2018-09-07 02:01:21 +03:00
Peter
dc78968b28 no message 2018-09-07 02:01:02 +03:00
overtake
182ee3fe19 Merge branch 'master' of github.com:peter-iakovlev/Display 2018-09-06 23:41:10 +01:00
overtake
f89366d354 no message 2018-09-06 23:40:24 +01:00
Peter
ba7ec36e0c Merge commit '2e5d6896a0adfc801eddd734ccb31fcfde77cc14' 
# Conflicts:
#	TelegramUI/UserInfoController.swift
 2018-09-07 01:33:23 +03:00
Peter
2c8e761589 Merge commit '733bc72be8735b33d3cbfbd6980f378356ad6777' 2018-09-07 01:31:21 +03:00
Peter
b6a5b13f25 no message 2018-09-07 01:30:57 +03:00
Peter
d39e5dc15d Merge commit 'af504a333ec8478ab081a1d92b58cc3a31a39237' 2018-09-07 01:30:39 +03:00
Peter
6f9f6e8e88 no message 2018-09-07 01:30:07 +03:00
Ilya Laktyushin
2e5d6896a0 Merge branch 'master' of github.com:peter-iakovlev/TelegramUI 2018-09-07 01:09:13 +03:00
Peter
3dc3a8d655 Merge commit '92d985097c9a1c87559ccc7aba60f3f337279d10' 2018-09-07 01:09:09 +03:00
Peter
f8ca3438df no message 2018-09-07 01:08:54 +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
92d985097c Merge branch 'master' of github.com:peter-iakovlev/TelegramCore 2018-09-07 01:07:02 +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
733bc72be8 no message 2018-09-07 00:40:30 +03:00
Ilya Laktyushin
af504a333e no message 2018-09-07 00:40:15 +03:00
Ilya Laktyushin
3faf845a71 no message 2018-09-07 00:39:15 +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
6b55ba645f no message 2018-09-06 22:22:31 +01:00
overtake
5788e272b7 no message 2018-09-06 22:00:57 +01:00
overtake
5957b941ba no message 2018-09-06 22:00:42 +01:00
Adlai Holler
56c94a8941 Add a -textureDidInitialize delegate callback (#1100) 2018-09-06 11:08:45 -07:00
Ilya Laktyushin
1fc691a800 Merge branch 'master' of github.com:peter-iakovlev/TelegramUI 2018-09-06 12:45:06 +03:00
Adlai Holler
395fbd1302 Reuse interface state delegates when calling out #trivial (#1099) 
* Reuse interface state delegates when calling out instead of always copying
 2018-09-05 22:52:41 -07:00
Adlai Holler
6b0d57eda4 Explicitly cast to (void *) -> (const void **) to satisfy strict compilers (#1098) 2018-09-05 22:49:08 -07:00
overtake
7e6cff6a16 no message 2018-09-06 00:43:45 +01:00
overtake
a56b570d0f Merge branch 'master' of github.com:peter-iakovlev/TelegramUI 2018-09-05 20:23:12 +01:00
Peter
58ac15c9ce no message 2018-09-05 22:22:03 +03:00
Peter
2a98afa983 no message 2018-09-05 22:09:47 +03:00
overtake
4eff771268 Merge branch 'master' of github.com:peter-iakovlev/Display 
# Conflicts:
#	Display/WindowContent.swift
 2018-09-05 18:39:20 +01:00
overtake
664a4d2d3c Merge branch 'master' of github.com:peter-iakovlev/TelegramUI 2018-09-05 18:34:40 +01:00
overtake
8242714fd4 no message 2018-09-05 18:32:05 +01:00
overtake
025ef8094d no message 2018-09-05 18:31:59 +01:00
Peter
0b3b2caa4e no message 2018-09-05 20:00:58 +03:00
Peter
e69c6925c0 no message 2018-09-05 20:00:19 +03:00
Ilya Laktyushin
2a432ddcf4 no message 2018-09-05 19:37:37 +03:00
Peter
1ea1cc7e26 Merge commit '21122a769ccc3e43ffd23f80b7c8c48247834900' 2018-09-05 19:01:49 +03:00
Peter
e125e4066d no message 2018-09-05 19:01:11 +03:00
Peter
7a114f229c no message 2018-09-05 19:00:52 +03:00
Max Wang
dbcf8babb8 Fix collection editing (#1081) 
* fix SIMULATE_WEB_RESPONSE not imported #449

* Fix to make rangeMode update in right time

* remove uncessary assert

* Fix collection cell editing bug for iOS 9 & 10

* Rename to reordering.

* Adjust _reordering more acuratedly

* Add change log
 2018-09-05 08:08:46 -07:00
Ilya Laktyushin
bb69ec2997 Merge branch 'master' of github.com:peter-iakovlev/TelegramUI 2018-09-05 13:24:06 +03:00
Ilya Laktyushin
66e3980b7d no message 2018-09-05 13:23:44 +03:00
Ilya Laktyushin
869fc25d81 no message 2018-09-05 13:23:24 +03:00
Ilya Laktyushin
258f992051 no message 2018-09-05 13:05:17 +03:00
Peter
cbde93981f no message 2018-09-05 03:03:41 +03:00