Commit graph

4 commits

Author SHA1 Message Date
Matthias Bartelmeß
692e77b4e5 Merge branch 'feature_jquery' into use_natives
Conflicts:
	src/static/js/ace2_inner.js
	src/static/js/pluginfw/plugins.js
2012-03-16 18:50:32 +01:00
Matthias Bartelmeß
d0dd746c8b added .keys method to objects, if not supported, fixes IE issue with pluginfw 2012-03-16 18:21:28 +01:00
Matthias Bartelmeß
1cf3ffef4a added jQuery to ace2_inner, make it embeddable, ace hooks work now propertly in ace2_inner 2012-03-14 01:41:05 +01:00
Egil Moeller
73aa0687b8 Client side hooks are now loaded and works 2012-03-01 18:45:02 +01:00