summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2013-02-13Update README.mdJohn McLear
2013-02-13Bitcoin yo.John McLear
2013-02-13Merge pull request #1518 from eldiddio/fix-typoJohn McLear
2013-02-13Fixed typo thats made server hangMark Fisher
2013-02-13Merge pull request #1512 from disy-mk/patch-3Marcel Klehr
2013-02-13Update Ueber DB to fix MySQL Bug!John McLear
2013-02-12Update doc/api/http_api.mdManuel Knitza
2013-02-12Update src/node/handler/APIHandler.jsManuel Knitza
2013-02-12Update src/node/hooks/express/apicalls.jsManuel Knitza
2013-02-12Merge pull request #1505 from ether/fix-for-long-stringsJohn McLear
2013-02-12Merge pull request #1507 from ether/ace2_inner-fixJohn McLear
2013-02-12fix issue where opera was doing stupid things but still an issue w/ double ta...John McLear
2013-02-12Update bin/loadTesting/READMEJohn McLear
2013-02-12Bump to latest ueber to support sqliteJohn McLear
2013-02-12a commentJohn McLear
2013-02-12very simple fix that might break other things but stops the caret focus being...John McLear
2013-02-11Merge pull request #1504 from ether/feature/bringJqueryBackJohn McLear
2013-02-11Merge pull request #1503 from ether/feature/ffFixesJohn McLear
2013-02-11Checked JQuery back in. Temporary fix for #1499Peter 'Pita' Martischka
2013-02-11Brought scheduler back completly, fixes #1502Peter 'Pita' Martischka
2013-02-10Merge pull request #1495 from disy-mk/patch-1John McLear
2013-02-11Explicitly log creation of padManuel Knitza
2013-02-10Merge pull request #1487 from ether/dep-cleanupJohn McLear
2013-02-10Merge pull request #1494 from ether/feature/browserTestsJohn McLear
2013-02-10Merge branch 'develop' of github.com:ether/etherpad-lite into dep-cleanupPeter 'Pita' Martischka
2013-02-10Revert "no longer dep on npm as it's native"Peter 'Pita' Martischka
2013-02-10Windows and Mobile tests should be case insensitivePeter 'Pita' Martischka
2013-02-10Merge pull request #1493 from ether/feature/fixtestsJohn McLear
2013-02-10Make iframe selectors work with jquery 1.9Peter 'Pita' Martischka
2013-02-10Made jquery browser usable in testframeworkPeter 'Pita' Martischka
2013-02-10Merge pull request #1492 from ether/feature/cleanupJohn McLear
2013-02-10replaced opera regex check with jquery browser checkPeter 'Pita' Martischka
2013-02-10removed hack, because its uncessary now that scheduler is backPeter 'Pita' Martischka
2013-02-10bit of info about depsJohn McLear
2013-02-10begin putting files together for a releaseJohn McLear
2013-02-10Moved old jquery recognition to seperate filePeter 'Pita' Martischka
2013-02-10jquery shouldn't be checked inPeter 'Pita' Martischka
2013-02-10Localisation updates from http://translatewiki.net.Siebrand Mazeland
2013-02-10a bit fairerJohn McLear
2013-02-10Merge pull request #1486 from ether/please-wait-msgJohn McLear
2013-02-10change messageJohn McLear
2013-02-10Reformat access log messages to improve readabilityMarcel Klehr
2013-02-10Merge pull request #1489 from marcelklehr/feature/log-client-ipsJohn McLear
2013-02-10Log the client ip on pad access with logger 'access'Marcel Klehr
2013-02-10Merge pull request #1485 from ether/readme-placeholderJohn McLear
2013-02-10Merge pull request #1477 from ether/fix-opera-double-enterMarcel Klehr
2013-02-10no longer dep on npm as it's nativeJohn McLear
2013-02-10no need for jshint and update wdJohn McLear
2013-02-10please wait msgJohn McLear
2013-02-10remove one less warning during install by having a readme placeholderJohn McLear