Commits

Branch selector

 aw-cdb-again

User selector

All users

Datepicker

All time

Commit History

Commits on Feb 22, 2017

• Let's see if this (a) crashes (b) dumps a stack

  smashwilson

  committed
  b053507

  Copy full SHA for b053507

• Merge pull request #541 from atom/mkt-ku-prevent-model-observer-backlog

  Show description for bd75273
  

  Michelle Tilley

  authored
  bd75273

  Copy full SHA for bd75273

• Flakes!

  

  BinaryMuse

  authored and

  kuychaco

  committed
  69a24b6

  Copy full SHA for 69a24b6

• Merge remote-tracking branch 'origin/master' into mkt-ku-prevent-model-observer-backlog

  

  BinaryMuse

  authored and

  kuychaco

  committed
  c981d0b

  Copy full SHA for c981d0b

• Don't await didUpdate result in ModelObserver

  

  BinaryMuse

  authored and

  kuychaco

  committed
  ad806a1

  Copy full SHA for ad806a1

• :arrow_up: test-until to allow latch functions to use `await`

  

  BinaryMuse

  authored and

  kuychaco

  committed
  10ef38b

  Copy full SHA for 10ef38b

Commits on Feb 21, 2017

• Improve some tests

  

  Michelle Tilley

  committed
  2d98659

  Copy full SHA for 2d98659

• :fire: unused method call counts

  

  Michelle Tilley

  committed
  139d965

  Copy full SHA for 139d965

• Merge pull request #385 from atom/merge-conflict-resolution

  Show description for 7803b3e
  smashwilson

  authored
  7803b3e

  Copy full SHA for 7803b3e

• Merge pull request #455 from atom/aw-appveyor-cdb

  Show description for 579a584
  smashwilson

  authored
  579a584

  Copy full SHA for 579a584

• Typo in the final `Push-AppveyorArtifact` call

  smashwilson

  committed
  af1ace5

  Copy full SHA for af1ace5

• Let's try to bundle artifacts into .zip files

  smashwilson

  committed
  2b8d7a3

  Copy full SHA for 2b8d7a3

• :arrow_up: nsfw

  smashwilson

  committed
  f00eca4

  Copy full SHA for f00eca4

• Merge branch 'master' of github.com:atom/github into aw-appveyor-cdb

  smashwilson

  committed
  5ca6b72

  Copy full SHA for 5ca6b72

• Bring StagingView tests up to date

  smashwilson

  committed
  2d456ee

  Copy full SHA for 2d456ee

• Boolean logic, how does it work

  smashwilson

  committed
  7702944

  Copy full SHA for 7702944

• Forgot to pass an actual function in there :notes:

  smashwilson

  committed
  b2e3ee8

  Copy full SHA for b2e3ee8

• `refs.mergeConflicts` doesn't necessarily exist

  smashwilson

  committed
  9c369b7

  Copy full SHA for 9c369b7

• Update ResolutionProgress when editors are reloaded or closed.

  smashwilson

  committed
  2e24063

  Copy full SHA for 2e24063

• Refactor offline ResolutionProgress updates into GitController

  smashwilson

  committed
  62da7c1

  Copy full SHA for 62da7c1

• Fix EditorConflictController tests

  smashwilson

  committed
  649725f

  Copy full SHA for 649725f

• Context menu items to resolve files

  smashwilson

  committed
  0ede753

  Copy full SHA for 0ede753

• Bulk resolution of conflicts as "ours" or "theirs"

  smashwilson

  committed
  7733c12

  Copy full SHA for 7733c12

• Missed an extra space!

  smashwilson

  committed
  91308c4

  Copy full SHA for 91308c4

• No dash in `utf8`

  smashwilson

  committed
  a8d47df

  Copy full SHA for a8d47df

• Use `.forceUpdate()`

  smashwilson

  committed
  23f1730

  Copy full SHA for 23f1730

• Convert state.conflicts to a Set

  smashwilson

  committed
  0e8eba8

  Copy full SHA for 0e8eba8

• :fire: extraneous spaces

  smashwilson

  committed
  3828ae5

  Copy full SHA for 3828ae5

• Vertial align icons

  simurai

  committed
  8c942c1

  Copy full SHA for 8c942c1

• Less round

  simurai

  committed
  6e75aa3

  Copy full SHA for 6e75aa3

• Use git colors

  simurai

  committed
  a4533bc

  Copy full SHA for a4533bc

• Make Separator look like it's part of Base

  simurai

  committed
  c228612

  Copy full SHA for c228612

• Colorized buttons

  simurai

  committed
  ac5b430

  Copy full SHA for ac5b430

• Use stronger color for Block

  simurai

  committed
  036a556

  Copy full SHA for 036a556

• Merge pull request #535 from atom/aw-check-merged-schema

  Show description for d686cb7
  smashwilson

  authored
  d686cb7

  Copy full SHA for d686cb7

Pagination

Previous

Next