libretic/etherpad-lite
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
2264 commits 2 branches 0 tags 24 MiB
Commit graph

2264 commits

This branch
This branch
All branches
Author SHA1 Message Date
John McLear
eb93ce2aa6 a test for adding any letter from alphabet can be extended to include foreign cahrs infact please DO THIS 2012-11-30 23:33:22 +00:00
John McLear
3dcbd8dd4e fix the control S to save a revision 2012-11-30 23:28:34 +00:00
John McLear
a4c4d11cd4 fix letter s... 2012-11-30 15:26:51 -08:00
John McLear
2fe31bc618 Merge branch 'develop' of github.com:ether/etherpad-lite into develop 2012-11-30 15:19:47 -08:00
John McLear
d761003588 fix path to favicon resolves #1236 2012-11-30 22:50:54 +00:00
Marcel Klehr
ab148ebc1a Merge pull request #1229 from ether/control-s 
catch control S and send an event to save a revision -- fixes #1128
 2012-11-29 08:57:10 -08:00
John McLear
11af9228db Merge branch 'develop' of github.com:ether/etherpad-lite into develop 2012-11-29 07:29:30 -08:00
John McLear
53d6d0813e Merge pull request #1233 from marcelklehr/fix/s.io-perf-with-modern-browsers 
Let socket.io decide which transport is best for the browser
 2012-11-29 06:55:51 -08:00
Marcel Klehr
719fb7e045 Let socket.io decide which transport is best for the browser 2012-11-29 13:42:37 +01:00
John McLear
93e9d7c852 remove control S comment 2012-11-28 17:20:58 +00:00
John McLear
8c7939ec9f catch control S and send an event to save a revision 2012-11-28 17:17:35 +00:00
Marcel Klehr
182ea62de9 Merge pull request #1218 from ether/remove-alert-on-wrap 
Remove alert on line wrap (editor) -- fix #277
 2012-11-27 06:22:28 -08:00
Marcel Klehr
df8207e0df Merge pull request #1225 from disy-mk/patch-1 
Correct github repo link doc/api/http_api.md
 2012-11-27 06:09:04 -08:00
Manuel Knitza
bf26f60bac Update doc/api/http_api.md 
As EPL moved from "Pita" to "ether" the edited link had to be changed.
 2012-11-27 09:59:47 +01:00
John McLear
edb1a3c481 Merge branch 'develop' of github.com:ether/etherpad-lite into develop 2012-11-26 14:49:08 -08:00
John McLear
b66c9135f7 Merge branch 'develop' of github.com:ether/etherpad-lite into remove-alert-on-wrap 2012-11-26 20:20:21 +00:00
John McLear
6239c66e36 remove alert on line wrap as it doesnt mean anything 2012-11-26 20:19:27 +00:00
John McLear
491bf515c6 Merge pull request #1199 from leblanc-simon/develop 
improving the translation of the timeline
 2012-11-26 11:48:08 -08:00
John McLear
064bafe973 Merge pull request #1215 from Wikinaut/fix-rightstep-button 
fix timeslider rightstep button position
 2012-11-26 01:03:20 -08:00
Wikinaut
a49bab5dae fix timeslider rightstep button position 2012-11-26 08:54:13 +01:00
Niklas Laxström
de5a90b9c7 Localisation updates from http://translatewiki.net. 2012-11-25 12:52:08 +00:00
John McLear
fdf0b1a384 Merge pull request #1202 from Wikinaut/fix-1148-add-native-node-https-support 
Fix 1148 add native node https support
 2012-11-24 16:35:02 -08:00
John McLear
22c6fd0886 Merge pull request #1208 from joker-x/fix1203 
Fix #1203: non-escaped html in plugins info
 2012-11-24 10:16:52 -08:00
Iván Eixarch
6d5907562d Fixed installed plugins section in plugins/info 2012-11-24 03:18:22 +01:00
Iván Eixarch
8ac49477f9 Fix 1203: non-escaped html in plugins info 2012-11-24 00:42:44 +01:00
Wikinaut
43980ffe11 chg server.key to epl-server.key 2012-11-23 21:18:05 +01:00
Wikinaut
e8bca8ea04 Ip => IP typo fix; +comment for SSL 2012-11-23 21:15:52 +01:00
Simon Leblanc
94e9cf0a32 improving the translation of the timeline 2012-11-23 06:20:09 +01:00
Wikinaut
eed6b752d4 initial https version fix #1148 2012-11-22 10:12:58 +01:00
John McLear
1899e3f48d Merge pull request #1197 from hcartiaux/urlfix 
Fix urls, use github.com/ether
 2012-11-21 16:22:21 -08:00
Hyacinthe Cartiaux
d6027726e6
Fix urls, use github.com/ether 
Signed-off-by: Hyacinthe Cartiaux <hyacinthe.cartiaux@uni.lu>
 2012-11-22 01:12:30 +01:00
John McLear
a662db222f Merge pull request #1193 from kingmook/patch-1 
pad.js - Gramatical fix
 2012-11-21 14:42:12 -08:00
johnyma22
aebf6ee1e8 language test should pass int ravis now 2012-11-21 22:22:01 +00:00
johnyma22
28cd6e64b3 make runner CSS more sane 2012-11-21 20:09:31 +00:00
Marcel Klehr
e02054d6fe Merge pull request #1194 from ether/release/releases-1.2.1 
release v1.2.1
 2012-11-21 11:29:02 -08:00
johnyma22
a75d17f55a More stuff into changelog 2012-11-21 18:48:33 +00:00
Mike Brousseau
196aafd9d6 Update src/static/js/pad.js 
Gramatically change. Changed "You're Password" to "Your Password".
 2012-11-21 13:35:47 -05:00
johnyma22
064051a30d Bump stuff to 1.2.1 2012-11-21 18:20:54 +00:00
John McLear
122093904f Actually fix the language tests... 2012-11-21 18:14:05 +00:00
John McLear
067e02e9d0 Merge branch 'develop' of github.com:ether/etherpad-lite into develop 2012-11-21 10:00:19 -08:00
John McLear
34df9d651e Merge pull request #1188 from joker-x/master 
Allow ! in pads urls
 2012-11-21 09:53:58 -08:00
John McLear
db5119f798 Fix tests to run on IE8 etc. 
A bit more fragile but so is the life of supporting older browsers.
 2012-11-21 17:53:46 +00:00
John McLear
2260b1fc62 Test for PR 1188 
https://github.com/ether/etherpad-lite/pull/1188
 2012-11-21 17:52:10 +00:00
John McLear
8d0d71eddb Merge branch 'develop' of github.com:ether/etherpad-lite into develop 
Conflicts:
	README.md
 2012-11-21 09:10:54 -08:00
John McLear
4fb46c0063 Merge pull request #1192 from marcelklehr/fix/l10n-ie-bug 
Fix #1186 Autodetection wouldn't work correctly in IE9
 2012-11-21 08:46:14 -08:00
Marcel Klehr
dcb3da829d Fix #1186 Autodetection wouldn't work correctly in IE9 2012-11-21 17:45:01 +01:00
Iván Eixarch
0c70ada9d7 Allow ! in urls autodetection 2012-11-21 03:35:49 +01:00
Marcel Klehr
a6cbcc9d51 Merge pull request #1185 from Nikerabbit/develop 
Localisation updates from http://translatewiki.net.
 2012-11-20 13:11:30 -08:00
Marcel Klehr
8a23c2ff50 Use ; as comments indicator in i18n files 2012-11-20 22:08:42 +01:00
Niklas Laxström
4e18df45c6 Localisation updates from http://translatewiki.net. 2012-11-20 20:47:34 +00:00