Commit graph

26238 commits

Author SHA1 Message Date
evelyn masso 294e3b78c0 release notes for 2.5.1 2020-06-02 09:46:25 -07:00
Rafael Oleza fd008979a6
Merge pull request #9885 from desktop/release/2.5.1-beta2
2.5.1 Beta2
2020-05-29 11:19:12 +02:00
Billy Griffin f40cd9fc24
Update changelog.json 2020-05-28 10:16:46 -06:00
Rafael Oleza 0e9246d06f Change new to added 2020-05-28 17:59:04 +02:00
Rafael Oleza dbb65b50e9 Update changelog 2020-05-28 17:58:08 +02:00
Rafael Oleza 181d4685b4 Merge branch 'development' into release/2.5.1-beta2 2020-05-28 17:55:22 +02:00
evelyn masso 272998552f
Merge pull request #9869 from desktop/popup-for-fork-settings
Show popup for fork settings when cloning a fork
2020-05-28 08:51:20 -07:00
evelyn masso b638f03411
Merge pull request #9842 from desktop/ui-for-fork-settings
Add tab for fork settings in repository settings
2020-05-28 08:50:34 -07:00
Billy Griffin ba667b150b
We don't even remember what NDDB stands for 😆 2020-05-28 08:22:18 -06:00
Billy Griffin 58db52e47d
Update changelog.json 2020-05-28 08:21:52 -06:00
Billy Griffin eb5c1e33be
More user-facing verbiage 2020-05-28 08:21:43 -06:00
Billy Griffin 71fb572205
Make verbiage more comprehensible for users 2020-05-28 08:21:18 -06:00
Billy Griffin 6360845ff4
Update changelog.json 2020-05-28 08:20:44 -06:00
Rafael Oleza 110bcdcd82 release notes 2020-05-28 13:06:11 +02:00
Rafael Oleza f5b548bee4
Update app/src/ui/repository-settings/repository-settings.tsx
Co-authored-by: evelyn masso <outofambit@github.com>
2020-05-28 10:44:03 +02:00
Rafael Oleza 4985ff4d4b
Update app/src/models/github-repository.ts
Co-authored-by: evelyn masso <outofambit@github.com>
2020-05-28 10:41:35 +02:00
evelyn masso e7599b684d
Merge pull request #9640 from dscho/safer-open-in-cmd.exe
Windows: make it safer to Open in Command Prompt (in cmd.exe)
2020-05-27 16:55:02 -07:00
Rafael Oleza b9b35b8ff5 Make VerticalSegmentedControl use the whole width 2020-05-27 20:27:23 +02:00
Rafael Oleza 28444d1f69 Merge branch 'ui-for-fork-settings' into popup-for-fork-settings 2020-05-27 20:02:35 +02:00
Rafael Oleza acd34584b6 Merge branch 'development' into ui-for-fork-settings 2020-05-27 19:59:36 +02:00
evelyn masso 067f01f844
Merge pull request #9873 from desktop/fix-clone-when-open-in-desktop
Wait until the repository is cloned in order to checkout a PR
2020-05-27 09:07:42 -07:00
Markus Olsson a8a6dbe2b9
Merge pull request #9862 from desktop/support-deleting-tags-from-outside-desktop
Support deleting tags from outside desktop
2020-05-27 12:43:05 +02:00
Markus Olsson 60da170bc0
Merge pull request #9806 from desktop/feature/honor-fork-setting
use fork workflow preferences if possible
2020-05-27 12:38:13 +02:00
Markus Olsson a1df6f7b3b Merge pull request #9796 from desktop/delete-tags
Add delete tags functionality
2020-05-27 09:44:52 +02:00
Rafael Oleza 9260e64d81 Put popups behind feature flag 2020-05-26 15:45:22 +02:00
Rafael Oleza 30fe24ccf8 Show fork settings dialog after forking a repository 2020-05-26 15:34:14 +02:00
Rafael Oleza 6a34464720 Do not resolve the completeOpenInDesktop promise when closing other modals 2020-05-26 13:11:12 +02:00
Rafael Oleza 413b9bd125 Remove duplicated stats call 2020-05-26 12:58:03 +02:00
Rafael Oleza 456edef22a Make sure that createTag metric gets only sent when the tag gets created correctly 2020-05-26 12:56:35 +02:00
Rafael Oleza 9024b1d673 Make sure that metrics and unpushed tags updates are only performed when the tag gets deleted correctly 2020-05-26 12:51:52 +02:00
Rafael Oleza ab9b36e107 Always return null in findDefaultUpstreamBranch() 2020-05-26 12:44:53 +02:00
Rafael Oleza f5bb6bcd96 Show ChooseForkSettings dialog after cloning a forked repository 2020-05-26 10:10:53 +02:00
Rafael Oleza f2207766b4 Create ChooseForkSettings dialog 2020-05-26 10:10:25 +02:00
Rafael Oleza 72ecb65f9d Create component that displays the description of a fork contribution target
We're going to reuse this component on the dialog that's shown after cloning a forked repository
2020-05-26 10:00:29 +02:00
Rafael Oleza c124d5b2f5 Accespt a JSX element on the description of a VertiicalSegmentControl
This allows us to use rich text for the description of items
2020-05-26 09:59:19 +02:00
Rafael Oleza 810dc74108 Prune unpushed tags that don't exist on the repository 2020-05-25 18:02:26 +02:00
Rafael Oleza ecc98da2a1 Make sure that the tags to push array is not updated when there is an error creating a tag 2020-05-25 16:15:57 +02:00
Rafael Oleza 713f8e878b
Merge pull request #9848 from desktop/canonical-stash-refs
Use canonical stash references to avoid ambiguous references
2020-05-25 15:24:04 +02:00
Markus Olsson 844974ce60 Merge branch 'development' into delete-tags 2020-05-25 15:23:49 +02:00
Markus Olsson ef3e9cd92f
Merge pull request #9828 from desktop/do-not-fetch-unpushed-tags
Avoid performing network operations to calculate unpushed tags
2020-05-25 15:22:02 +02:00
Markus Olsson 936012dc8f
Merge pull request #8318 from JMcKiern/CTRL+TAB
Reworked Ctrl+Tab to work without RepositoryView focus
2020-05-25 15:01:43 +02:00
Rafael Oleza 333e4f423b
Merge branch 'feature/honor-fork-setting' into ui-for-fork-settings 2020-05-25 14:25:36 +02:00
Rafael Oleza e5e459413a
Tweak label text in fork settings dialog
Co-authored-by: Ed L <beartechtalks@gmail.com>
2020-05-25 14:23:40 +02:00
Rafael Oleza 37ae79a386 Use the new abstraction layer to store tags when deleting a tag 2020-05-25 13:24:39 +02:00
Rafael Oleza 0749a0318c Fix potential issues with undefined array lookups
Co-Authored-By: Markus Olsson <niik@users.noreply.github.com>
2020-05-25 13:23:06 +02:00
Rafael Oleza 5e0430f7da Use strict null/undefined comparisons
Co-authored-by: Markus Olsson <j.markus.olsson@gmail.com>
2020-05-25 13:23:06 +02:00
Rafael Oleza 2f00fcc5d6 Use onDismiss() method on modal
Co-authored-by: Markus Olsson <j.markus.olsson@gmail.com>
2020-05-25 13:23:06 +02:00
Rafael Oleza d2907f80d3 Show all tags in the delete tag menu item
Already pushed tags are now in a disabled state
2020-05-25 13:23:06 +02:00
Rafael Oleza d1cfbfbdd6 Add confirmation dialog before deleting a tag 2020-05-25 13:23:06 +02:00
Rafael Oleza ebacd6c19a Record number of times that tags get deleted from Desktop 2020-05-25 13:23:06 +02:00