Permalink
Commits on May 11, 2012
  1. Merge pull request #859 from cfjedimaster/master

    Adds a title to the project folder in the sidebar
    redmunds committed May 11, 2012
Commits on May 10, 2012
  1. Merge pull request #858 from adobe/randy/perfutils-refactor

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

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

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

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

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

    jasonsanjose committed May 10, 2012
  7. Update CodeMirror SHA

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

    njx committed May 10, 2012
  9. fix merge issues

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

    jasonsanjose committed May 10, 2012
  11. Merge branch 'refs/heads/master' into jason-sanjose/issue800

    Conflicts:
    	src/brackets.js
    	src/utils/ViewUtils.js
    	src/view/ViewCommandHandlers.js
    jasonsanjose committed May 10, 2012
Commits on May 9, 2012
  1. Merge pull request #840 from adobe/glenn/issue-776

    Improve automatic indentation
    njx committed May 9, 2012
  2. Update CodeMirror SHA

    gruehle committed May 9, 2012
  3. Merge pull request #847 from adobe/garthdb/project-panel

    looks good
    tvoliter committed May 9, 2012
  4. fixed conflict with master

    GarthDB committed May 9, 2012
  5. fixed the dumb ol issue that I thought I fixed before with the indent…

    …. @tvoltier found it with his hawk eyes.
    GarthDB committed May 9, 2012
  6. Merge pull request #842 from adobe/tvoliter/issue-811

    Fixing issue 811 -- escape strings used in regex expressions
    peterflynn committed May 9, 2012
  7. Fix regex

    gruehle committed May 9, 2012
  8. Merge pull request #833 from adobe/tvoliter/issue-735

    Adding comment to prevent issue #735
    redmunds committed May 9, 2012
  9. Merge pull request #849 from mikechambers/Fix848

    Changes default encoding from 'utf-8' to 'utf8'.
    pthiess committed May 9, 2012
  10. Merge pull request #846 from adobe/randy/cleanup-style-names

    Issue #408 - cleanup style names
    jasonsanjose committed May 9, 2012
  11. merge changes from master

    redmunds committed May 9, 2012
  12. Fix whitespace check.

    gruehle committed May 9, 2012