8a9045b335
remove ssl not enabled message
2012-12-02 18:33:31 +00:00
0d2eddb62a
console.debug socketTransportProtocols
2012-12-02 18:54:30 +01:00
9224e9beef
removed wrong comment in Settings.js
2012-12-02 18:44:39 +01:00
8b044254cc
add socketTransportProtocols parameter
2012-12-02 18:28:28 +01:00
a74defdab7
Merge branch 'focus-on-password' of github.com:ether/etherpad-lite into focus-on-password
2012-12-02 17:07:23 +00:00
c9a5e55654
Merge branch 'develop' of github.com:ether/etherpad-lite into focus-on-password
2012-12-02 17:06:33 +00:00
3cdf66c2f7
first effort to move into templates but javascript is broken so dont pull
2012-12-02 17:03:56 +00:00
e9e4d65ad4
Localisation updates from http://translatewiki.net .
2012-12-02 12:35:02 +00:00
b0b64358f9
Merge remote branch 'ether/develop' into develop
2012-12-02 05:57:14 +01:00
d4b79a6cba
Localisation updates from http://translatewiki.net .
2012-12-01 11:32:26 +00:00
3dcbd8dd4e
fix the control S to save a revision
2012-11-30 23:28:34 +00:00
a4c4d11cd4
fix letter s...
2012-11-30 15:26:51 -08:00
d761003588
fix path to favicon resolves #1236
2012-11-30 22:50:54 +00:00
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
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
719fb7e045
Let socket.io decide which transport is best for the browser
2012-11-29 13:42:37 +01:00
795a20b3f2
get languages availables through translatewiki API
2012-11-28 23:54:23 +01:00
93e9d7c852
remove control S comment
2012-11-28 17:20:58 +00:00
8c7939ec9f
catch control S and send an event to save a revision
2012-11-28 17:17:35 +00:00
9ec8a6e3d3
back to globalize... don't work :S
2012-11-28 04:02:55 +01:00
1cc0e8cbf0
Restore original ini file
2012-11-28 03:27:09 +01:00
523c7aebe5
Merge remote branch 'ether/develop' into develop
2012-11-28 03:13:04 +01:00
c445197e7f
Update src/static/css/pad.css
2012-11-27 15:10:36 +00:00
97d77ea089
added my name in header
2012-11-27 00:11:45 +01:00
6fe6103632
added languages for translatewiki
2012-11-26 23:40:31 +01:00
7280376a26
Merge with ether develop
2012-11-26 22:11:31 +01:00
f880473360
remember the styling for the pasword prompt
2012-11-26 20:54:28 +00:00
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
b66c9135f7
Merge branch 'develop' of github.com:ether/etherpad-lite into remove-alert-on-wrap
2012-11-26 20:20:21 +00:00
6239c66e36
remove alert on line wrap as it doesnt mean anything
2012-11-26 20:19:27 +00:00
491bf515c6
Merge pull request #1199 from leblanc-simon/develop
...
improving the translation of the timeline
2012-11-26 11:48:08 -08:00
a49bab5dae
fix timeslider rightstep button position
2012-11-26 08:54:13 +01:00
d7cca602df
Added message translatable about features importing without abiword
2012-11-26 03:18:47 +01:00
460200981e
Merge remote branch 'ether/develop'
2012-11-26 02:21:18 +01:00
de5a90b9c7
Localisation updates from http://translatewiki.net .
2012-11-25 12:52:08 +00:00
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
6d5907562d
Fixed installed plugins section in plugins/info
2012-11-24 03:18:22 +01:00
8ac49477f9
Fix 1203: non-escaped html in plugins info
2012-11-24 00:42:44 +01:00
ef7590fb73
Fix 1203: non-escaped html in plugins info
2012-11-24 00:26:48 +01:00
0250f8d55c
Merge remote branch 'ether/develop'
2012-11-23 22:57:05 +01:00
cc60b82a6e
Import html by default and allow basic import/export features without abiword
2012-11-23 22:55:25 +01:00
ef3231efd2
cleaning
2012-11-23 19:06:18 +01:00
d0a17d5471
test import converting to html instead to txt by default
2012-11-23 18:18:03 +01:00
94e9cf0a32
improving the translation of the timeline
2012-11-23 06:20:09 +01:00
eed6b752d4
initial https version fix #1148
2012-11-22 10:12:58 +01:00
1899e3f48d
Merge pull request #1197 from hcartiaux/urlfix
...
Fix urls, use github.com/ether
2012-11-21 16:22:21 -08:00
d6027726e6
Fix urls, use github.com/ether
...
Signed-off-by: Hyacinthe Cartiaux <hyacinthe.cartiaux@uni.lu>
2012-11-22 01:12:30 +01:00
a662db222f
Merge pull request #1193 from kingmook/patch-1
...
pad.js - Gramatical fix
2012-11-21 14:42:12 -08:00
196aafd9d6
Update src/static/js/pad.js
...
Gramatically change. Changed "You're Password" to "Your Password".
2012-11-21 13:35:47 -05:00
064051a30d
Bump stuff to 1.2.1
2012-11-21 18:20:54 +00:00
34df9d651e
Merge pull request #1188 from joker-x/master
...
Allow ! in pads urls
2012-11-21 09:53:58 -08:00
dcb3da829d
Fix #1186 Autodetection wouldn't work correctly in IE9
2012-11-21 17:45:01 +01:00
beb5bf4d7d
Merge remote branch 'ether/develop'
2012-11-21 03:37:42 +01:00
0c70ada9d7
Allow ! in urls autodetection
2012-11-21 03:35:49 +01:00
a6cbcc9d51
Merge pull request #1185 from Nikerabbit/develop
...
Localisation updates from http://translatewiki.net .
2012-11-20 13:11:30 -08:00
8a23c2ff50
Use ; as comments indicator in i18n files
2012-11-20 22:08:42 +01:00
4e18df45c6
Localisation updates from http://translatewiki.net .
2012-11-20 20:47:34 +00:00
4053ab2dfa
Clarify English strings and rephrase some stupid-sounding messages.
2012-11-20 21:35:06 +01:00
1e71797ad5
Replace Globalize with languages module
2012-11-20 19:46:17 +01:00
67de23225a
Fix typo in pad.toolbar.clearAuthorship.title string in fr.ini
2012-11-18 16:44:59 +01:00
d6c0f96084
Merge pull request #1177 from marcelklehr/fix/optimize-l10n-loading-times
...
optimize l10n loading times
2012-11-17 07:31:21 -08:00
73eafb92c2
Merge pull request #1178 from marcelklehr/fix/tests
...
Fix/tests
2012-11-17 07:31:03 -08:00
364e6928b5
Make tests work on windows
2012-11-17 16:28:54 +01:00
5baef07b55
Load l10n.js first but asynchronusly
2012-11-17 15:28:33 +01:00
e131f60071
Serve English strings directly with /locales.ini
2012-11-17 14:33:01 +01:00
a39faf9368
Fix #1115 correctly reference session cookie
2012-11-17 14:19:09 +01:00
716aa13a79
Fix examples url in settings.html to use ether/
2012-11-16 10:39:38 +01:00
dd845f7731
fixed label languague
2012-11-15 13:41:44 +01:00
ce371235b3
Traducción al castellano/Spanish translation
2012-11-15 11:44:31 +01:00
6d2391dba6
Fix version number in changelog and package.json
2012-11-14 22:02:40 +01:00
ae2fee8be8
Sigh. I must have forgotten to commit this..
...
Apologies.
2012-11-14 19:38:17 +00:00
8b50f194a3
fix README to use ether/
2012-11-14 19:26:37 +00:00
68b1d78f32
Merge pull request #1159 from marcelklehr/fix/lang-autodetection
...
Fix language auto-detection
2012-11-14 10:58:07 -08:00
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
b416402f10
Fix language auto-detection
2012-11-14 19:38:35 +01:00
dcff0d74ef
Fix Timeslider translation not showing up
2012-11-14 19:31:09 +01:00
37450340ee
Fix typo in timeslider.pageTitle string in french translation
2012-11-14 18:05:51 +01:00
b69396d5a0
Fix French locale une autre fois
2012-11-14 17:29:06 +01:00
d65460a409
Add missing colon in fr-locale
2012-11-14 17:15:28 +01:00
440804ce0b
Update French localization
2012-11-14 17:13:19 +01:00
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
ffb7cf47f2
Mate timslider page title translateable
2012-11-14 15:31:43 +01:00
6b6315ca3c
Tidy up settings
2012-11-14 14:26:49 +01:00
2d31d3fc46
add colon to language
2012-11-14 12:20:41 +00:00
2657f06887
Merge branch 'develop' of github.com:Pita/etherpad-lite into feature/i18n
2012-11-14 10:19:52 +00:00
838a1e3d69
just export on timeslider, no import..
2012-11-14 09:31:27 +00:00
0e6a701f92
Update src/templates/timeslider.html
2012-11-14 09:20:16 +00:00
e0935d9e25
Update src/locales/fr.ini
2012-11-13 20:09:02 +00:00
c65a03aaff
Update src/locales/fr.ini
2012-11-13 20:08:38 +00:00
a041cea834
French translation thanks to Francis-William Rhaume
2012-11-13 20:06:44 +00:00
5b23e99d8c
resolve #1044
...
https://github.com/Pita/etherpad-lite/issues/1044
2012-11-13 19:23:55 +00:00
6de7634357
merged develop back in
2012-11-13 07:43:48 -08:00
4c095202bd
Merged branch feature/frontend-tests
2012-11-13 07:29:57 -08:00
b28afe4c47
Adjust border-color of #sidediv
2012-11-13 12:42:52 +01:00
c2253e49b6
Add ability to set language via URL parameter
2012-11-12 18:31:02 +01:00
b38f5d8f0c
Fix German translation
2012-11-12 18:11:06 +01:00
19c12239f6
Simplify lang setting in pad.html template
2012-11-12 18:04:21 +01:00
993d501943
Make L10n.js requireable
2012-11-12 17:42:07 +01:00
ed3020c729
Translate timeslider export links
2012-11-12 17:34:29 +01:00
e81563e18d
German translation for timeslider
2012-11-12 17:26:20 +01:00
John McLear