Permalink
Switch branches/tags
Nothing to show
Commits on Mar 29, 2012
  1. Merge pull request #62 from szabyg/master

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

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

    halloannotate extension
    bergie committed Mar 29, 2012
  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

    Conflicts:
    	src/plugins/annotate.coffee
    Szaby Grünwald committed Mar 29, 2012
  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

    removing debug messages
    bergie committed Mar 28, 2012
  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

    Conflicts:
    	examples/hallo-min.js
    	examples/hallo.js
    	src/hallo.coffee
    Szaby Grünwald committed Mar 28, 2012
  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

    halloannotate plugin
    bergie committed Mar 28, 2012
  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…

    …ed with halloannotate
    Szaby Grünwald committed Mar 28, 2012
  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

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

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

    Conflicts:
    	src/widgets/button.coffee
    Szaby Grünwald committed Mar 28, 2012
  18. remove annotate dependencies and load them on the demo from szabyg.gi…

    …thub.com/annotate.js/lib...
    Szaby Grünwald committed Mar 28, 2012