summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Expand)Author
2013-10-12Merge branch 'develop' into release/1.2.12Marcel Klehr
2013-10-12Merge pull request #1938 from ether/fix/unknown-connection-messageMarcel Klehr
2013-10-12Drop messages from unknown connectionsMarcel Klehr
2013-10-12Don't create new pad if a non-existant read-only pad is accessedMarcel Klehr
2013-10-12Prepare releaseMarcel Klehr
2013-10-10Add explanations for more disconnect scenariosMarcel Klehr
2013-10-10Merge pull request #1927 from ether/fix/client-side-error-logging-in-server-logMarcel Klehr
2013-10-10Merge pull request #1926 from ether/fix/no-connect-to-corrupt-padMarcel Klehr
2013-10-10Polish the error messages of the easysync libMarcel Klehr
2013-10-10Polish logging of client-side errors on the serverMarcel Klehr
2013-10-10Never keep processing a changeset if it's corruptedMarcel Klehr
2013-10-10Catch errors during preparation of client varsMarcel Klehr
2013-10-10Easysync: Throw an error if an unknown attrib is refernecedMarcel Klehr
2013-10-09Merge pull request #1925 from ether/move-padlist-initJohn McLear
2013-10-09clean upJohn McLear
2013-10-09more warnsJohn McLear
2013-10-09suggestionJohn McLear
2013-10-07Filter author attribs in client_vars.historicalAuthorDataMarcel Klehr
2013-10-07Revert "do not pass historical author data to read only users"Marcel Klehr
2013-10-06remove white spaceJohn McLear
2013-10-06do not pass historical author data to read only usersJohn McLear
2013-10-05Localisation updates from http://translatewiki.net.Siebrand Mazeland
2013-10-03Merge pull request #1920 from ether/allow-err-msg-from-listpadsof-authorJohn McLear
2013-10-03allow author manager to use custom error moduleJohn McLear
2013-10-02Merge pull request #1919 from ether/make-username-show-properlyJohn McLear
2013-10-03use val not value, broken with newer jqJohn McLear
2013-09-29Merge branch 'pr/1756' into developMarcel Klehr
2013-09-29‘Etherpad Lite’ -> ‘Etherpad’Eric Schrijver
2013-09-28Merge pull request #1906 from ether/down-arrow-dont-be-weirdJohn McLear
2013-09-28Merge pull request #1902 from ether/fix/handle-message-continuationJohn McLear
2013-09-27Merge pull request #1909 from ether/dont-crash-blank-html-importJohn McLear
2013-09-27dont crash on importing blank htmlJohn McLear
2013-09-25doh, wasnt supposed to add this backgroundJohn McLear
2013-09-25more sensible reload without cache messageJohn McLear
2013-09-25sanity also control home supportJohn McLear
2013-09-25vast improvement on movement of caret due to isolation of cause of problem - ...John McLear
2013-09-23/admin/plugins: Fix search algorithm (use string match in lower case)Marcel Klehr
2013-09-23Don't stop processing changesets if there is an errorMarcel Klehr
2013-09-21strip title out of html during import, pesky abiword behaviorJohn McLear
2013-09-21Merge branch 'develop' of github.com:ether/etherpad-lite into import-button-s...John McLear
2013-09-21make export clearly seperated from importJohn McLear
2013-09-21fix padding so export icons show properlyJohn McLear
2013-09-21padding on import now buttonJohn McLear
2013-09-21dont crash on malformed HTML importJohn McLear
2013-09-21The #importsubmitinput button was too small and hidden its valueGuillaume AMAT
2013-09-21The import/export columns were not displayed correctlyGuillaume AMAT
2013-09-18API: fix createGroup for mapper endpoint for cases when a mapped group has be...Marcel Klehr
2013-09-17fix .popup CSS to fit in small spaces, like thin iframedaniel tygel
2013-09-12Beautify infinite scrollMarcel Klehr
2013-09-12Merge pull request #1882 from fviard/developMarcel Klehr