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 |
|
Iván Eixarch
|
795a20b3f2
|
get languages availables through translatewiki API
|
2012-11-28 23:54:23 +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 |
|
Iván Eixarch
|
9ec8a6e3d3
|
back to globalize... don't work :S
|
2012-11-28 04:02:55 +01:00 |
|
Iván Eixarch
|
1cc0e8cbf0
|
Restore original ini file
|
2012-11-28 03:27:09 +01:00 |
|
Iván Eixarch
|
523c7aebe5
|
Merge remote branch 'ether/develop' into develop
|
2012-11-28 03:13:04 +01:00 |
|
John McLear
|
c445197e7f
|
Update src/static/css/pad.css
|
2012-11-27 15:10:36 +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 |
|
Iván Eixarch
|
97d77ea089
|
added my name in header
|
2012-11-27 00:11:45 +01:00 |
|
John McLear
|
edb1a3c481
|
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
|
2012-11-26 14:49:08 -08:00 |
|
Iván Eixarch
|
6fe6103632
|
added languages for translatewiki
|
2012-11-26 23:40:31 +01:00 |
|
Iván Eixarch
|
7280376a26
|
Merge with ether develop
|
2012-11-26 22:11:31 +01:00 |
|
John McLear
|
f880473360
|
remember the styling for the pasword prompt
|
2012-11-26 20:54:28 +00:00 |
|
John McLear
|
fddca354b3
|
proper fix for focus and some styling of the form and allows for pressing enter on form so generally a better fix
|
2012-11-26 20:52:10 +00: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 |
|
Marcel Klehr
|
103e0f6747
|
Add the basic structure of a timeslider test
|
2012-11-26 21:15:10 +01: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 |
|
Iván Eixarch
|
d7cca602df
|
Added message translatable about features importing without abiword
|
2012-11-26 03:18:47 +01:00 |
|
Iván Eixarch
|
460200981e
|
Merge remote branch 'ether/develop'
|
2012-11-26 02:21:18 +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 |
|
Iván Eixarch
|
ef7590fb73
|
Fix 1203: non-escaped html in plugins info
|
2012-11-24 00:26:48 +01:00 |
|
Iván Eixarch
|
0250f8d55c
|
Merge remote branch 'ether/develop'
|
2012-11-23 22:57:05 +01:00 |
|
Iván Eixarch
|
cc60b82a6e
|
Import html by default and allow basic import/export features without abiword
|
2012-11-23 22:55:25 +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 |
|
Iván Eixarch
|
ef3231efd2
|
cleaning
|
2012-11-23 19:06:18 +01:00 |
|
Iván Eixarch
|
d0a17d5471
|
test import converting to html instead to txt by default
|
2012-11-23 18:18:03 +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 |