summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2013-12-02Merge pull request #2017 from eloydegen/masterJohn McLear
2013-12-02Update pad.htmlEloy
2013-12-02Localisation updates from https://translatewiki.net.Siebrand Mazeland
2013-11-26Merge pull request #1999 from s1341/fix_json_is_badJohn McLear
2013-11-26add josnminify to package.jsons1341
2013-11-26have the server parse the settings file using minify and strip commass1341
2013-11-26strip off trailing commass1341
2013-11-25Merge pull request #2007 from ether/packagingJohn McLear
2013-11-25Merge pull request #2010 from ether/sticky-chat-resizeJohn McLear
2013-11-25slightly cleanerJohn McLear
2013-11-25make sticky chat mroe responsive to changes in top barJohn McLear
2013-11-24Merge pull request #2008 from s1341/add_pad_copyJohn McLear
2013-11-24move copy/move pad into a new api versions1341
2013-11-24mkdirJohn McLear
2013-11-24cp readme on buildJohn McLear
2013-11-24growwlllJohn McLear
2013-11-24whoopsiJohn McLear
2013-11-24cleanJohn McLear
2013-11-24whoa there, no need to include .git folder in buildJohn McLear
2013-11-24Merge branch 'packaging' of github.com:ether/etherpad-lite into packagingJohn McLear
2013-11-24whoopsJohn McLear
2013-11-24ignore deb and create userJohn McLear
2013-11-24semi-working build script for deb packagesJohn McLear
2013-11-22Merge pull request #2004 from ether/fix/walking-caretJohn McLear
2013-11-22Fix walking caret bugMarcel Klehr
2013-11-21Localisation updates from http://translatewiki.net.Siebrand Mazeland
2013-11-19Localisation updates from http://translatewiki.net.Siebrand Mazeland
2013-11-18Don't link to windows build from READMEMarcel Klehr
2013-11-18Merge pull request #1996 from s1341/add_pad_copyJohn McLear
2013-11-18add some documentation for move/copys1341
2013-11-18Merge pull request #1995 from s1341/add_pad_copyJohn McLear
2013-11-18fix bugs, add force option to overwrite destinations1341
2013-11-17change parameter namess1341
2013-11-17add pad copy/move API functionss1341
2013-11-14Merge pull request #1994 from ether/node11John McLear
2013-11-14support node 0.11John McLear
2013-11-12Localisation updates from http://translatewiki.net.Siebrand Mazeland
2013-11-12Update installDeps.shJohn McLear
2013-11-10Merge pull request #1990 from ether/run-path-available-in-ps-auxJohn McLear
2013-11-10allow nix file process path to be visible in ps auxJohn McLear
2013-11-08en.json: Add keyboard shortcuts for indent and outdent to translationsMarcel Klehr
2013-11-07Merge pull request #1985 from ldidry/fix/uncomplete-api-docJohn McLear
2013-11-07Forgot to bump the API versionLuc Didry
2013-11-07Merge pull request #1983 from ldidry/fix/uncomplete-api-docJohn McLear
2013-11-07Forgot a small chunck of documentation for getRevisionChangesetLuc Didry
2013-11-07Fixed #1981 - uncomplete HTTP API documentationLuc Didry
2013-11-04Localisation updates from http://translatewiki.net.Siebrand Mazeland
2013-11-02Merge pull request #1974 from ether/fix/fix-list-all-padsMarcel Klehr
2013-11-01Update padList correctlyMarcel Klehr
2013-10-28Merge branch 'pr/1789' into developMarcel Klehr