Commit graph

16154 commits

Author SHA1 Message Date
Markus Olsson 65c7ba0a77 Update changelog for beta release of hotfix 2018-06-07 16:34:09 +02:00
Brendan Forster 3558043e22 use babel-minify for production builds to avoid incorrect mangling of JS 2018-06-07 16:25:24 +02:00
Neha Batra e1bb5d3e37 bump version to 1.2.2 2018-05-30 14:51:36 -07:00
Neha Batra 1ae8d13cb4
Merge pull request #4827 from desktop/bump-dugite-for-schannel-fix
Bump dugite and dugite-native for schannel fix on Windows
2018-05-30 13:54:02 -07:00
Markus Olsson 67b6d5224b Add note about diff text selection 2018-05-30 22:19:17 +02:00
Markus Olsson 59af310827 Merge remote-tracking branch 'origin/master' into bump-dugite-for-schannel-fix 2018-05-30 22:18:33 +02:00
Neha Batra 99ad8da6a2
Merge pull request #4810 from desktop/wow-such-variables
SCSS refactors, move more constants into variables
2018-05-30 13:15:58 -07:00
Markus Olsson 81731a26fb Bump for beta release 2018-05-30 22:03:48 +02:00
Markus Olsson b1f4ac1896 Bump dugite to 1.66.0 2018-05-30 22:01:44 +02:00
Markus Olsson 07f15c1570 Changelerrgggggg 2018-05-30 21:59:34 +02:00
Markus Olsson 5a5529f0f5 Extract hard coded overflow shadow into variable 2018-05-30 16:44:54 +02:00
Markus Olsson e52dd0e992 Fix accidental opaque background on line elements
Fixes #4818
2018-05-30 15:38:02 +02:00
Markus Olsson b2971d7428
Merge pull request #4814 from desktop/bump-to-prod
promote to production
2018-05-30 11:19:10 +02:00
Brendan Forster 861c2dad46 promote to production 2018-05-30 15:37:24 +10:00
William Shepherd ce9101637a
Merge pull request #4791 from desktop/bump-for-new-git
bump embedded Git to latest version
2018-05-29 19:14:48 -05:00
Brendan Forster ac88a0a128
Merge branch 'master' into bump-for-new-git 2018-05-30 08:42:11 +10:00
Brendan Forster 24455c3e21
Merge pull request #4811 from desktop/changelogs-make-the-world-go-round
cut a new release
2018-05-30 08:28:50 +10:00
Brendan Forster 693e4f2321 address feedback 2018-05-30 08:10:05 +10:00
Brendan Forster 302bd1acdb and one more message 2018-05-30 08:06:44 +10:00
Brendan Forster 2d28f723e1 bump for even latest Git 2018-05-30 08:06:30 +10:00
Brendan Forster 4631f4a954 first pass at changelog 2018-05-30 07:42:34 +10:00
Markus Olsson 626579e434 This is a blankslate image and should be marked as such 2018-05-29 20:38:05 +02:00
Markus Olsson cad91117f5 Extract skeleton gradient into variable 2018-05-29 20:38:02 +02:00
Markus Olsson bc695e5778 Remove hard-coded colors from tab bar item count bubbles 2018-05-29 20:37:59 +02:00
Markus Olsson 702a215852 Use the box background color instead of hard-coding in tab-bar 2018-05-29 20:37:56 +02:00
William Shepherd 7f0fde6569
Merge pull request #4652 from desktop/enable-tslint-for-reals
actually get tslint working in the CI builds
2018-05-29 12:13:40 -05:00
William Shepherd 91161ca7b7
Merge pull request #4608 from 3raxton/master
Add Brackets as a supported external editor for macOS
2018-05-29 12:13:23 -05:00
William Shepherd 179d50d411
Merge pull request #4676 from desktop/bump-to-latest-react
bump to React 16.3
2018-05-29 12:12:49 -05:00
Neha Batra 3b6e7a15e8
Merge pull request #4763 from desktop/vsts-tweaks
VSTS tweaks
2018-05-29 09:56:00 -07:00
Brendan Forster 5198b3e2e2
Merge pull request #4798 from yongdamsh/fix_wrong_link
Correct the path to app-store.ts file
2018-05-29 09:04:56 +10:00
Lee Sanghyeon 89660a9582
Correct the path to app-store.ts file 2018-05-29 01:02:29 +09:00
Brendan Forster d911f6d70b
Merge pull request #4780 from desktop/css-variable-refactors
SCSS Cleanup and centralization of hard coded values
2018-05-28 10:27:43 +10:00
Brendan Forster 1ab02b0efb
Merge pull request #4542 from sagaragarwal94/patch-1
Decreased the max line length limit
2018-05-28 10:12:50 +10:00
William Shepherd 82658d6d3d
Merge pull request #4653 from damaneice/damaneice/filtering-by-number-author
Add filtering of Pull Requests by pull request number and author
2018-05-27 11:57:41 -05:00
Brendan Forster c3e60830c6 bump version 2018-05-26 21:39:47 +09:30
Brendan Forster 7f59bfc46c bump to latest dugite and handle new error codes 2018-05-26 21:24:32 +09:30
Brendan Forster c64e55527b
Merge pull request #4771 from desktop/comments-are-a-thing
Removes unused feature flag
2018-05-26 08:44:26 +09:30
iAmWillShepherd e13e46d759 Disable linter 2018-05-25 11:45:36 -05:00
Braxton Huff da1951290a
Add Command Line Shortcut information for Brackets 2018-05-25 10:42:55 -05:00
Brendan Forster 87c3d82d18 Merge branch 'master' into pr/4653 2018-05-25 14:06:39 +09:30
Neha Batra 624e3bc1f4
Merge pull request #4760 from desktop/Beta0
Document when to use beta0
2018-05-24 19:43:21 -07:00
Markus Olsson b8e9ae6bd6 Define backdrop color in one spot 2018-05-24 17:24:56 +02:00
Markus Olsson 587420bfbb Add a bottom border to the toolbar 2018-05-24 17:01:52 +02:00
Markus Olsson c046f66dbd Rename to be explicit that this is about the toolbar
...  so we can introduce another one for the count bubble in the PR tab
2018-05-24 17:01:48 +02:00
Markus Olsson a7de9ae335 Use variables for the codemirror scrollbars 2018-05-24 17:01:44 +02:00
Markus Olsson ba1d884d40 Add a variable for the general gutter background color 2018-05-24 17:01:41 +02:00
Markus Olsson 2e14845858 Copy paste fail 2018-05-24 17:01:37 +02:00
Markus Olsson 56ffd9b83e Increase specificity of selected and hovered lines
Withouth this the selected border and gutter color won't get applied
2018-05-24 17:01:33 +02:00
Markus Olsson 493c7ed7dd Use the same background color as the text boxes
We should probably split this out into a dedicated text box color
2018-05-24 17:01:29 +02:00
Markus Olsson 0ccc807a76 This variable doesn't exist 2018-05-24 17:01:26 +02:00