Permalink
Commits on Apr 12, 2012
  1. Merge pull request #707 from justjohn/master

    fjakobs committed Apr 12, 2012
    LESS syntax highlighting support
  2. package

    fjakobs committed Apr 12, 2012
  3. - add animated scrolling to the demo

    fjakobs committed Apr 12, 2012
    - fix infinite loop
    - fix some typos
  4. package

    fjakobs committed Apr 12, 2012
  5. package

    fjakobs committed Apr 11, 2012
  6. scroll selection into view only after find/replace

    nightwing authored and fjakobs committed Apr 8, 2012
    Conflicts:
    
    	lib/ace/editor.js
  7. package

    fjakobs committed Apr 11, 2012
  8. remove corner element

    fjakobs committed Apr 11, 2012
Commits on Apr 11, 2012
  1. * Fixed merge oops

    javruben committed Apr 11, 2012
  2. Merge pull request #712 from nightwing/subpixel

    fjakobs committed Apr 11, 2012
    Subpixel positioning
  3. fix failing test

    nightwing committed Apr 11, 2012
  4. Merge pull request #591 from okonomiyaki3000/master

    fjakobs committed Apr 11, 2012
    Numer of items replaced
  5. use getBoundingClientRect for measuring text size

    nightwing committed Apr 11, 2012
       needed because on chrome 17+ line heights can be fractional
  6. small cleanup

    nightwing committed Apr 11, 2012
  7. fix unit test

    fjakobs committed Apr 11, 2012
  8. Merge branch 'feature/shadowgutter'

    fjakobs committed Apr 11, 2012
    Conflicts:
    	build/kitchen-sink.html
    	build/src/ace-noconflict.js
    	build/src/ace.js
    	lib/ace/virtual_renderer.js
  9. coding styles

    fjakobs committed Apr 11, 2012
  10. update themes

    fjakobs committed Apr 11, 2012
  11. Merge pull request #699 from danyaPostfactum/master

    fjakobs committed Apr 11, 2012
    xml entity support, doctype declaration is marked as "xml_re", not "meta.tag"
Commits on Apr 10, 2012
  1. Merge pull request #693 from ajaxorg/feature/animscroll

    gjtorikian committed Apr 10, 2012
    * Added animation for scrolling for find and gotoline
  2. Merge master

    gjtorikian committed Apr 10, 2012
  3. Remove unneeded todo

    gjtorikian committed Apr 10, 2012
Commits on Apr 9, 2012
  1. Merge pull request #700 from ajaxorg/highlighting/js

    fjakobs committed Apr 9, 2012
    Fix highlighting rules for JS
Commits on Apr 8, 2012
  1. * Merged with master

    javruben committed Apr 8, 2012
    * Built ace
    
    Merge branch 'master' of github.com:ajaxorg/ace into feature/animscroll
    
    Conflicts:
    	build/kitchen-sink.html
    	build/src/ace-noconflict.js
    	build/src/ace.js
    	build/src/mode-c_cpp-noconflict.js
    	build/src/mode-c_cpp.js
    	build/src/mode-clojure-noconflict.js
    	build/src/mode-clojure.js
    	build/src/mode-coldfusion-noconflict.js
    	build/src/mode-coldfusion.js
    	build/src/mode-csharp-noconflict.js
    	build/src/mode-csharp.js
    	build/src/mode-css-noconflict.js
    	build/src/mode-css.js
    	build/src/mode-groovy-noconflict.js
    	build/src/mode-groovy.js
    	build/src/mode-haxe-noconflict.js
    	build/src/mode-haxe.js
    	build/src/mode-html-noconflict.js
    	build/src/mode-html.js
    	build/src/mode-java-noconflict.js
    	build/src/mode-java.js
    	build/src/mode-javascript-noconflict.js
    	build/src/mode-javascript.js
    	build/src/mode-json-noconflict.js
    	build/src/mode-json.js
    	build/src/mode-markdown-noconflict.js
    	build/src/mode-markdown.js
    	build/src/mode-php-noconflict.js
    	build/src/mode-php.js
    	build/src/mode-powershell-noconflict.js
    	build/src/mode-powershell.js
    	build/src/mode-scad-noconflict.js
    	build/src/mode-scad.js
    	build/src/mode-scala-noconflict.js
    	build/src/mode-scala.js
    	build/src/mode-svg-noconflict.js
    	build/src/mode-svg.js
    	build/src/mode-xml-noconflict.js
    	build/src/mode-xml.js
  2. Merged from master

    javruben committed Apr 8, 2012
  3. * Build ace

    javruben committed Apr 8, 2012