summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Expand)Author
2012-03-26Merge pull request #556 from fourplusone/feature_jqueryJohn McLear
2012-03-24fixed error foreach error in timeslider.jsMatthias Bartelmeß
2012-03-24proceed if plugin-definitions.json didn't load properlyMatthias Bartelmeß
2012-03-24Send the Content-Type header for plugin-definitions.json in the right formatMatthias Bartelmeß
2012-03-23added underscore to tar.jsonMatthias Bartelmeß
2012-03-23corrected underscore path in hooksMatthias Bartelmeß
2012-03-23re-enabled maxAge setting. maxAge is now in seconds, not milliseconds.Matthias Bartelmeß
2012-03-17use underscore.jsMatthias Bartelmeß
2012-03-16Merge branch 'feature_jquery' into use_nativesMatthias Bartelmeß
2012-03-16added .keys method to objects, if not supported, fixes IE issue with pluginfwMatthias Bartelmeß
2012-03-16Merge branch 'fix_crashes' into use_nativesMatthias Bartelmeß
2012-03-14removing fixEvent which is not used anymoreMatthias Bartelmeß
2012-03-14added map and forEach which were accidentally removedMatthias Bartelmeß
2012-03-14added jQuery to ace2_inner, make it embeddable, ace hooks work now propertly ...Matthias Bartelmeß
2012-03-14check if sockets are available in PadMessageHandlerMatthias Bartelmeß
2012-03-14smashing errors caused by .forEachMatthias Bartelmeß
2012-03-13map / forEach use native impl, if available. ace2_common extends the prototyp...Matthias Bartelmeß
2012-03-11Merge git://github.com/Gared/etherpad-lite into developPeter 'Pita' Martischka
2012-03-11Merge remote-tracking branch 'main/master' into developChad Weider
2012-03-10Merge branch 'plugin-fix-require' into pluginChad Weider
2012-03-10Migrate tar to use library paths.Chad Weider
2012-03-10Correct indentation.Chad Weider
2012-03-10These definitions have no need to be inside this closure.Chad Weider
2012-03-10Correct ca91c0c4032658d428fadbb8f178fb52be3ac471.Chad Weider
2012-03-10Avoid orphaned cache files from breaking the caching layer.Chad Weider
2012-03-10Correct cache location and guard against bad directories.Chad Weider
2012-03-10Merge branch 'require-paths' into pluginChad Weider
2012-03-10Minify implements virtual plugins resources.Chad Weider
2012-03-10Change paths.Chad Weider
2012-03-10Correct paths to reflect their being libraries.Chad Weider
2012-03-10Remove unnecessary line.Chad Weider
2012-03-10Remove require code that is unnecessary and/or incorrect.Chad Weider
2012-03-10Remove require changes in `pushScriptsTo` method.Chad Weider
2012-03-10This is duplicated by the contents of static.Chad Weider
2012-03-04Fixing client side require, the minify code is completly unused now, very ugl...Peter 'Pita' Martischka
2012-03-04Fix configuration of expressPeter 'Pita' Martischka
2012-03-04Output nicer exceptions in hook callPeter 'Pita' Martischka
2012-03-04Fix gitignore for custom filesPeter 'Pita' Martischka
2012-03-02Added the rejected/conflicting files as .rej-files so they're not forgotten b...Egil Moeller
2012-03-02Merge branch 'pita'Egil Moeller
2012-03-01Fixed timeslider which I broke a few minutes agoEgil Moeller
2012-03-01Made ace actually use the new hooks system, and removed remnants of old systemEgil Moeller
2012-03-01Removed old pluginfw stuffEgil Moeller
2012-03-01Client side hooks are now loaded and worksEgil Moeller
2012-02-29Send plugin data to clientEgil Moeller
2012-02-29Bugfix for dependency data circleEgil Moeller
2012-02-28Removed CommonCode entierlyEgil Moeller
2012-02-28So simple, yet so hard to find. Finally I found you, oh error caused by the n...Egil Moeller
2012-02-28Partial bugfixEgil Moeller
2012-02-26Merge branch 'temo'Egil Moeller