Commit Graph

2410 Commits

Author SHA1 Message Date
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
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 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
Marcel Klehr 383e1fb604 Merge pull request #1184 from joker-x/master
Replace Globalize with languages module
2012-11-20 11:58:04 -08:00
Iván Eixarch 1e71797ad5 Replace Globalize with languages module 2012-11-20 19:46:17 +01:00
Marcel Klehr b515156041 Only show errors/warnings on npm install [windows] 2012-11-19 15:24:48 +01:00