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 |
|
Iván Eixarch
|
97d77ea089
|
added my name in header
|
2012-11-27 00:11:45 +01: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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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
|
34df9d651e
|
Merge pull request #1188 from joker-x/master
Allow ! in pads urls
|
2012-11-21 09:53:58 -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
|
beb5bf4d7d
|
Merge remote branch 'ether/develop'
|
2012-11-21 03:37:42 +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 |
|
Marcel Klehr
|
4053ab2dfa
|
Clarify English strings and rephrase some stupid-sounding messages.
|
2012-11-20 21:35:06 +01:00 |
|
Iván Eixarch
|
1e71797ad5
|
Replace Globalize with languages module
|
2012-11-20 19:46:17 +01:00 |
|
Sarhan Aissi
|
67de23225a
|
Fix typo in pad.toolbar.clearAuthorship.title string in fr.ini
|
2012-11-18 16:44:59 +01:00 |
|
John McLear
|
d6c0f96084
|
Merge pull request #1177 from marcelklehr/fix/optimize-l10n-loading-times
optimize l10n loading times
|
2012-11-17 07:31:21 -08:00 |
|
John McLear
|
73eafb92c2
|
Merge pull request #1178 from marcelklehr/fix/tests
Fix/tests
|
2012-11-17 07:31:03 -08:00 |
|
Marcel Klehr
|
364e6928b5
|
Make tests work on windows
|
2012-11-17 16:28:54 +01:00 |
|
Marcel Klehr
|
5baef07b55
|
Load l10n.js first but asynchronusly
|
2012-11-17 15:28:33 +01:00 |
|
Marcel Klehr
|
e131f60071
|
Serve English strings directly with /locales.ini
|
2012-11-17 14:33:01 +01:00 |
|