development/github-desktop
development/github-desktop
1
0
Fork 0
mirror of https://github.com/desktop/desktop synced 2024-09-18 07:32:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
28814 commits 301 branches 696 tags 363 MiB
Commit graph

28814 commits

This branch
This branch
All branches
Author SHA1 Message Date
tidy-dev 4ea4bf9860
Merge pull request #11434 from desktop/add-branch-context-menu 
Add branch context menu
 2021-02-02 12:47:36 -05:00
tidy-dev e3dbc641ee Clean up 2021-02-02 11:50:18 -05:00
tidy-dev 719fbfa154 Remote frowned about syntax 2021-02-02 11:48:20 -05:00
tidy-dev baaa2b21cc
Update app/src/lib/stores/app-store.ts 
Co-authored-by: Sergio Padrino <sergio.padrino@gmail.com>
 2021-02-02 11:32:07 -05:00
Sergio Padrino e9b1931b19 Bump desktop-trampoline dep to v0.9.1 
It basically prevents forwarding the DESKTOP_PORT env variable, since it's not necessary.
 2021-02-02 16:37:27 +01:00
tidy-dev 8d4085430d Merge branch 'development' into vs-code-as-suggested-browser 2021-02-02 09:37:50 -05:00
tidy-dev f3d2dcbac5 Handle unlikely case 2021-02-02 08:19:21 -05:00
Sergio Padrino 636fbb0739 Make sure the trampoline server is unref'ed 2021-02-02 13:37:02 +01:00
tidy-dev febc1a70b5 Should === 2; error when not 2021-02-02 07:30:41 -05:00
tidy-dev 4d84985a50 Adjustments for development changes 2021-02-02 07:24:10 -05:00
tidy-dev d1922da7d3 Merge branch 'development' into add-branch-context-menu 2021-02-02 06:52:35 -05:00
Sergio Padrino 0e3874dce9 Enable the new trampoline for beta (and dev) builds 2021-02-02 12:11:16 +01:00
Sergio Padrino de0cc510e4 Remove log with the trampoline server port 2021-02-02 12:11:16 +01:00
Sergio Padrino 0d1c07433e Update the dependencies so a real desktop/desktop-trampoline is used 2021-02-02 12:11:16 +01:00
Sergio Padrino 69ddfb54d0 Improve error handling for the trampoline server 2021-02-02 12:10:57 +01:00
Sergio Padrino 2f96fc871f MOAR comments and MOAR cleanup 2021-02-02 12:10:57 +01:00
Sergio Padrino 17746ff74a Use an enum for command identifiers + cleanup! 2021-02-02 12:10:57 +01:00
Sergio Padrino c2e30a4490 Add some comments to the trampoline server 2021-02-02 12:10:57 +01:00
Sergio Padrino e833f9c525 Refactor and move things a bit 2021-02-02 12:10:57 +01:00
Sergio Padrino 744c25a5a0 Improve error handling in trampoline server 2021-02-02 12:10:57 +01:00
Sergio Padrino d0d95c1b3c (WIP) Cleanup and other changes to trampoline server 2021-02-02 12:10:57 +01:00
Sergio Padrino d8dcb45248 Simplify trampoline command parsing: pick identifier from env 2021-02-02 12:10:57 +01:00
Sergio Padrino 2151b42920 Implement the askpass handler properly 2021-02-02 12:10:57 +01:00
Sergio Padrino 13dba5a50f Start using "trampoline tokens" to improve security 2021-02-02 12:10:57 +01:00
Sergio Padrino b7513ee52e Improve trampoline command parsing 2021-02-02 12:10:15 +01:00
Sergio Padrino d9f92e9bfa Initial attempt to build a trampoline TCP server 2021-02-02 12:10:15 +01:00
Sergio Padrino 976c905f4e
Merge pull request #11463 from sergiou87/branch-ff-improvements-2 2021-02-02 03:09:32 -08:00
Sergio Padrino 1e69f4a678 Resolve conflicts 2021-02-02 11:46:39 +01:00
Sergio Padrino d49812a643 Improve variable name ❤️ 
Co-Authored-By: tidy-dev <75402236+tidy-dev@users.noreply.github.com>
 2021-02-02 11:39:52 +01:00
Sergio Padrino e64efd10a4 Address feedback review 
Co-Authored-By: Markus Olsson <634063+niik@users.noreply.github.com>
 2021-02-02 11:39:52 +01:00
Sergio Padrino 240990c130 Use shiny new flag to prevent writing to FETCH_HEAD 2021-02-02 11:39:52 +01:00
Sergio Padrino 15072bab82 Pass refs to git fetch using --stdin 🎉 2021-02-02 11:39:52 +01:00
Sergio Padrino 6cf11040fb More cleanup from review feedback 😌 2021-02-02 11:39:52 +01:00
Sergio Padrino c36cfa0d82 Return early if there are no branches 2021-02-02 11:39:52 +01:00
Sergio Padrino 23ba1812dd Improve naming IBranchBasicInfo -> ITrackingBranch 2021-02-02 11:39:52 +01:00
Sergio Padrino 9afbf3f8e4 Add comment to explain GIT_REFLOG_ACTION 2021-02-02 11:39:52 +01:00
Sergio Padrino a4ee57330a Fast-forward branches before refreshing the repo to keep UI up-to-date 
Co-Authored-By: Markus Olsson <634063+niik@users.noreply.github.com>
 2021-02-02 11:39:52 +01:00
Sergio Padrino 6b181d5a17 Simplify branch fast-forwarding to avoid using full Branch objects 2021-02-02 11:39:52 +01:00
Sergio Padrino 62aafc057d Fix parsing the commit SHAs 2021-02-02 11:39:52 +01:00
Sergio Padrino f996a4a82c Add new function to fast-forward branches quickly 2021-02-02 11:39:52 +01:00
Sergio Padrino ffaacb13c3
Merge pull request #11511 from desktop/about-modal-logo-mac 2021-02-02 01:50:38 -08:00
Billy Griffin 19b3ddd977
Merge pull request #11508 from desktop/releases/2.6.3-beta2 
Release 2.6.3-beta2
 2021-02-01 16:17:00 -07:00
tidy-dev 34230a2ea4 Woops.. left console log in there 2021-02-01 15:50:26 -05:00
tidy-dev 44dbcb6c7e About modal - provide a different logo for Mac vs Windows 2021-02-01 15:34:56 -05:00
Amanda Pinsker 29ff849344 Update logo-64x64@2x.png 2021-02-01 11:28:01 -08:00
tidy-dev ddf0254bac
Merge pull request #11483 from desktop/refactor_delete_branch_methods 
Refactor delete branch methods
 2021-02-01 13:06:42 -05:00
tidy-dev ae42cd6a66
Merge pull request #11490 from desktop/add-ref-to-branch 
Add ref to branch
 2021-02-01 12:51:46 -05:00
tidy-dev 04681206c9 Prettier... 2021-02-01 12:48:29 -05:00
tidy-dev bac40df99c Better Naming; typo fix; more concise code 2021-02-01 12:39:17 -05:00
tidy-dev 0139dfe9d5 Update to change log missing quotation 2021-02-01 12:32:12 -05:00