Permalink
Switch branches/tags
Nothing to show
Commits on Apr 17, 2012
  1. Some minor plugin tweaks

    bergie committed Apr 17, 2012
Commits on Apr 3, 2012
Commits on Mar 29, 2012
  1. Merge pull request #62 from szabyg/master

    bergie committed Mar 29, 2012
    fix 59
  2. Makes hallo modified, Fixes #59

    Szaby Grünwald committed Mar 29, 2012
  3. Merge pull request #61 from szabyg/master

    bergie committed Mar 29, 2012
    halloannotate extension
  4. compiled js

    Szaby Grünwald committed Mar 29, 2012
  5. Merge branch 'master' of git://github.com/bergie/hallo

    Szaby Grünwald committed Mar 29, 2012
  6. Fix button logic

    bergie committed Mar 29, 2012
  7. Merge branch 'master' of git://github.com/bergie/hallo

    Szaby Grünwald committed Mar 29, 2012
    Conflicts:
    	src/plugins/annotate.coffee
  8. refactor halloannotate

    Szaby Grünwald committed Mar 29, 2012
  9. Content cleanup hook for plugins

    Szaby Grünwald committed Mar 29, 2012
Commits on Mar 28, 2012
  1. Merging

    bergie committed Mar 28, 2012
  2. Merge pull request #56 from szabyg/master

    bergie committed Mar 28, 2012
    removing debug messages
  3. Don't query without command

    bergie committed Mar 28, 2012
  4. compiled version

    Szaby Grünwald committed Mar 28, 2012
  5. Merge branch 'master' of git://github.com/bergie/hallo

    Szaby Grünwald committed Mar 28, 2012
    Conflicts:
    	examples/hallo-min.js
    	examples/hallo.js
    	src/hallo.coffee
  6. Remove debug messages from halloannotate

    Szaby Grünwald committed Mar 28, 2012
  7. Merge branch 'master' of git://github.com/bergie/hallo

    Szaby Grünwald committed Mar 28, 2012
  8. turn off debugging in halloannotate by default

    Szaby Grünwald committed Mar 28, 2012
  9. Remove console output

    bergie committed Mar 28, 2012
  10. Merge pull request #55 from szabyg/master

    bergie committed Mar 28, 2012
    halloannotate plugin
  11. minor fix

    Szaby Grünwald committed Mar 28, 2012
  12. Merge branch 'annotate'

    Szaby Grünwald committed Mar 28, 2012
  13. Throw an human readable error if VIE is missing but hallo is configur…

    Szaby Grünwald committed Mar 28, 2012
    …ed with halloannotate
  14. Fixing, if VIE isn't loaded it doesn't break

    Szaby Grünwald committed Mar 28, 2012
  15. Merge remote branch 'bergie/master' into annotate3

    Szaby Grünwald committed Mar 28, 2012
    Conflicts:
    	src/widgets/button.coffee
  16. button widget fix

    Szaby Grünwald committed Mar 28, 2012
  17. Merge branch 'master' of git://github.com/bergie/hallo

    Szaby Grünwald committed Mar 28, 2012
    Conflicts:
    	src/widgets/button.coffee