development/github-desktop
development/github-desktop
1
0
Fork 0
mirror of https://github.com/desktop/desktop synced 2024-10-31 11:07:25 +00:00
Code Issues Projects Releases Packages Wiki Activity
35189 commits 304 branches 713 tags 371 MiB
Commit graph

279 commits

Author SHA1 Message Date
Sergio Padrino
7bab0bf436
Merge pull request #11142 from dennisameling/electron-11 2021-02-11 04:15:15 -08:00
Sergio Padrino
3147ef5306 Bump dugite to v1.97.0 2021-02-04 10:21:56 +01: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
Sergio Padrino
0d1c07433e Update the dependencies so a real desktop/desktop-trampoline is used 2021-02-02 12:11:16 +01:00
Sergio Padrino
d0d95c1b3c (WIP) Cleanup and other changes to trampoline server 2021-02-02 12:10:57 +01:00
tidy-dev
c631d92c63 Update dugite 2021-01-27 11:33:38 -05:00
Markus Olsson
0b8fb3d276 Bump dugite to 1.95.0 2021-01-15 11:49:19 +01:00
Markus Olsson
598678b767 Bump dugite 2021-01-14 13:32:42 +01:00
Markus Olsson
1ada8b6dd3 Merge branch 'development' into pr/11142 2021-01-12 15:14:09 +01:00
Dennis Ameling
75e6ed9e91 Update keytar for Windows, temp disable integration tests 2020-12-22 12:04:49 +01:00
Dennis Ameling
9b3643a4d0 Update several dependencies 2020-12-22 12:04:48 +01:00
Markus Olsson
ceffeee9d1 Merge remote-tracking branch 'origin/development' into the-abstractest-of-abstractions 2020-12-22 12:02:03 +01:00
dependabot[bot]
d952a6c3fc
Bump ini from 1.3.5 to 1.3.7 in /app 
Bumps [ini](https://github.com/isaacs/ini) from 1.3.5 to 1.3.7.
- [Release notes](https://github.com/isaacs/ini/releases)
- [Commits](https://github.com/isaacs/ini/compare/v1.3.5...v1.3.7)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-12-11 02:06:20 +00:00
Markus Olsson
15a648850c Bump dugite 2020-12-03 22:19:01 +01:00
Markus Olsson
d6bc3ea68a 🔥 unused queue module 2020-11-27 20:30:45 +01:00
dependabot[bot]
7418ed36d5
Bump highlight.js from 9.12.0 to 9.18.5 in /app 
Bumps [highlight.js](https://github.com/highlightjs/highlight.js) from 9.12.0 to 9.18.5.
- [Release notes](https://github.com/highlightjs/highlight.js/releases)
- [Changelog](https://github.com/highlightjs/highlight.js/blob/9.18.5/CHANGES.md)
- [Commits](https://github.com/highlightjs/highlight.js/compare/9.12.0...9.18.5)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-11-24 23:42:42 +00:00
Markus Olsson
5cd24211a2
Merge pull request #11017 from desktop/the-biggest-sur 
Increase title bar height on Big Sur
 2020-11-13 14:06:23 +01:00
Markus Olsson
e8dc02c5b8 Add required peer-dependency for focus-trap-react 2020-11-12 14:51:32 +01:00
Markus Olsson
96f8ee91dc 🎨 Leverage process.getSystemVersion and simplify 2020-11-12 14:24:12 +01:00
Markus Olsson
594e7ccee9 Bump dugite 2020-11-05 21:49:55 +01:00
Markus Olsson
60f3bb2cdf Use focus trap instead of home-built close logic 2020-10-07 22:41:44 +02:00
Rafael Oleza
01e741cb57
Get rid of diff-match-patch in favor of our custom logic 2020-09-20 22:16:48 +02:00
Rafael Oleza
18eb3cdcf1
Use more official diff-match-patch npm package 2020-09-20 22:16:47 +02:00
Rafael Oleza
847eefe203
WIP: syntax hightlighting 2020-09-20 22:16:20 +02:00
dependabot[bot]
b2ede2f8df
Bump bl from 3.0.0 to 3.0.1 in /app 
Bumps [bl](https://github.com/rvagg/bl) from 3.0.0 to 3.0.1.
- [Release notes](https://github.com/rvagg/bl/releases)
- [Commits](https://github.com/rvagg/bl/compare/v3.0.0...v3.0.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-09-17 14:33:58 +00:00
Markus Olsson
1943b79362 Simplify nan dependency lock 2020-09-09 15:49:28 +02:00
Markus Olsson
1702386845 Bump registry-js 2020-09-09 15:45:35 +02:00
rafeca
807dc73238
Merge branch 'development' into upgrade-react-transition-group 2020-08-13 11:07:53 +02:00
rafeca
072ef80b07
Merge branch 'development' into upgrade-react-transition-group 2020-08-11 19:12:34 +02:00
Markus Olsson
53e43cd517 Resync lockfiles after merge 2020-08-10 12:43:26 +02:00
rafeca
2c23d05375
Upgrade react-transition-group package to v4.4.1 2020-08-04 12:50:49 +02:00
Markus Olsson
636382b0eb Merge branch 'development' into electron-9 2020-08-04 11:23:12 +02:00
Markus Olsson
0e8393c4c9
Merge pull request #10317 from desktop/remove-react-addons-shallow-compare 
Remove react-addons-shallow-compare npm dependency
 2020-08-04 11:22:10 +02:00
Markus Olsson
998097461e
Merge pull request #9766 from say25/chore/electron-v8.2.5 
Chore/electron v8.4.0
 2020-08-04 11:19:03 +02:00
rafeca
951a9253e2
Remove react-addons-shallow-compare npm dependency 2020-08-04 10:49:46 +02:00
Markus Olsson
0e5f688b5a
Merge branch 'development' into interop-requires 2020-08-03 16:17:34 +02:00
rafeca
8efafc5728
Merge branch 'development' into electron-9 2020-08-03 15:20:57 +02:00
Rafael Oleza
c4f7057607
Upgrade node-abi version to v2.18.0 
This new version detects electron v9
 2020-07-20 11:32:02 +02:00
Rafael Oleza
6c3a456788
Upgrade fs-admin to v0.15.0 
This new version has compatibility with Electron v9
 2020-07-20 11:18:30 +02:00
Rafael Oleza
c57522989e
Update electron-devtools-installer to v3.1.0 
This should solve some of the issues when installing devtools extensions in electron v9
 2020-07-20 11:17:59 +02:00
Rafael Oleza
78fd11c4ae
Upgrade keytar package 
We need an updated version that has prebuilt binaries for electron v9
 2020-07-16 17:18:27 +02:00
Rafael Oleza
761d6ac927
Upgrade electron-debug and electron-devtools-installer packages 2020-07-16 17:17:16 +02:00
Rafael Oleza
ebf65260e6
Merge branch 'development' into pr/9766 2020-07-16 10:56:35 +02:00
Rafael Oleza
1a9848af7f
Enable importHelpers TypeScript compiler option 
This avoids inlining the TypeScript helpers and instead imports them from tslib, saving bundle size
 2020-07-08 17:40:20 +02:00
Markus Olsson
40d6f458f4 gotta have that yarn tho 2020-07-08 16:22:16 +02:00
Markus Olsson
71a478af91 Bump dugite 2020-07-02 12:48:10 +02:00
Rafael Oleza
1774cc36dd
Upgrade dugite to v1.91.2 
This includes Git v2.26.2
 2020-06-24 17:44:14 +02:00
Rafael Oleza
6815a7452c Update yarn.lock 2020-05-25 13:20:21 +02:00
say25
10b3fff972 Update to Electron 8.2.5 2020-05-12 00:52:41 -05:00
evelyn masso
b0c0a74c60
Merge pull request #7050 from say25/upgrade-to-latest-react 
Upgrade to React 16.8.4
 2020-04-29 16:13:42 -07:00
evelyn masso
a148696877
Merge pull request #9576 from desktop/use-fetchtagstopush 
Use the `fetchTagsToPush()` output to display the push/pull information
 2020-04-28 10:16:58 -07:00
Rafael Oleza
b5997a453f Use lru-cache instead of a Map to memoize the pushed tags 
This way we avoid memory leaks by having an ever-growing object
 2020-04-28 15:05:48 +02:00
Rafael Oleza
981ceb427f Revert "Upgrade memoize-one package" 
This reverts commit a82fb3e5400c04b3a189c5b2c5856bbb98be7111.
 2020-04-27 15:45:23 +02:00
Rafael Oleza
360cdbd565 Upgrade memoize-one package 
We need to be able to check for equality in multiple arguments to fetch unpushed tags only when needed
 2020-04-27 15:44:15 +02:00
Rafael Oleza
f0983e7f33 Upgrade dugite to 1.88.6 2020-04-27 13:59:53 +02:00
evelyn masso
81d82dd510 up dugite again 2020-04-21 08:50:57 -07:00
evelyn masso
f76eefe351
Merge pull request #9517 from desktop/release/2.4.1 
Production Release 2.4.1
 2020-04-14 14:11:27 -07:00
evelyn masso
aae6e80598 bump dugite 2020-04-14 13:13:27 -07:00
evelyn masso
a9be1b51e4 add moment duration format dep 2020-04-09 16:42:22 -07:00
say25
de20868d2b Update to React 16.8 2020-04-07 16:40:06 -05:00
evelyn masso
c0816dea5e upgrade dugite to 1.88.3 2020-04-06 12:00:30 -07:00
say25
646fc57ee9 Update Downstream Packages to Enhance Windows Build Experience 2020-03-09 20:08:04 -05:00
say25
b409a4f884 Add Compare-Versions 2020-03-06 14:14:56 -05:00
evelyn masso
1f5abb9c3c dugite 1.88.2 2020-02-10 12:17:25 -08:00
evelyn masso
33cf1766d7 update to beta dugite 2020-02-07 15:17:17 -08:00
Katrina Uychaco
9d2eecee49 Merge branch 'development' into ku-electron-7-upgrade 2020-01-23 11:52:57 -08:00
Markus Olsson
88af6a37b8 Bump dugite to 1.88.0 2020-01-15 13:49:17 +01:00
Katrina Uychaco
9d3d59a3f8 Upgrade keytar and fs-admin to versions that support Electron 7 
Co-Authored-By: evelyn masso <outofambit@github.com>
 2020-01-13 15:39:02 -08:00
Markus Olsson
24575b5a80
Merge branch 'development' into update-code-mirror 2019-12-23 12:20:53 +01:00
Katrina Uychaco
e929cf93f2 Bump keytar to 4.13.0, which is required for Electron 6 
Co-Authored-By: evelyn masso <outofambit@github.com>
 2019-12-19 11:07:48 -08:00
Markus Olsson
fb519c18d8 Bump to dugite 1.87.6 2019-12-11 16:20:47 +01:00
Katrina Uychaco
f8ab47871f Upgrade dugite to v1.87.5 2019-12-10 18:35:36 -08:00
Katrina Uychaco
5b737287b0 Upgrade dugite to v1.87.4 2019-12-10 12:15:12 -08:00
say25
67778813d5 Update Code Mirror and CodeMirror Types 2019-11-14 22:29:04 -06:00
evelyn masso
93eacd8e79 Update yarn.lock 2019-11-14 10:43:51 -08:00
Markus Olsson
0cffa887e9 Bump dugite to prevent unhandled crash on spawn 
see https://github.com/desktop/dugite/pull/381
 2019-11-08 14:24:05 +01:00
evelyn masso
a4a9367392 dugite 🆙 2019-08-20 09:39:23 -07:00
Markus Olsson
a20651ea10 Bump dugite to address security vulnerability 
Co-Authored-By: Katrina Uychaco <katrina@github.com>
 2019-08-13 21:48:26 +02:00
Brendan Forster
dc1322beb1 update registry-js to version that is compatible with Electron 5 2019-07-02 12:38:37 -03:00
evelyn masso
a4fe560794 fs-admin 3.0.1 2019-06-12 16:17:30 -07:00
Markus Olsson
cb9ed4b438
Merge branch 'development' into missing-monitor-fix 2019-05-21 10:57:49 +02:00
say25
60d08471c0 Address Case of the Missing Monitor 2019-05-15 23:45:45 -05:00
Markus Olsson
c9e3718605 Use off-the-shelf memoizer rather than reinventing the wheel 2019-04-10 14:20:08 +02:00
Markus Olsson
87585356c4
Merge branch 'development' into pr-step-two 2019-03-27 08:18:22 +01:00
evelyn masso
86b9f11ff3
Merge pull request #7153 from say25/fs-admin-bump 
Upgrade FS-Admin
 2019-03-26 11:44:30 -07:00
Markus Olsson
7990f71585 Merge branch 'development' into pr-step-two 2019-03-25 17:06:33 +01:00
Markus Olsson
6ecab94f75 Don't keep infinite status entries in cache 2019-03-25 16:30:57 +01:00
Markus Olsson
b12fa08fea Reuse pending work promises 
Replace custom concurrent promise map function with p-limit
 2019-03-25 11:31:08 +01:00
say25
71eaed15e8 🆙 fs-admin 0.3.0 2019-03-24 14:40:15 -05:00
evelyn masso
634bb110df upgrade dugite to 1.87 
downgrades git to 2.19.2
 2019-03-22 08:32:21 -07:00
Brendan Forster
da4837555b
Merge pull request #6918 from say25/upgrade-codemirror 
Upgrade Codemirror
 2019-03-11 10:02:59 -03:00
Markus Olsson
ad2f25fab2
Merge pull request #6961 from desktop/shiftkey/rebase/menu-item-and-dialog 
[rebase] menu item and dialog to start rebase operation
 2019-03-11 09:26:42 +01:00
William Shepherd
5d9eab1801
Merge pull request #6922 from HashimotoYT/upgrade-moment 
chore: Upgrade moment to 2.24.0
 2019-03-08 09:09:33 -06:00
Brendan Forster
d5e4e0d92e bump to latest dugite to get new error code 2019-03-07 09:36:34 -04:00
Brendan Forster
43f19064ad
Merge pull request #6902 from say25/keytar-4.4.0-bump 
Keytar 4.4.1 Upgrade
 2019-03-05 15:41:04 -04:00
HashimotoYT
a7f2d637b9 Upgrade moment to 2.24.0 2019-02-22 18:13:57 +02:00
say25
aaf9d92430 Upgrade Codemirror 2019-02-22 00:08:04 -05:00
say25
4c77736556 🎹 🆙 ^4.4.1 2019-02-21 11:57:57 -05:00
mathieudutour
73da7b26b0 update dugite to 1.83.0 2019-02-14 08:15:01 -04:00
mathieudutour
4bbded079d show an actionnable dialog when files would be overwritten 2019-01-31 13:29:17 -04:00
Brendan Forster
fd36c0955a upgrade keytar to latest stable version 2019-01-17 14:26:49 -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
Markus Olsson
b28986ca87 Initial transition experiment 2019-01-14 14:53:30 +01:00
Brendan Forster
ebca7a0041 switch to new module 2018-12-17 14:12:57 -04:00
Markus Olsson
9919fd0b56 Merge branch 'master' into api-accounts-store 2018-11-30 17:21:24 +01:00
Markus Olsson
c6958ebdb5 Store selected repository in parent component 2018-11-22 20:01:17 +01:00
Brendan Forster
3c62316d96 update dugite to latest version 2018-11-22 13:23:57 -04:00
Brendan Forster
1930b25b9a lockfiles contain some new fields 2018-10-15 17:38:33 -03:00
evelyn masso
bc735fe71f update to dugite 1.78.0 2018-10-05 13:29:35 -07:00
Brendan Forster
71c2a05a39 upgrade Git to 2.19.0 and Git-LFS to 2.5.2 2018-10-05 10:44:55 -05:00
evelyn masso
cb05033c2a
Merge pull request #5388 from desktop/bump-dugite-for-all-the-things 
bump dugite to 2.18.0 and related packaging improvements
 2018-09-05 09:15:57 -07:00
evelyn masso
ff3c5a8c1e jest is awesome 2018-08-17 12:32:09 -05:00
Brendan Forster
1cfe880ae4 bump dugite to 2.18.0 and related packaging improvements 2018-08-13 11:25:20 -03:00
Brendan Forster
6ce07ef69b add double-ended-queue package as alternative to arrays 2018-07-18 13:00:21 -03:00
Vanessa Yuen
9c0612cd7e upgrade some more dependencies 2018-07-10 14:47:11 +02:00
Brendan Forster
353703d14f bump package to latest version 2018-07-03 18:19:54 -03:00
William Shepherd
93cf9b1bf2
Merge pull request #4977 from desktop/tidy-up-package 
removed duplicated style-loader package
 2018-06-22 15:29:02 -05:00
Brendan Forster
352b9f2bb0 removed duplicated dependency 2018-06-20 12:04:14 -03:00
Brendan Forster
df66725791 bump for new embedded Git package 2018-06-10 21:46:48 +09:30
Markus Olsson
b1f4ac1896 Bump dugite to 1.66.0 2018-05-30 22:01:44 +02:00
Brendan Forster
ac88a0a128
Merge branch 'master' into bump-for-new-git 2018-05-30 08:42:11 +10:00
Brendan Forster
2d28f723e1 bump for even latest Git 2018-05-30 08:06:30 +10:00
Brendan Forster
7f59bfc46c bump to latest dugite and handle new error codes 2018-05-26 21:24:32 +09:30
Brendan Forster
3cad5de9be bump react and react-dom 2018-05-13 22:39:14 +10:00
Brendan Forster
7a0ae200ae upgrade fs-extra here to v6 too 2018-05-08 11:38:01 +10:00
Brendan Forster
dafdb2b9f7 Merge branch 'master' into upgrade-fs-extra 2018-05-04 15:08:33 +10:00
Brendan Forster
38c8d4f6f9 bump fs-extra to latest stable version 2018-04-10 14:07:31 +10:00
Brendan Forster
1b74db0750 use an existing queuing framework rather than a hand-rolled solution 2018-04-06 13:27:32 +10:00
Brendan Forster
42f536bb0b Merge branch 'master' into we-dont-need-to-ship-a-yaml-parser 2018-04-03 14:47:26 +10:00
Brendan Forster
d2048e1602 move front-matter parsing out of the app package 2018-03-29 16:50:04 +11:00
Brendan Forster
40f2f503e4 bump to latest dugite 2018-03-27 08:58:50 +11:00
John Kleinschmidt
58b14325a9 Update to build for arm64 2018-03-14 10:21:21 -04:00
William Shepherd
289dd2f86c Merge master 2018-03-11 15:39:23 -05:00
Brendan Forster
fc6d893991 Merge branch 'master' into bump-electron 2018-03-08 14:20:29 -08:00
Brendan Forster
4dc49b9332 bump Electron to 1.8.3 2018-03-08 14:14:35 -08:00
Brendan Forster
5a15d3c9b0 bump react-virtualized and all the types 2018-03-06 12:14:24 -08:00
Brendan Forster
c5c41cc8a0 Merge branch 'master' into bump-to-react-16 2018-02-28 16:15:24 +11:00
Brendan Forster
077adcdcf8 bump dugite for improved handling of EOF/EPIPE/ECONNRESET on stdin 2018-02-21 08:35:40 +10:30
Brendan Forster
8452449631 Merge branch 'master' into bump-to-react-16 2018-02-13 15:24:45 +10:30
William Shepherd
7b420826ca
Merge pull request #3990 from desktop/yarn-lock-file-tidy-up 
latest yarn merges two lockfile entries
 2018-02-11 20:14:05 -06:00
William Shepherd
23ddc3acea
Merge pull request #3873 from j-f1/i-can't-see-clearly-now 
Enable fuzzy search in the repository, branch, PR, and clone FilterLists
 2018-02-11 20:06:29 -06:00
Brendan Forster
cd854ca589 latest yarn merges two lockfile entries 2018-02-12 09:23:57 +10:30
Markus Olsson
9dc0d3f8cf
Merge pull request #3774 from joaovitoras/add-elixir-syntax-highlighting 
Add Elixir syntax highlighting
 2018-02-10 18:09:57 +01:00
João Vitor Alves
c66484df63 bump codemirror-mode-elixir to 1.1.1 2018-02-09 11:56:38 -02:00
Brendan Forster
d0aa046000 Merge branch 'master' into bump-to-react-16 2018-01-30 11:48:34 +11:00
Markus Olsson
8b240bd6cd Merge remote-tracking branch 'origin/master' into it-is-dangerous-to-go-alone 2018-01-29 11:10:54 +01:00
Jed Fox
1fddb3db87 Add fuzzy-find support; rip out old character highlighting code 2018-01-28 15:20:02 -05:00
Brendan Forster
76efa1684a bump git for new fix 2018-01-28 17:45:50 +11:00
Markus Olsson
565c5e0424 Merge branch 'master' into it-is-dangerous-to-go-alone 2018-01-24 04:54:51 -08:00
Markus Olsson
3733642459 Bump codemirror 2018-01-24 04:54:47 -08:00