Commit graph

26170 commits

Author SHA1 Message Date
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 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
Markus Olsson d6bfcc01c0 Merge branch 'development' into feature/honor-fork-setting 2020-05-22 19:02:30 +02:00
Markus Olsson 2b5851c4b6 Merge branch 'development' into feature/honor-fork-setting 2020-05-22 18:59:38 +02:00
Markus Olsson a70f241f44
Merge pull request #9805 from desktop/feature/add-fork-setting
add storage for fork repo workflow settings
2020-05-22 18:57:43 +02:00
Markus Olsson 80860a7d00
Merge pull request #9730 from desktop/known-issues-update
Add steps for setting env variable using PowerShell
2020-05-22 17:46:42 +02:00
Markus Olsson 80479e0a45
Merge pull request #9832 from ChrisMissal/docs-windows-setup-vs-menu
Adds additional information in windows setup documentation
2020-05-22 17:15:06 +02:00
Rafael Oleza 55e400c755 Merge branch 'development' into feature/add-fork-setting 2020-05-22 17:08:28 +02:00
Rafael Oleza 51f39bbf95 Do not store empty workflowPreferences in DB
Co-Authored-By: Markus Olsson <niik@users.noreply.github.com>
2020-05-22 17:05:48 +02:00
Markus Olsson e23010e033
Merge pull request #9784 from desktop/remove-old-flags
Remove old feature flags
2020-05-22 13:16:38 +02:00
Rafael Oleza 239d64da55 Use React.Children.toArray() to completely filter out null children 2020-05-22 11:50:16 +02:00
Rafael Oleza 54d2554083 Do not render tab items that are nullable 2020-05-21 21:11:24 +02:00
Rafael Oleza a8b36aa85d Add feature flag for fork settings 2020-05-21 18:03:24 +02:00
Rafael Oleza 54d92426c6 Make sure that the repository settings modal gets re-mounted when the repository changes 2020-05-21 18:03:24 +02:00
Rafael Oleza aeed9e1bf3 Add fork settings tab 2020-05-21 18:03:24 +02:00
Rafael Oleza 008684bacd Display tabbar in repository settings vertically 2020-05-21 18:03:24 +02:00
Rafael Oleza 7a6ba79b26 Add function to narrow down the type of a forked repository 2020-05-21 18:03:24 +02:00
Rafael Oleza 37a1ddb88d Add updateRepositoryWorkflowPreferences() to the dispatcher 2020-05-21 18:03:24 +02:00
Rafael Oleza 888e886445 Use the default branch from the customized fork repo on the create branch dialog 2020-05-21 17:59:25 +02:00
Rafael Oleza 793ce2c89d Use getNonForkGitHubRepository() to calculate the inferred branch for NDDB 2020-05-21 16:08:28 +02:00
Rafael Oleza d3ac1cc1fc Use getNonForkGitHubRepository() method as start point for new branch creation 2020-05-21 16:03:12 +02:00
Rafael Oleza 9bf8980ebb Use helper method getForkContributionTarget()
This allows to unify the logic to calculate the default value of ForkContributionTarget when it's null
2020-05-21 14:54:16 +02:00
evelyn masso 7c65bb2894 use fork workflow preferences if possible 2020-05-21 14:52:06 +02:00
Rafael Oleza 78022f2b1a Make workflowPreferences object in repository model always required
This simplifies null checks everywhere
2020-05-21 14:51:58 +02:00
Chris Missal cdd524e20a
updates windows setup with menu navigation 2020-05-20 14:58:19 -05:00
Rafael Oleza 51a0e4117a Remove unneeded enum 2020-05-20 20:31:27 +02:00
Rafael Oleza 844c10bab1 Completely remove group-repositories-by-owner CSS classname 2020-05-20 19:54:39 +02:00
Rafael Oleza 6acd191a0e Remove unneeded className variables 2020-05-20 19:39:35 +02:00
Rafael Oleza 51fe97ee07 Remove unneeded CSS styles 2020-05-20 19:37:13 +02:00
Rafael Oleza f13ac6f2f2
Merge pull request #9804 from desktop/chore/no-nddb-more
unship nddb from beta + dev
2020-05-20 14:28:22 +02:00
Markus Olsson c05b66a606
Merge pull request #9786 from desktop/tweak-windows-scrollbars
Tweak list scrollbars on Windows
2020-05-19 19:07:14 +02:00
Markus Olsson f589a609e4
Merge pull request #9783 from ruggi99/fix-enter-key-dialog
Fix for Enter key in Clone Repository Dialog
2020-05-18 11:46:08 +02:00
evelyn masso 6fd1388a8d add storage for repo workflow settings
including whether a fork is mean to contribute upstream or to itself
2020-05-15 17:38:37 -07:00
evelyn masso 59329a49e4 unship nddb from beta + dev 2020-05-15 15:14:29 -07:00
evelyn masso 7e48ac2684
Merge pull request #9798 from desktop/release/2.5.1-beta1
2.5.1 Beta1
2020-05-14 15:32:40 -07:00
Billy Griffin 79e927c2b9
Update changelog.json 2020-05-14 15:01:40 -06:00
Billy Griffin 32c0705ae0
Update changelog.json 2020-05-14 15:01:33 -06:00
Billy Griffin 6e7fd2f569
Update changelog.json 2020-05-14 15:01:27 -06:00
evelyn masso 8a17f1253d release notes 2020-05-14 12:53:19 -07:00
evelyn masso fe3ec44529
Merge pull request #9785 from desktop/tweaks-tags-ui
Center tags text vertically in history view
2020-05-14 10:36:39 -07:00
evelyn masso ddbbba7514
Merge pull request #9769 from desktop/safenet-on-tags
Wrap call to get all tags with performFailableOperation()
2020-05-14 10:31:09 -07:00
evelyn masso 73b71dae65
Merge pull request #9793 from desktop/avoid-push-hooks
Add --no-verify arg to fetchTagsToPush command to avoid executing unwanted hooks
2020-05-14 10:30:39 -07:00
evelyn masso 17e566d523
Merge pull request #9775 from desktop/allow-deny-all-the-things
Stop using whitelist and blacklist in our code base
2020-05-14 10:30:09 -07:00
evelyn masso 4a3524e514
Merge pull request #9772 from desktop/bugfix/moment-duration-format-setup
move moment plugin setup
2020-05-14 10:29:45 -07:00
ruggi99 f3be1dc83e Set tabIndex to undefined (not 0) when a tab bar is selected 2020-05-14 16:18:18 +02:00
Rafael Oleza 24880a1a6c Add --no-verify arg to git push --no-dry to avoid executing hooks 2020-05-14 11:59:16 +02:00
Billy Griffin f355158ef3
Whoops meant to batch, naming still hard
Co-authored-by: Markus Olsson <j.markus.olsson@gmail.com>
2020-05-13 15:03:47 -06:00