overtake/TelegramSwift/master • 5d09171 • 1 files, +3/-2
Merge branch 'master' of github.com:overtake/TelegramSwift

#macos

overtake/TelegramSwift/master • 0faef53 • 1 files, +4/-1
Update app icon.

overtake/TelegramSwift/master • e4c413a • 1 files, +17/-7
Update INSTALL.md

- better code block
- added description of the commands (2, 3, 4)
- add command to install brew
- edited the first line in second paragraph
- added hyper link for Xcode

overtake/TelegramSwift/master • bcefab9 • 2 files, +21/-8
Merge pull request #866 from zweeltow/master

Update build guide and app icon.

#macos

overtake/TelegramSwift/master • 67e4cf8 • 1 files, +7/-0
Merge pull request #900 from walkline/audio-renderer-deadlock

Fix deadlock in MediaPlayer.

#macos

overtake/TelegramSwift/master • 5c35498 • 300 files, +43774/-11180
Merge branch 'appstore'

overtake/TelegramSwift/master • d2a936e • 2 files, +21/-8
Merge branch 'master' of github.com:overtake/TelegramSwift

# Conflicts:
# Telegram-Mac/MediaPlayerAudioRenderer.swift

#macos

overtake/TelegramSwift/master • 2130ab2 • 8 files, +386/-50
code syntax

overtake/TelegramSwift/master • c8ad8a4 • 3 files, +2/-7
code syntax

overtake/TelegramSwift/master • 30606c7 • 3 files, +3/-3
code syntax

overtake/TelegramSwift/master • 556c115 • 1 files, +2/-0
code syntax

overtake/TelegramSwift/master • b1a1c75 • 7 files, +10/-4
code syntax

overtake/TelegramSwift/master • 9a62e77 • 16 files, +137/-100
code syntax

overtake/TelegramSwift/master • 737e253 • 2 files, +2/-2
code syntax

overtake/TelegramSwift/master • 7e6c5d1 • 12 files, +33/-21
code syntax

overtake/TelegramSwift/master • 4d4aa52 • 4 files, +3/-6
code syntax

overtake/TelegramSwift/master • 7e427f1 • 3 files, +6/-3
code syntax

overtake/TelegramSwift/master • 56a71a7 • 11 files, +33/-22
code syntax

overtake/TelegramSwift/master • ba95f83 • 4 files, +12/-12
code syntax

overtake/TelegramSwift/master • 066f736 • 8 files, +41/-23
code syntax

overtake/TelegramSwift/master • 17f554a • 3 files, +3/-3
code syntax

overtake/TelegramSwift/master • 44eb82e • 4 files, +5/-4
code syntax

overtake/TelegramSwift/master • aa7140f • 2 files, +6/-0
code syntax

#macos

overtake/TelegramSwift/master • 1f56e37 • 3 files, +38/-35
code syntax

overtake/TelegramSwift/master • 907b246 • 3 files, +3/-3
code syntax

overtake/TelegramSwift/master • 4c58b43 • 300 files, +47786/-8657
Merge branch 'release'

#macos

overtake/TelegramSwift/master • 079a14c • 19 files, +299/-127
bugfixes

overtake/TelegramSwift/master • 99776b8 • 11 files, +603/-75
bugfixes

overtake/TelegramSwift/master • 3fb3b6e • 11 files, +63/-15
bugfixes

overtake/TelegramSwift/master • 436724c • 16 files, +162/-48
bugfixes

overtake/TelegramSwift/master • 3c00866 • 10 files, +329/-72
bugfixes

overtake/TelegramSwift/master • 7aca16b • 4 files, +7/-7
bugfixes

overtake/TelegramSwift/master • ee02858 • 11 files, +167/-46
bugfixes

overtake/TelegramSwift/master • 78b35af • 4 files, +13/-6
bugfixes

overtake/TelegramSwift/master • 4740b7e • 5 files, +18/-13
bugfixes

overtake/TelegramSwift/master • efaca79 • 8 files, +29/-6
bugfixes

overtake/TelegramSwift/master • 35e3afa • 3 files, +4/-3
bugfixes

overtake/TelegramSwift/master • bc4f102 • 5 files, +14/-6
bugfixes

overtake/TelegramSwift/master • 9611780 • 1 files, +2/-2
bugfixes

overtake/TelegramSwift/master • 1d72c31 • 8 files, +24/-6
bugfixes

overtake/TelegramSwift/master • 6a3d5ad • 1 files, +4/-0
bugfixes

overtake/TelegramSwift/master • cf426b1 • 3 files, +3/-3
bugfixes

#macos

overtake/TelegramSwift/master • 96c605f • 1 files, +0/-4
bugfixes

overtake/TelegramSwift/master • 41a3369 • 8 files, +5/-13
bugfixes

#macos

overtake/TelegramSwift/master • f542a52 • 1 files, +1/-1
bugfixes

#macos

overtake/TelegramSwift/master • 583c0f2 • 1 files, +1/-1
Merge branch 'master' of github.com:overtake/TelegramSwift

overtake/TelegramSwift/master • a09ea6e • 1 files, +1/-1
fix submodule

#macos

overtake/TelegramSwift/master • d0ab7fa • 300 files, +18224/-2410
Merge branch 'release'

#macos

overtake/TelegramSwift/master • 5039253 • 1 files, +1/-1
update submodule

overtake/TelegramSwift/master • 04b90f9 • 1 files, +7/-3
Update INSTALL.md

#macos

overtake/TelegramSwift/master • 5d7409f • 13 files, +128/-45
bug fixes

