summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-12-01Localisation updates from http://translatewiki.net.Niklas Laxström
2012-11-30 a test for adding any letter from alphabet can be extended to include ↵John McLear
foreign cahrs infact please DO THIS
2012-11-30fix the control S to save a revisionJohn McLear
2012-11-30fix letter s...John McLear
2012-11-30Merge branch 'develop' of github.com:ether/etherpad-lite into developJohn McLear
2012-11-30fix path to favicon resolves #1236John McLear
2012-11-29Merge pull request #1229 from ether/control-sMarcel Klehr
catch control S and send an event to save a revision -- fixes #1128
2012-11-29Merge branch 'develop' of github.com:ether/etherpad-lite into developJohn McLear
2012-11-29Merge pull request #1233 from marcelklehr/fix/s.io-perf-with-modern-browsersJohn McLear
Let socket.io decide which transport is best for the browser
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-27Merge pull request #1218 from ether/remove-alert-on-wrapMarcel Klehr
Remove alert on line wrap (editor) -- fix #277
2012-11-27Merge pull request #1225 from disy-mk/patch-1Marcel Klehr
Correct github repo link doc/api/http_api.md
2012-11-27Update doc/api/http_api.mdManuel Knitza
As EPL moved from "Pita" to "ether" the edited link had to be changed.
2012-11-26Merge branch 'develop' of github.com:ether/etherpad-lite into developJohn McLear
2012-11-26Merge branch 'develop' of github.com:ether/etherpad-lite into ↵John McLear
remove-alert-on-wrap
2012-11-26remove alert on line wrap as it doesnt mean anythingJohn McLear
2012-11-26Merge pull request #1199 from leblanc-simon/developJohn McLear
improving the translation of the timeline
2012-11-26Merge pull request #1215 from Wikinaut/fix-rightstep-buttonJohn McLear
fix timeslider rightstep button position
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
Fix 1148 add native node https support
2012-11-24Merge pull request #1208 from joker-x/fix1203John McLear
Fix #1203: non-escaped html in plugins info
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-23chg server.key to epl-server.keyWikinaut
2012-11-23Ip => IP typo fix; +comment for SSLWikinaut
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
Fix urls, use github.com/ether
2012-11-22Fix urls, use github.com/etherHyacinthe Cartiaux
Signed-off-by: Hyacinthe Cartiaux <hyacinthe.cartiaux@uni.lu>
2012-11-21Merge pull request #1193 from kingmook/patch-1John McLear
pad.js - Gramatical fix
2012-11-21language test should pass int ravis nowjohnyma22
2012-11-21make runner CSS more sanejohnyma22
2012-11-21Merge pull request #1194 from ether/release/releases-1.2.1Marcel Klehr
release v1.2.1
2012-11-21More stuff into changelogjohnyma22
2012-11-21Update src/static/js/pad.jsMike Brousseau
Gramatically change. Changed "You're Password" to "Your Password".
2012-11-21Bump stuff to 1.2.1johnyma22
2012-11-21Actually fix the language tests...John McLear
2012-11-21Merge branch 'develop' of github.com:ether/etherpad-lite into developJohn McLear
2012-11-21Merge pull request #1188 from joker-x/masterJohn McLear
Allow ! in pads urls
2012-11-21Fix tests to run on IE8 etc.John McLear
A bit more fragile but so is the life of supporting older browsers.
2012-11-21Test for PR 1188John McLear
https://github.com/ether/etherpad-lite/pull/1188
2012-11-21Merge branch 'develop' of github.com:ether/etherpad-lite into developJohn McLear
Conflicts: README.md
2012-11-21Merge pull request #1192 from marcelklehr/fix/l10n-ie-bugJohn McLear
Fix #1186 Autodetection wouldn't work correctly in IE9
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
Localisation updates from http://translatewiki.net.
2012-11-20Use ; as comments indicator in i18n filesMarcel Klehr
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 00:20:02 +0000