development/github-desktop
development/github-desktop
1
0
Fork 0
mirror of https://github.com/desktop/desktop synced 2024-08-27 04:00:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
19846 commits 300 branches 689 tags 357 MiB
Commit graph

19846 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brendan Forster a229d899a9
Merge pull request #6630 from desktop/clean-up-no-changes-blankslate-feature-flag 
Clean up no changes blankslate feature flag
 2019-01-18 08:37:48 -04:00
Brendan Forster 3a8adaf934 Merge branch 'development' into clean-up-no-changes-blankslate-feature-flag 2019-01-17 15:37:25 -04:00
Brendan Forster 86bf69fbca
Merge pull request #6651 from desktop/release-branch-for-1-6-0 
1.6.0 release
 2019-01-17 14:28:46 -04:00
William Shepherd 73a12a8db3
Merge pull request #6440 from desktop/use-fs-admin-for-installing-shortcut 
replace runas with fs-admin to handle installing installing CLI
 2019-01-17 12:14:21 -06:00
William Shepherd 8ea35b1e74
Merge pull request #6463 from desktop/warn-when-invalid-row-click 
check for invalid rows and emit a warning into devtools
 2019-01-17 12:13:49 -06:00
William Shepherd 15d0d6eb93
Merge pull request #6481 from Daniel-McCarthy/History&Compare-Lists-Remember-Scroll-Position 
Remember Scroll Positions in History and Changes Lists
 2019-01-17 12:13:32 -06:00
William Shepherd b7584f7fd8
Merge pull request #6518 from desktop/port-integration-tests-to-jest 
port integration tests to jest
 2019-01-17 12:13:07 -06:00
William Shepherd 6f9104292c
Merge pull request #6643 from desktop/menu-state-race-condition 
Menu state race condition
 2019-01-17 12:12:10 -06:00
evelyn masso 1f84edfcfb
Merge pull request #6640 from desktop/use-promises-theyre-pretty-neat 
extract updateLicenseDump and promisify it
 2019-01-17 09:11:44 -08:00
Billy Griffin a2c1bb8f64
When in doubt, ask Billy 
Co-Authored-By: niik <j.markus.olsson@gmail.com>
 2019-01-17 15:31:19 +01:00
Markus Olsson 4c04870bd5 Update changelog.json 2019-01-17 14:55:49 +01:00
Markus Olsson 91469e3b7f Merge branch 'release-branch-for-1-6-0' of https://github.com/desktop/desktop into release-branch-for-1-6-0 2019-01-17 14:49:56 +01:00
Markus Olsson f988446827 Update version number 2019-01-17 14:48:44 +01:00
Brendan Forster 73897adc53
Apply suggestions from code review 
Co-Authored-By: niik <j.markus.olsson@gmail.com>
 2019-01-17 14:47:56 +01:00
Markus Olsson 61c15a2233 Initial changelog for 1.6 2019-01-17 11:15:32 +01:00
Brendan Forster f27e0ca951
Update app/src/main-process/main.ts 
Co-Authored-By: niik <j.markus.olsson@gmail.com>
 2019-01-17 10:47:18 +01:00
Brendan Forster 4fc3a17174 use the newer import syntax 2019-01-16 17:38:36 -04:00
Brendan Forster 024e01dec9
Merge pull request #6626 from desktop/manual-resolutions-state-2 
add manual resolutions to appState
 2019-01-16 14:50:37 -04:00
Brendan Forster d2be1c4d5b
Merge pull request #6516 from desktop/refresh-octicons 
update octicons package to v8.x
 2019-01-16 14:47:31 -04:00
Brendan Forster 933efd9761 jest lets you do this 2019-01-16 13:43:49 -04:00
Brendan Forster d62d1056bc tidy up unnecessary mocha config 2019-01-16 13:18:15 -04:00
Brendan Forster e6b70083d2 update integration tests to emit to specific file 2019-01-16 13:18:15 -04:00
Brendan Forster 60e3927160 rename jest.config.js to jest.unit.config.js to differentiate from integration tests 2019-01-16 13:18:15 -04:00
Brendan Forster 2b4a258167 rewrite integration tests to no longer depend on chai and chai-as-promised 2019-01-16 13:18:15 -04:00
Brendan Forster 02affff4d7 port code over to use typed interfaces 2019-01-16 13:18:15 -04:00
Brendan Forster 3ccae4ea0b bump to spectron v5 to support Electron v3 2019-01-16 13:18:15 -04:00
Brendan Forster ccd9a10ef1 add @types/webdriverio so that we can use spectron's type declarations 2019-01-16 13:18:15 -04:00
Brendan Forster 79052552b4 add a baseline config for integration tests 2019-01-16 13:18:15 -04:00
Brendan Forster 1b93fd4df4
Merge pull request #6517 from desktop/port-script-tests-to-jest 
port script tests from mocha to jest
 2019-01-16 13:17:33 -04:00
Markus Olsson a86f3caa10 Merge branch 'development' into menu-state-race-condition 2019-01-16 17:22:46 +01:00
Markus Olsson 9b02e8c7ec Get rid of mutable closure variable 2019-01-16 17:22:03 +01:00
Brendan Forster 5649486538 only promisify once 2019-01-16 12:16:15 -04:00
evelyn masso 299c307e63
Merge pull request #6641 from desktop/feature-flag-create-pr-action 
Move Create PR action behind beta feature flag
 2019-01-16 07:50:52 -08:00
Brendan Forster 3d005298b9 leverage promise-based API in fs-extra 2019-01-16 10:51:14 -04:00
Brendan Forster 3f2be3ba32 promisify these APIs to simplify control flow 2019-01-16 10:46:42 -04:00
Markus Olsson 4cea478835 Move Create PR action behind beta feature flag 2019-01-16 15:26:09 +01:00
Brendan Forster 0bb73478e5 there is no upset 2019-01-16 09:05:09 -04:00
Brendan Forster aa6606b045 move license overrides closer to module 2019-01-16 09:01:06 -04:00
Brendan Forster 2a858eceec extract updateLicenseDump to separate module and promisify it 2019-01-16 08:50:41 -04:00
Brendan Forster 37ad53baf9
Merge pull request #6634 from desktop/1-6-0-beta3-release-branch 
1.6.0-beta3 release notes
 2019-01-16 08:34:57 -04:00
Brendan Forster b59b51a19e bump version and add changelog 2019-01-15 14:24:28 -04:00
Brendan Forster f3e7fdbbe9
Merge pull request #6631 from desktop/show-overflow 
reshow overflow to fix #6459
 2019-01-15 13:45:55 -04:00
evelyn masso 114f53c49e add manual conflict resolutions to app state 2019-01-15 08:57:39 -08:00
evelyn masso 25e853fa56 reshow overflow to fix #6459 2019-01-15 08:22:07 -08:00
William Shepherd 54bda66895
Merge pull request #6606 from desktop/manual-resolutions-state 
manualConflictResolution and stageManualConflictResolution
 2019-01-15 09:55:39 -06:00
Brendan Forster 9270426af8
Merge pull request #6629 from desktop/pull-action-grammar 
Pull action grammar
 2019-01-15 11:46:37 -04:00
Markus Olsson cb18ac8439 Everything is terrible 2019-01-15 14:30:47 +01:00
Markus Olsson 87d0c764e5 Get rid of the feature flag 2019-01-15 14:24:42 +01:00
Markus Olsson 2ac05bab2d Drop the 'ng' class modifier 2019-01-15 14:24:36 +01:00
Markus Olsson 079a8ee32f Don't need this any more 2019-01-15 14:23:23 +01:00