overtake/TelegramSwift/master • 2b48381 • 11 files, +103/-48
bug fixes

overtake/TelegramSwift/master • cf54bfd • 35 files, +116/-45
bug fixes

overtake/TelegramSwift/master • f06e41c • 3 files, +11/-2
bug fixes

overtake/TelegramSwift/master • fdb6276 • 15 files, +94/-22
bug fixes

overtake/TelegramSwift/master • 420839d • 10 files, +103/-29
bug fixes

overtake/TelegramSwift/master • d068b57 • 6 files, +46/-10
bug fixes

overtake/TelegramSwift/master • 1bd9326 • 3 files, +4/-5
bug fixes

overtake/TelegramSwift/master • 63653b4 • 198 files, +8200/-990
Merge branch 'beta' into appstore

# Conflicts:
# Telegram.xcodeproj/project.pbxproj

overtake/TelegramSwift/master • 5d00fea • 5 files, +128/-133
chatbot fixes

overtake/TelegramSwift/master • 8d9b258 • 3 files, +3/-3
chatbot fixes

overtake/TelegramSwift/master • 583dd0e • 3 files, +3/-3
bug fixes

overtake/TelegramSwift/master • 6468238 • 22 files, +336/-105
bug fixes

overtake/TelegramSwift/master • 54c56c4 • 1 files, +1/-1
update submodule

overtake/TelegramSwift/master • d539fc8 • 201 files, +8535/-1099
Merge branch 'beta'

#macos

overtake/TelegramSwift/master • b4ae933 • 1 files, +7/-3
Merge branch 'master' of github.com:overtake/TelegramSwift

#macos

overtake/TelegramSwift/master • 1d7e611 • 8 files, +26/-19
- bugfixes

overtake/TelegramSwift/master • 14825a2 • 5 files, +48/-15
- bugfixes

overtake/TelegramSwift/master • 22330db • 26 files, +187/-83
- bugfixes

overtake/TelegramSwift/master • b7229d0 • 3 files, +6/-3
- bugfixes

overtake/TelegramSwift/master • c173abe • 5 files, +9/-6
- bugfixes

overtake/TelegramSwift/master • 90d6dfc • 7 files, +11/-8
- bugfixes

overtake/TelegramSwift/master • 2848d9c • 4 files, +4/-4
- bugfixes

overtake/TelegramSwift/master • e7b2233 • 5 files, +6/-5
- bugfixes

overtake/TelegramSwift/master • c550b2c • 9 files, +690/-145
- bugfixes

overtake/TelegramSwift/master • 248623b • 4 files, +12/-6
- bugfixes

overtake/TelegramSwift/master • c08a9bb • 1 files, +4/-4
- bugfixes

overtake/TelegramSwift/master • 32a454c • 3 files, +3/-3
- bugfixes

overtake/TelegramSwift/master • 513d4f2 • 19 files, +84/-46
- bugfixes

overtake/TelegramSwift/master • 3a1ce35 • 23 files, +99/-55
- bugfixes

overtake/TelegramSwift/master • 539b85f • 300 files, +26386/-6699
Merge branch 'beta'

#macos

overtake/TelegramSwift/master • d96cbd4 • 300 files, +64185/-455510
Merge branch 'release'

#macos

overtake/TelegramSwift/release • b8177c8 • 5 files, +8/-8
update scheme

#macos

overtake/TelegramSwift/master • d1ba3fd • 0 files, +0/-0
Merge branch 'release' of github.com:overtake/TelegramSwift; branch 'release' of gitlab.com:overtake/telegrammacos into release

# Conflicts:
# Telegram-Mac/ApplicationContext.swift
# Telegram-Mac/Info.plist
# Telegram-Mac/PeerMediaGiftsController.swift
# Telegram.xcodeproj/project.pbxproj
# TelegramShare/Info.plist
# submodules/telegram-ios

overtake/TelegramSwift/master • a31de12 • 300 files, +22707/-4014
Merge branch 'release'

#macos

overtake/TelegramSwift/appstore • 2f9cab9 • 91 files, +2684/-426
bug fixes

overtake/TelegramSwift/appstore • eed6fcc • 106 files, +3471/-658
- 11.15

overtake/TelegramSwift/appstore • f089f23 • 11 files, +74/-35
- 11.15

overtake/TelegramSwift/appstore • e6deaec • 6 files, +20/-11
- 11.15

overtake/TelegramSwift/appstore • e96b110 • 108 files, +3531/-670
Merge branch 'beta' into appstore

# Conflicts:
# Telegram.xcodeproj/project.pbxproj

#macos

overtake/TelegramSwift/release • 02f59ac • 3 files, +3/-1
- localization

overtake/TelegramSwift/release • 7de5cb5 • 8 files, +17/-12
- 11.15

overtake/TelegramSwift/release • c748c0e • 6 files, +29/-27
- 11.15 and bug fixes

overtake/TelegramSwift/release • 86d9135 • 4 files, +21/-5
- 11.15 and bug fixes

overtake/TelegramSwift/release • 9b9db63 • 3 files, +3/-3
- 11.15 and bug fixes

overtake/TelegramSwift/release • eb98691 • 9 files, +152/-22
- 11.15 and bug fixes

overtake/TelegramSwift/release • 7fca8e1 • 3 files, +4/-4
- 11.15 and bug fixes

overtake/TelegramSwift/release • 86722f9 • 6 files, +14/-8
- 11.15 and bug fixes

overtake/TelegramSwift/release • 50654b7 • 6 files, +10/-7
- 11.15 and bug fixes

#macos