summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2011-11-25Fixed some problems with the database convertionPeter 'Pita' Martischka
2011-11-25This may fixes the pdf convert issuePeter 'Pita' Martischka
2011-11-25fixed merge confilictsPeter 'Pita' Martischka
2011-11-25Revert "This should fix the IE Cursor Issue #171"Peter 'Pita' Martischka
2011-11-25Merge branch 'master' of github.com:Pita/etherpad-litePeter 'Pita' Martischka
2011-11-25Do a reconnect on network problems. After 10s it gives upPeter 'Pita' Martischka
2011-11-25Merge pull request #232 from riseuplabs/masterJohn McLear
2011-11-25fix for #224Micah Anderson
2011-11-24Merge pull request #227 from jtlebi/origin/shift-tabJohn McLear
2011-11-24Merge pull request #228 from alx/readonly-checkboxJohn McLear
2011-11-24add checkbox to limit number of inputsAlexandre Girard
2011-11-24handle shift+tab, trivial fixJean-Tiare Le Bigot
2011-11-23Styling for the new embed optionsJohn McLear
2011-11-23Add support for embedding read only etc.John McLear
2011-11-22Fixes "I did more testing and there are a few issues that comes up. If you ty...John McLear
2011-11-22Stupid syntax error due to last minute refactoringLorenzo Gil Sanchez
2011-11-22Transform multiline HTML into a single line stream to avoid spurious lines in...Lorenzo Gil Sanchez
2011-11-21Merge pull request #220 from alx/apikey-trimJohn McLear
2011-11-21fix issue with newline in APIKEY.txt when checking api keyAlexandre Girard
2011-11-20https://github.com/Pita/etherpad-lite/issues/143 - needs to be included with ...John McLear
2011-11-20Addresses https://github.com/Pita/etherpad-lite/issues/173 but needs a lot of...John McLear
2011-11-19fixed socket.io loggingPeter 'Pita' Martischka
2011-11-19This should fix the IE Cursor Issue #171Peter 'Pita' Martischka
2011-11-19Revert "Follow Link in Pad - https://github.com/Pita/etherpad-lite/issues/143...Peter 'Pita' Martischka
2011-11-19Updated JQuery to 1.7, thx to @wikinautPeter 'Pita' Martischka
2011-11-19Merge branch 'master' of https://github.com/jhollinger/etherpad-litePeter 'Pita' Martischka
2011-11-19Fixed Joes typo commitPeter 'Pita' Martischka
2011-11-19Merge branch 'master' of https://github.com/holtzermann17/etherpad-litePeter 'Pita' Martischka
2011-11-19Merge branch 'master' of github.com:Pita/etherpad-litePeter 'Pita' Martischka
2011-11-19Fix message typosJoe Corneli
2011-11-19Follow Link in Pad - https://github.com/Pita/etherpad-lite/issues/143 -- Note...John McLear
2011-11-18Implement POST requests for HTTP APIJordan
2011-11-18Merge branch 'master' of github.com:Pita/etherpad-litePeter 'Pita' Martischka
2011-11-18Improved the READMEPeter 'Pita' Martischka
2011-11-17Merge pull request #209 from soul9/masterPeter 'Pita' Martischka
2011-11-18Update README.md and settings.json.template: use mysql or sqlite for productionJohn Soros
2011-11-17Hook the ImportHtml module into the APILorenzo Gil Sanchez
2011-11-17Main implementation of the setHTML APILorenzo Gil Sanchez
2011-11-17The contentcollector code is harder to adapt since it has the Changeset modul...Lorenzo Gil Sanchez
2011-11-17Adapt client code for its use in the serverLorenzo Gil Sanchez
2011-11-16Add jsdom as a dependency to be able to parse HTML in the serverLorenzo Gil Sanchez
2011-11-15Merge pull request #203 from andrehjr/issue187Peter 'Pita' Martischka
2011-11-15Extract getUrlVars() function calls to a local varandrehjr
2011-11-15Fix issue #182: Pad forgets usernamesandrehjr
2011-11-14Merge pull request #184 from thomasf/issue158Peter 'Pita' Martischka
2011-11-13removed unneeded old parts from buildForWindowsPeter 'Pita' Martischka
2011-11-13updated node.js version for buildForWindows Script to 0.6.1Peter 'Pita' Martischka
2011-11-13Fixed a huge problem with the sessioninfos arrayPeter 'Pita' Martischka
2011-11-13Revert "Fixing a bug that happens when a socket.io connection closes very ear...Peter 'Pita' Martischka
2011-11-13Update static/index.htmlJohn McLear