Permalink
Switch branches/tags
Commits on May 11, 2012
  1. Merge pull request #844 from adobe/pflynn/about-sha

    njx committed May 11, 2012
    Show SHA in About box if available
  2. Merge pull request #863 from adobe/pflynn/fix-quickopen

    tvoliter committed May 11, 2012
    Fix bug where Quick Open list shows "undefined" for all "@" search results
  3. Code review: change About dialog's SHA search so it prefers .git folder

    peterflynn committed May 11, 2012
    directly inside submodule over a subfolder nested inside the containing
    module's .git folder.
  4. Merge remote-tracking branch 'origin/master' into pflynn/about-sha

    peterflynn committed May 11, 2012
    * origin/master: (35 commits)
      ...
    
    Conflicts:
    	src/brackets.js
  5. Merge pull request #841 from adobe/tvoliter/open-file-perf

    jasonsanjose committed May 11, 2012
    File Open Performance Tests
  6. fix indentation

    tvoliter committed May 11, 2012
  7. missed from last commit

    tvoliter committed May 11, 2012
  8. Merge remote-tracking branch 'origin/master' into tvoliter/open-file-…

    tvoliter committed May 11, 2012
    …perf
    
    * origin/master: (110 commits)
      Add comment.
      Make sure cursor is visible after a change event is received.
      code review changes
      Add a title to the project title in the sidebar
      refactor perfutils to allow measurement to be updated. update TypingSpeedLogger to use new perfutils api.
      fix comment for _setWidth
      Cleanup sidebar resizer. Fix edge case when moving from snapped closed to open.
      Update CodeMirror SHA
      Update README.md
      fix merge issues
      Don't resize shadow when using absolute positioning.
      Fix scroller shadow resize
      Increase sidebar resizer width. Fix dblclick bugs.
      convert markStart to also accept an array
      Use updated hyphenated names
      Code review comments. Fixes selection marker when closing jstree nodes
      convert multiple value output to min/avg/max/last
      Update CodeMirror SHA
      Call ProjectManager.loadProject() after extensions have been loaded.
      fixed the dumb ol issue that I thought I fixed before with the indent.  @tvoltier found it with his hawk eyes.
      ...
    
    Conflicts:
    	src/editor/EditorManager.js
    	src/utils/PerfUtils.js
  9. lint cleanup

    tvoliter committed May 11, 2012
  10. Merge pull request #864 from adobe/glenn/issue-752

    redmunds committed May 11, 2012
    Inline Editor: make sure cursor is visible after a change event is received
  11. Add comment.

    gruehle committed May 11, 2012
  12. Merge pull request #859 from cfjedimaster/master

    redmunds committed May 11, 2012
    Adds a title to the project folder in the sidebar
  13. Fix bug where Quick Open list shows "undefined" for all search result…

    peterflynn committed May 11, 2012
    …s in
    
    "@" mode (assuming at least one char has been typed to filter down the
    list). This was injected by a last-minute change to pull #734.
Commits on May 10, 2012
  1. code review cleanup

    tvoliter committed May 10, 2012
  2. Merge pull request #858 from adobe/randy/perfutils-refactor

    jasonsanjose committed May 10, 2012
    Refactor PerfUtils for TypingSpeedLogger functionality
  3. code review changes

    redmunds committed May 10, 2012
  4. Merge pull request #853 from adobe/glenn/issue-827

    tvoliter committed May 10, 2012
    looks good merging.
  5. Merge pull request #845 from adobe/jason-sanjose/issue800

    gruehle committed May 10, 2012
    Project panel bug fixes
  6. refactor perfutils to allow measurement to be updated. update TypingS…

    redmunds committed May 10, 2012
    …peedLogger to use new perfutils api.
  7. fix comment for _setWidth

    jasonsanjose committed May 10, 2012
  8. Update CodeMirror SHA

    gruehle committed May 10, 2012
  9. Update README.md

    njx committed May 10, 2012
  10. fix merge issues

    jasonsanjose committed May 10, 2012
  11. Fix scroller shadow resize

    jasonsanjose committed May 10, 2012
  12. code review fixes

    tvoliter committed May 10, 2012