Permalink
Switch branches/tags
Commits on Jun 7, 2012
Commits on Jun 6, 2012
  1. Initial import

    lennartcl committed Jun 6, 2012
Commits on Jun 5, 2012
  1. Merge remote-tracking branch 'origin/beta' into jsinfer

    lennartcl committed Jun 5, 2012
    Conflicts:
    	plugins-client/ext.code/code.js
    	plugins-client/lib.ace/www/worker/worker-coffee.js
    	plugins-client/lib.ace/www/worker/worker-css.js
    	plugins-client/lib.ace/www/worker/worker-javascript.js
    	plugins-client/lib.ace/www/worker/worker-json.js
    	plugins-client/lib.ace/www/worker/worker-xquery.js
    	plugins-client/lib.ace/www/worker/worker.js
Commits on Jun 4, 2012
  1. Merge master

    gjtorikian committed Jun 4, 2012
  2. When the revisions UI wasn't loaded, and an external file change

    zefhemel authored and gjtorikian committed Jun 1, 2012
    occurred: ERROR. This is a fix.
  3. Merge pull request #1654 from ajaxorg/console_double_notification

    Zef Hemel
    Zef Hemel committed Jun 4, 2012
    The console client plugin should not put info about the URL and port
  4. The console client plugin should not put info about the URL and port,…

    janjongboom committed Jun 4, 2012
    … the server is perfectly capable of doing that himself
  5. Merge pull request #1653 from ajaxorg/fix_broken_project_zip

    Zef Hemel
    Zef Hemel committed Jun 4, 2012
    re-added setting encoding for shell runner
  6. Merge pull request #1650 from ajaxorg/hosted_var

    Zef Hemel
    Zef Hemel committed Jun 4, 2012
    Check whether the hosted option is in the config file
  7. hosted_var

    janjongboom committed Jun 4, 2012
  8. Merge pull request #1646 from ajaxorg/revisions_better_parse

    Zef Hemel
    Zef Hemel committed Jun 4, 2012
    Revisions better parse
Commits on Jun 2, 2012
  1. Update README.md

    gjtorikian committed Jun 2, 2012
  2. Merge branch 'feature/documentation-in-code-complete' into jsinfer

    lennartcl committed Jun 2, 2012
    Conflicts:
    	configs/default.js
  3. Merge branch 'code-completion-tweaks' into feature/documentation-in-c…

    lennartcl committed Jun 2, 2012
    …ode-complete
    
    Conflicts:
    	plugins-client/ext.code/code.js
    	plugins-client/ext.language/complete.js
  4. Merge remote-tracking branch 'origin/beta' into feature/documentation…

    lennartcl committed Jun 2, 2012
    …-in-code-complete
    
    Conflicts:
    	plugins-client/lib.ace/www/worker/worker-coffee.js
    	plugins-client/lib.ace/www/worker/worker-css.js
    	plugins-client/lib.ace/www/worker/worker-javascript.js
    	plugins-client/lib.ace/www/worker/worker-json.js
    	plugins-client/lib.ace/www/worker/worker.js
Commits on Jun 1, 2012
  1. Updates for local

    gjtorikian committed Jun 1, 2012
  2. Better parse and error handling when reading revisions

    Sergi Mansilla
    Sergi Mansilla committed Jun 1, 2012
  3. Revert "Restore old scrolling logic"

    lennartcl committed Jun 1, 2012
    Restoring old scrolling logic did not fix editor window scrolling bug.
    
    This reverts commit 98c0a52.
    
    Conflicts:
    
    	plugins-client/ext.language/complete.js
  4. Revert "Restore old scrolling logic"

    lennartcl committed Jun 1, 2012
    Restoring old scrolling logic did not fix editor window scrolling bug.
    
    This reverts commit 98c0a52.
  5. Merge pull request #1643 from ajaxorg/fix_saveas_tree_update

    Zef Hemel
    Zef Hemel committed Jun 1, 2012
    * fix "Saving "New" File doesn't change filename or update tree"