Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: phacility/phabricator
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: nate-opti/phabricator
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
  • 15 commits
  • 4 files changed
  • 2 contributors

Commits on May 7, 2014

  1. Copy the full SHA
    469edfc View commit details

Commits on May 8, 2014

  1. Update the celerity map

    Rama Ranganath committed May 8, 2014
    Copy the full SHA
    a5f8d23 View commit details
  2. Merge pull request #1 from optimizely/rama/navigation

    Add a keyboard shortcut that allows you to jump to the comments box
    ramaranganath committed May 8, 2014
    Copy the full SHA
    33bcf40 View commit details
  3. Add a keyboard shortcut for the discussion

    Rama Ranganath committed May 8, 2014
    Copy the full SHA
    3bf746f View commit details
  4. Merge pull request #3 from optimizely/rama/navigation2

    Add a keyboard shortcut for the discussion
    ramaranganath committed May 8, 2014
    Copy the full SHA
    76b6fe1 View commit details

Commits on May 27, 2014

  1. Make JIRA integration less chatty

    Rama Ranganath committed May 27, 2014
    Copy the full SHA
    e992bb2 View commit details
  2. Merge pull request #5 from optimizely/rama/jira

    Make JIRA integration less chatty
    ramaranganath committed May 27, 2014
    Copy the full SHA
    d602d44 View commit details

Commits on Jun 5, 2014

  1. Filter comment stories from JIRA properly

    Rama Ranganath committed Jun 5, 2014
    Copy the full SHA
    d2e1751 View commit details

Commits on Jun 6, 2014

  1. Filter more messages

    Rama Ranganath committed Jun 6, 2014
    Copy the full SHA
    68ee04d View commit details
  2. Never forget the $

    Rama Ranganath committed Jun 6, 2014
    Copy the full SHA
    913abe9 View commit details
  3. Merge pull request #6 from optimizely/rama/jira

    Make JIRA integration less chatty (for real this time). Filter comment and a couple of "updated" stories.
    ramaranganath committed Jun 6, 2014
    Copy the full SHA
    801fd35 View commit details

Commits on Jun 11, 2014

  1. Change JIRA story filtering to be a whitelist

    Rama Ranganath committed Jun 11, 2014
    Copy the full SHA
    e91e371 View commit details
  2. Add reclaimed

    Rama Ranganath committed Jun 11, 2014
    Copy the full SHA
    0105b47 View commit details

Commits on Jun 16, 2014

  1. Add a newline

    Rama Ranganath committed Jun 16, 2014
    Copy the full SHA
    cddaae5 View commit details
  2. Merge pull request #7 from optimizely/rama/jirafilter

    Make JIRA filter a whitelist
    ramaranganath committed Jun 16, 2014
    Copy the full SHA
    d535361 View commit details
20 changes: 10 additions & 10 deletions resources/celerity/map.php
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@
'core.pkg.js' => 'b2ed04a2',
'darkconsole.pkg.js' => 'ca8671ce',
'differential.pkg.css' => '4b8686e3',
'differential.pkg.js' => '05ad02d3',
'differential.pkg.js' => '1b63ecad',
'diffusion.pkg.css' => '3783278d',
'diffusion.pkg.js' => '5b4010f4',
'javelin.pkg.js' => 'dbef0389',
@@ -366,7 +366,7 @@
'rsrc/js/application/differential/behavior-diff-radios.js' => 'e1ff79b1',
'rsrc/js/application/differential/behavior-dropdown-menus.js' => '7f93ef26',
'rsrc/js/application/differential/behavior-edit-inline-comments.js' => '00861799',
'rsrc/js/application/differential/behavior-keyboard-nav.js' => '173ce7e7',
'rsrc/js/application/differential/behavior-keyboard-nav.js' => 'c0ce0f6c',
'rsrc/js/application/differential/behavior-populate.js' => 'dfdf9f34',
'rsrc/js/application/differential/behavior-show-all-comments.js' => '7c273581',
'rsrc/js/application/differential/behavior-show-field-details.js' => '441f2137',
@@ -559,7 +559,7 @@
'javelin-behavior-differential-dropdown-menus' => '7f93ef26',
'javelin-behavior-differential-edit-inline-comments' => '00861799',
'javelin-behavior-differential-feedback-preview' => '127f2018',
'javelin-behavior-differential-keyboard-navigation' => '173ce7e7',
'javelin-behavior-differential-keyboard-navigation' => 'c0ce0f6c',
'javelin-behavior-differential-populate' => 'dfdf9f34',
'javelin-behavior-differential-show-field-details' => '441f2137',
'javelin-behavior-differential-show-more' => 'dd7e8ef5',
@@ -964,13 +964,6 @@
1 => 'javelin-dom',
2 => 'phortune-credit-card-form',
),
'173ce7e7' =>
array(
0 => 'javelin-behavior',
1 => 'javelin-dom',
2 => 'javelin-stratcom',
3 => 'phabricator-keyboard-shortcut',
),
'189e4fe3' =>
array(
0 => 'javelin-install',
@@ -1722,6 +1715,13 @@
5 => 'javelin-workflow',
6 => 'javelin-vector',
),
'c0ce0f6c' =>
array(
0 => 'javelin-behavior',
1 => 'javelin-dom',
2 => 'javelin-stratcom',
3 => 'phabricator-keyboard-shortcut',
),
'c293f7b9' =>
array(
0 => 'javelin-install',
Original file line number Diff line number Diff line change
@@ -55,6 +55,15 @@ protected function publishFeedStory() {
}

$story_text = $this->renderStoryText();
if (!strstr($story_text, "created")
&& !strstr($story_text, "updated D") // if someone attaches a JIRA issue
&& !strstr($story_text, "reclaimed")
&& !strstr($story_text, "abandoned")
&& !strstr($story_text, "closed")
&& !strstr($story_text, "commandeered")) {
$this->log("Skipping an uninteresting update\n");
return;
}

$xobjs = mgroup($xobjs, 'getApplicationDomain');
foreach ($xobjs as $domain => $xobj_list) {
5 changes: 4 additions & 1 deletion src/view/phui/PHUITimelineView.php
Original file line number Diff line number Diff line change
@@ -92,7 +92,10 @@ public function render() {
}

if ($events) {
$events = array($spacer, $events, $spacer);
$nav_anchor = id(new PhabricatorAnchorView())
->setAnchorName('timeline')
->setNavigationMarker(true);
$events = array($nav_anchor, $spacer, $events, $spacer);
} else {
$events = array($spacer);
}
14 changes: 14 additions & 0 deletions webroot/rsrc/js/application/differential/behavior-keyboard-nav.js
Original file line number Diff line number Diff line change
@@ -227,6 +227,20 @@ JX.behavior('differential-keyboard-navigation', function(config) {
})
.register();

new JX.KeyboardShortcut('d', 'Jump to the discussion.')
.setHandler(function(manager) {
var discussion = JX.$('timeline');
manager.scrollTo(discussion);
})
.register();

new JX.KeyboardShortcut('c', 'Jump to the comments box.')
.setHandler(function(manager) {
var comments_box = JX.$('comment');
manager.scrollTo(comments_box);
})
.register();

new JX.KeyboardShortcut(
'h',
'Collapse or expand the file display (after jump).')