Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Phcoder cherrypicks #238

Merged
merged 46 commits into from
Aug 23, 2016
Merged

Phcoder cherrypicks #238

merged 46 commits into from
Aug 23, 2016

Conversation

maks
Copy link
Collaborator

@maks maks commented Aug 23, 2016

This brings in via a large set of cherry-pick commits, all the great work on new features and bug fixes done by @phcoder in his Forker fork.

Fixes: #231

phcoder and others added 30 commits August 17, 2016 13:47
Bring back having an internal text editor.

This reverts commit 4305862.
cherry-picked from part of 0ec9b74
Cherry-picked with some modifications from:
0ec9b74
Author:    Vladimir Serbinenko <[email protected]>
This creates files without final newline and this is frowned upon.

cherry picked from commit 5feb141
Based on: 96b36f1
by Vladimir Serbinenko <“[email protected]”>

Signed-off-by: Maksim Lin <[email protected]>
Modified with fixes from c5aedc1
and extra changes due to switch for cs to js.

Signed-off-by: Maksim Lin <[email protected]>
Signed-off-by: Vladimir Serbinenko <[email protected]>
(cherry picked from commit d2285f8)
Signed-off-by: Maksim Lin <[email protected]>
It does not add any functionality and just inherits ArrayAdapter.

Signed-off-by: Vladimir Serbinenko <[email protected]>
(cherry picked from commit 067fe76)
Signed-off-by: Maksim Lin <[email protected]>
This will allow it to be more easily extended and reused.

Signed-off-by: Vladimir Serbinenko <[email protected]>
(cherry picked from commit 490f077)
Signed-off-by: Maksim Lin <[email protected]>
(cherry picked from commit cbc676a)

Improved error handling from code in cherry-picked commit.

Signed-off-by: Maksim Lin <[email protected]>
NPE is caused be using up affordance aka back arrow in actionbar but
not when using back button.
Fixes issue from previous commit, where selecting item in ref (aka branch) list
did not maintain a visual indication of the items selection when entering
actionmode and clearing when leaving actionmode.
This makes it more consistent with desktop git.

Signed-off-by: Vladimir Serbinenko <[email protected]>
(cherry picked from commit 9f008e2)
Signed-off-by: Maksim Lin <[email protected]>
Signed-off-by: Vladimir Serbinenko <[email protected]>
(cherry picked from commit 560aa6b)
Signed-off-by: Maksim Lin <[email protected]>
Fixes issue from previous commit, where selecting item in SSH Keys list
did not maintain a visual indication of the items selection when entering
actionmode and clearing when leaving actionmode.
(cherry picked from commit f20b1ca)
Signed-off-by: Maksim Lin <[email protected]>
(cherry picked from commit 9f570fa)
Signed-off-by: Maksim Lin <[email protected]>
(cherry picked from commit 33088b2)
Signed-off-by: Maksim Lin <[email protected]>
(cherry picked from commit 3a7e5d9)
Signed-off-by: Maksim Lin <[email protected]>
(cherry picked from commit 682166e)
Signed-off-by: Maksim Lin <[email protected]>
(cherry picked from commit 18a2d1c)
Signed-off-by: Maksim Lin <[email protected]>
(cherry picked from commit c67293e)
Signed-off-by: Maksim Lin <[email protected]>
(cherry picked from commit 74692bc)
Signed-off-by: Maksim Lin <[email protected]>
(cherry picked from commit 8285122)
Signed-off-by: Maksim Lin <[email protected]>
Scanning all commits is too slow. While ideally it should be done
asynchronously, just restrict to 500 for now

(cherry picked from commit 05110f0)
Signed-off-by: Maksim Lin <[email protected]>
(cherry picked from commit f9e1a20)
Signed-off-by: Maksim Lin <[email protected]>
(cherry picked from commit 3d11df0)
Signed-off-by: Maksim Lin <[email protected]>
Currently it edits only per-repo comitter name but in future can be expanded.

(cherry picked from commit 3e21da1)
Signed-off-by: Maksim Lin <[email protected]>
phcoder and others added 16 commits August 22, 2016 11:19
…TS_TREE

(cherry picked from commit bf2e76b)
Signed-off-by: Maksim Lin <[email protected]>
(cherry picked from commit c1cbbfa)
Signed-off-by: Maksim Lin <[email protected]>
(cherry picked from commit 00faaf2)
Signed-off-by: Maksim Lin <[email protected]>
README clearly specifies license as GPLv3 and it has always been the case.
Add COPYING to reflect this more clearly

(cherry picked from commit b3937fa)
Signed-off-by: Maksim Lin <[email protected]>
(cherry picked from commit 26461fe)

With substantial rework to better implement app-wide theme change and pref
setting.

Signed-off-by: Maksim Lin <[email protected]>
(cherry picked from commit 7f91382)

When viewing a file, now provides a list of commits in a tab alongside
the contents of a file.

Signed-off-by: Maksim Lin <[email protected]>
(cherry picked from commit ea024f5)
Signed-off-by: Maksim Lin <[email protected]>
Signed-off-by: Maksim Lin <[email protected]>
(cherry picked from commit db2af2f)
Signed-off-by: Maksim Lin <[email protected]>
(cherry picked from commit 87aa525)
Signed-off-by: Maksim Lin <[email protected]>
(cherry picked from commit 1710040)
Signed-off-by: Maksim Lin <[email protected]>
(cherry picked from commit 383601e)
Signed-off-by: Maksim Lin <[email protected]>
(cherry picked from commit 0dd22c5)
Signed-off-by: Maksim Lin <[email protected]>
(cherry picked from commit 6373832)
Signed-off-by: Maksim Lin <[email protected]>
Match the mimetypes returned by new code
@maks maks merged commit af04132 into sheimi:master Aug 23, 2016
@maks maks deleted the phcoder-cherrypicks branch August 23, 2016 06:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

pull in all relevant commits from Forker fork
2 participants