summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Expand)Author
2012-12-02removed wrong comment in Settings.jsWikinaut
2012-12-02add socketTransportProtocols parameterWikinaut
2012-12-02Localisation updates from http://translatewiki.net.Siebrand Mazeland
2012-12-01Localisation updates from http://translatewiki.net.Niklas Laxström
2012-11-30fix the control S to save a revisionJohn McLear
2012-11-30fix letter s...John McLear
2012-11-30fix path to favicon resolves #1236John McLear
2012-11-29Merge pull request #1229 from ether/control-sMarcel Klehr
2012-11-29Merge pull request #1233 from marcelklehr/fix/s.io-perf-with-modern-browsersJohn McLear
2012-11-29Let socket.io decide which transport is best for the browserMarcel Klehr
2012-11-28remove control S commentJohn McLear
2012-11-28catch control S and send an event to save a revisionJohn McLear
2012-11-26Merge branch 'develop' of github.com:ether/etherpad-lite into remove-alert-on...John McLear
2012-11-26remove alert on line wrap as it doesnt mean anythingJohn McLear
2012-11-26Merge pull request #1199 from leblanc-simon/developJohn McLear
2012-11-26fix timeslider rightstep button positionWikinaut
2012-11-25Localisation updates from http://translatewiki.net.Niklas Laxström
2012-11-24Merge pull request #1202 from Wikinaut/fix-1148-add-native-node-https-supportJohn McLear
2012-11-24Fixed installed plugins section in plugins/infoIván Eixarch
2012-11-24Fix 1203: non-escaped html in plugins infoIván Eixarch
2012-11-23improving the translation of the timelineSimon Leblanc
2012-11-22initial https version fix #1148Wikinaut
2012-11-21Merge pull request #1197 from hcartiaux/urlfixJohn McLear
2012-11-22Fix urls, use github.com/etherHyacinthe Cartiaux
2012-11-21Merge pull request #1193 from kingmook/patch-1John McLear
2012-11-21Update src/static/js/pad.jsMike Brousseau
2012-11-21Bump stuff to 1.2.1johnyma22
2012-11-21Merge pull request #1188 from joker-x/masterJohn McLear
2012-11-21Fix #1186 Autodetection wouldn't work correctly in IE9Marcel Klehr
2012-11-21Allow ! in urls autodetectionIván Eixarch
2012-11-20Merge pull request #1185 from Nikerabbit/developMarcel Klehr
2012-11-20Use ; as comments indicator in i18n filesMarcel Klehr
2012-11-20Localisation updates from http://translatewiki.net.Niklas Laxström
2012-11-20Clarify English strings and rephrase some stupid-sounding messages.Marcel Klehr
2012-11-20Replace Globalize with languages moduleIván Eixarch
2012-11-18Fix typo in pad.toolbar.clearAuthorship.title string in fr.iniSarhan Aissi
2012-11-17Merge pull request #1177 from marcelklehr/fix/optimize-l10n-loading-timesJohn McLear
2012-11-17Merge pull request #1178 from marcelklehr/fix/testsJohn McLear
2012-11-17Make tests work on windowsMarcel Klehr
2012-11-17Load l10n.js first but asynchronuslyMarcel Klehr
2012-11-17Serve English strings directly with /locales.iniMarcel Klehr
2012-11-17Fix #1115 correctly reference session cookieMarcel Klehr
2012-11-16Fix examples url in settings.html to use ether/ Sarhan Aissi
2012-11-15fixed label languagueIván Eixarch
2012-11-15Traducción al castellano/Spanish translationIván Eixarch
2012-11-14Fix version number in changelog and package.jsonMarcel Klehr
2012-11-14Sigh. I must have forgotten to commit this.. John McLear
2012-11-14fix README to use ether/johnyma22
2012-11-14Merge pull request #1159 from marcelklehr/fix/lang-autodetectionJohn McLear
2012-11-14Merge pull request #1152 from marcelklehr/fix/updatePadClients-errorJohn McLear