Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: overtake/TelegramSwift
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: XcodeBuildTime/TelegramSwift
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 11 commits
  • 255 files changed
  • 4 contributors

Commits on Nov 7, 2017

  1. Merge pull request #22 from stek29/pip-all-spaces 

    Make PIP show on all desktop/fullscreen apps
    @overtake
    overtake authored Nov 7, 2017
    Configuration menu
    Copy the full SHA
    fb5afb3 View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2017

  1. Merge commit 'fb5afb361c2b365d8f1fd2cf72b2873f04a0e0a1' into design-i… 

    …mprovements

* commit 'fb5afb361c2b365d8f1fd2cf72b2873f04a0e0a1':
  Show a half-visible fourth row of reply markup buttons, if there are more than three rows. Refactor constants in reply markup layout
  Make PIP show on all desktop/fullscreen apps
    @overtake
    overtake committed Nov 8, 2017
    Configuration menu
    Copy the full SHA
    b4d48c3 View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2017

  1. no message

    @overtake
    overtake committed Nov 13, 2017
    Configuration menu
    Copy the full SHA
    2a216dd View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2017

  1. no message

    @overtake
    overtake committed Nov 22, 2017
    Configuration menu
    Copy the full SHA
    108e81e View commit details
    Browse the repository at this point in the history

Commits on Nov 28, 2017

  1. no message

    @overtake
    overtake committed Nov 28, 2017
    Configuration menu
    Copy the full SHA
    8968ca9 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'design-improvements' 

    * design-improvements:
  no message
  no message
  no message
  no message
  no message
  no message
  no message
  no message
  no message
  Show a half-visible fourth row of reply markup buttons, if there are more than three rows. Refactor constants in reply markup layout
  Make PIP show on all desktop/fullscreen apps
  no message

# Conflicts:
#	Telegram-Mac.xcworkspace/xcuserdata/mikhailfilimonov.xcuserdatad/UserInterfaceState.xcuserstate
#	Telegram-Mac.xcworkspace/xcuserdata/mikhailfilimonov.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
#	Telegram-Mac/Info.plist
#	TelegramShare/Info.plist
    @overtake
    overtake committed Nov 28, 2017
    Configuration menu
    Copy the full SHA
    22ce3b3 View commit details
    Browse the repository at this point in the history

Commits on Dec 23, 2017

  1. 3.7 and bubbles

    @overtake
    overtake committed Dec 23, 2017
    Configuration menu
    Copy the full SHA
    2e30c58 View commit details
    Browse the repository at this point in the history

Commits on Dec 28, 2017

  1. Implement scroll for InstantView using space/shift space key combinat… 

    …ions
    @iSevenDays
    iSevenDays committed Dec 28, 2017
    Configuration menu
    Copy the full SHA
    8ba3825 View commit details
    Browse the repository at this point in the history

Commits on Dec 29, 2017

  1. Merge pull request #64 from iSevenDays/master 

    Implement scroll for InstantView using space/shift space key combinations
    @overtake
    overtake authored Dec 29, 2017
    Configuration menu
    Copy the full SHA
    e04d88a View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2018

  1. added config.swift with api id & hash

    Anatoliy committed Feb 18, 2018
    Configuration menu
    Copy the full SHA
    6a47e8d View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2018

  1. fixed "Overlapping accesses to 'item'" error

    AnatoliyPodkladov committed Apr 22, 2018
    Configuration menu
    Copy the full SHA
    df1976f View commit details
    Browse the repository at this point in the history
Loading