John McLear
c445197e7f
Update src/static/css/pad.css
2012-11-27 15:10:36 +00: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
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
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
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
Marcel Klehr
a39faf9368
Fix #1115 correctly reference session cookie
2012-11-17 14:19:09 +01:00
Sarhan Aissi
716aa13a79
Fix examples url in settings.html to use ether/
2012-11-16 10:39:38 +01:00
Iván Eixarch
dd845f7731
fixed label languague
2012-11-15 13:41:44 +01:00
Iván Eixarch
ce371235b3
Traducción al castellano/Spanish translation
2012-11-15 11:44:31 +01:00
Marcel Klehr
6d2391dba6
Fix version number in changelog and package.json
2012-11-14 22:02:40 +01:00
John McLear
ae2fee8be8
Sigh. I must have forgotten to commit this..
...
Apologies.
2012-11-14 19:38:17 +00:00
johnyma22
8b50f194a3
fix README to use ether/
2012-11-14 19:26:37 +00:00
John McLear
68b1d78f32
Merge pull request #1159 from marcelklehr/fix/lang-autodetection
...
Fix language auto-detection
2012-11-14 10:58:07 -08:00
John McLear
a3ff346547
Merge pull request #1152 from marcelklehr/fix/updatePadClients-error
...
PadMessageHandler: Make sure sessioninfos[session] still exists before p...
2012-11-14 10:44:30 -08:00
Marcel Klehr
b416402f10
Fix language auto-detection
2012-11-14 19:38:35 +01:00
0ip
dcff0d74ef
Fix Timeslider translation not showing up
2012-11-14 19:31:09 +01:00
Marcel Klehr
37450340ee
Fix typo in timeslider.pageTitle string in french translation
2012-11-14 18:05:51 +01:00
0ip
b69396d5a0
Fix French locale une autre fois
2012-11-14 17:29:06 +01:00
0ip
d65460a409
Add missing colon in fr-locale
2012-11-14 17:15:28 +01:00
0ip
440804ce0b
Update French localization
2012-11-14 17:13:19 +01:00
Marcel Klehr
f5563ab704
Move locale detection to the client
...
* l10n.js is doing locale detection already, so
we shouldn't interfere but help it do its job
* this should also fix the ?lang embed parameter
* Set language from cookie on page init for l10n
to load the right translation
2012-11-14 17:01:59 +01:00
Marcel Klehr
ffb7cf47f2
Mate timslider page title translateable
2012-11-14 15:31:43 +01:00
0ip
6b6315ca3c
Tidy up settings
2012-11-14 14:26:49 +01:00
John McLear
2d31d3fc46
add colon to language
2012-11-14 12:20:41 +00:00
John McLear
2657f06887
Merge branch 'develop' of github.com:Pita/etherpad-lite into feature/i18n
2012-11-14 10:19:52 +00:00
John McLear
838a1e3d69
just export on timeslider, no import..
2012-11-14 09:31:27 +00:00
John McLear
0e6a701f92
Update src/templates/timeslider.html
2012-11-14 09:20:16 +00:00
John McLear
e0935d9e25
Update src/locales/fr.ini
2012-11-13 20:09:02 +00:00
