summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2012-02-28Check error not stats.Chad Weider
2012-02-28Merge pull request #519 from 0ip/cssfix20ip
2012-02-28typos0ip
2012-02-28properly display number of users when more than 99 are on a pad + added ids +...0ip
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-27Add a hack to prevent redirect of requests for `/static/js/pad` to `/static/j...Chad Weider
2012-02-27Merge pull request #514 from 0ip/cssfix0ip
2012-02-27fix weird looking input [IE7]0ip
2012-02-27more subtle ui feedback when pressing buttons0ip
2012-02-27combined css class0ip
2012-02-27revert viewport to fix #5080ip
2012-02-27update dependenciesPeter 'Pita' Martischka
2012-02-27@cweider, only Chuck Norris can compute in json filesPeter 'Pita' Martischka
2012-02-27Merge pull request #468 from cweider/minify-simplifyPeter 'Pita' Martischka
2012-02-27Merge branch 'master' of github.com:Pita/etherpad-litePeter 'Pita' Martischka
2012-02-27Removed all window.unload event handlers. This kind of fixes #200Peter 'Pita' Martischka
2012-02-27Merge pull request #511 from Gared/masterJohn McLear
2012-02-27Added cookie to save option showing author colorsStefan 'Gared
2012-02-27Merge branch 'master' of http://github.com/Pita/etherpad-liteStefan 'Gared
2012-02-27Fixed #299 and #338Peter 'Pita' Martischka
2012-02-27Fix doesPadExist checkPeter 'Pita' Martischka
2012-02-27Merge branch 'master' of github.com:Pita/etherpad-litePeter 'Pita' Martischka
2012-02-27restart abiword on crash and give the user feedback about bad import filesPeter 'Pita' Martischka
2012-02-26Merge branch 'master' of github.com:Pita/etherpad-liteJohn McLear
2012-02-26Merge branch 'master' of http://github.com/Pita/etherpad-liteStefan 'Gared
2012-02-26fix #507 import showing when it shouldntJohn McLear
2012-02-26Merge branch 'temo'Egil Moeller
2012-02-26Minify now supports pluginsEgil Moeller
2012-02-26Merge branch 'master' of http://github.com/Pita/etherpad-liteStefan 'Gared
2012-02-26Merge pull request #506 from jucovschi/changeset_docsJohn McLear
2012-02-26more doc updateConstantin Jucovschi
2012-02-26Forbid colons, this Fixes #301Peter 'Pita' Martischka
2012-02-26Merge branch 'master' of github.com:Pita/etherpad-liteJohn McLear
2012-02-26First stab at getting client side require(plugin/..) to work from within ethe...Egil Moeller
2012-02-26Revert "drop embedding of JS/CSS files in ace.js. May result in a little perf...Peter 'Pita' Martischka
2012-02-26Merge branch 'master' of github.com:Pita/etherpad-liteJohn McLear
2012-02-26Revert "drop embedding of JS/CSS files in ace.js. May result in a little perf...John McLear
2012-02-26require(ep_pluginname/static/blabla); now works both on client and serverEgil Moeller
2012-02-26I suck at md.John McLear
2012-02-26Update README.mdJohn McLear
2012-02-26Update README.mdJohn McLear
2012-02-26added paypal donation point...John McLear
2012-02-26Added foundation flattr account.John McLear
2012-02-26Bugfix for git version extraction codeEgil Moeller
2012-02-26Merge pull request #505 from jucovschi/changeset_docsPeter 'Pita' Martischka
2012-02-26Perma fix for issue #485 and #327John McLear
2012-02-26some new docsConstantin Jucovschi
2012-02-26more docsConstantin Jucovschi