Commit graph

  • ef7590fb73 Fix 1203: non-escaped html in plugins info Iván Eixarch 2012-11-24 00:26:48 +01:00
  • 7578dad7bd Merge 0250f8d55c into e02054d6fe Iván Eixarch 2012-11-23 14:08:41 -08:00
  • 0250f8d55c Merge remote branch 'ether/develop' Iván Eixarch 2012-11-23 22:57:05 +01:00
  • cc60b82a6e Import html by default and allow basic import/export features without abiword Iván Eixarch 2012-11-23 22:55:25 +01:00
  • 43980ffe11 chg server.key to epl-server.key Wikinaut 2012-11-23 21:18:05 +01:00
  • e8bca8ea04 Ip => IP typo fix; +comment for SSL Wikinaut 2012-11-23 21:15:52 +01:00
  • ef3231efd2 cleaning Iván Eixarch 2012-11-23 19:06:18 +01:00
  • d0a17d5471 test import converting to html instead to txt by default Iván Eixarch 2012-11-23 18:18:03 +01:00
  • 94e9cf0a32 improving the translation of the timeline Simon Leblanc 2012-11-23 06:20:09 +01:00
  • 7268357566 Merge 9a57ba4683 into 1899e3f48d goofy-bz 2012-11-22 08:11:57 -08:00
  • eed6b752d4 initial https version fix #1148 Wikinaut 2012-11-22 10:12:58 +01:00
  • 1899e3f48d Merge pull request #1197 from hcartiaux/urlfix John McLear 2012-11-21 16:22:21 -08:00
  • 0ec6ad0898 Merge d6027726e6 into a662db222f Hyacinthe Cartiaux 2012-11-21 16:21:26 -08:00
  • d6027726e6
    Fix urls, use github.com/ether Hyacinthe Cartiaux 2012-11-22 01:12:30 +01:00
  • c801f81e08 Merge 9a57ba4683 into e02054d6fe goofy-bz 2012-11-21 15:49:28 -08:00
  • 9a57ba4683 fixing typos take #2 Jean-Bernard marcon 2012-11-22 00:48:51 +01:00
  • a662db222f Merge pull request #1193 from kingmook/patch-1 John McLear 2012-11-21 14:42:12 -08:00
  • 2d7ea3b641 Merge 196aafd9d6 into aebf6ee1e8 Mike Brousseau 2012-11-21 14:42:07 -08:00
  • aebf6ee1e8 language test should pass int ravis now johnyma22 2012-11-21 22:22:01 +00:00
  • c831e2da75 fixing fr locale typos Jean-Bernard marcon 2012-11-21 23:18:51 +01:00
  • 28cd6e64b3 make runner CSS more sane johnyma22 2012-11-21 20:09:31 +00:00
  • e02054d6fe Merge pull request #1194 from ether/release/releases-1.2.1 1.2.1 Marcel Klehr 2012-11-21 11:29:02 -08:00
  • 36ee417310 Merge a75d17f55a into 5f30ea447e John McLear 2012-11-21 10:49:04 -08:00
  • a75d17f55a More stuff into changelog johnyma22 2012-11-21 18:48:33 +00:00
  • 196aafd9d6 Update src/static/js/pad.js Mike Brousseau 2012-11-21 13:35:47 -05:00
  • 064051a30d Bump stuff to 1.2.1 johnyma22 2012-11-21 18:20:54 +00:00
  • 122093904f Actually fix the language tests... John McLear 2012-11-21 18:14:05 +00:00
  • 067e02e9d0 Merge branch 'develop' of github.com:ether/etherpad-lite into develop John McLear 2012-11-21 10:00:19 -08:00
  • 34df9d651e Merge pull request #1188 from joker-x/master John McLear 2012-11-21 09:53:58 -08:00
  • b8dded8405 Merge 0c70ada9d7 into db5119f798 Iván Eixarch 2012-11-21 09:53:52 -08:00
  • db5119f798 Fix tests to run on IE8 etc. John McLear 2012-11-21 17:53:46 +00:00
  • 2260b1fc62 Test for PR 1188 John McLear 2012-11-21 17:52:10 +00:00
  • 8d0d71eddb Merge branch 'develop' of github.com:ether/etherpad-lite into develop John McLear 2012-11-21 09:10:54 -08:00
  • 4fb46c0063 Merge pull request #1192 from marcelklehr/fix/l10n-ie-bug John McLear 2012-11-21 08:46:14 -08:00
  • 12abc321a1 Merge dcb3da829d into a6cbcc9d51 Marcel Klehr 2012-11-21 08:45:19 -08:00
  • dcb3da829d Fix #1186 Autodetection wouldn't work correctly in IE9 Marcel Klehr 2012-11-21 17:45:01 +01:00
  • d4e3a49866 backslash should be a forward slash Jens Kubieziel 2012-11-21 09:41:52 +01:00
  • beb5bf4d7d Merge remote branch 'ether/develop' Iván Eixarch 2012-11-21 03:37:42 +01:00
  • 0c70ada9d7 Allow ! in urls autodetection Iván Eixarch 2012-11-21 03:35:49 +01:00
  • c5935ad3e1 Merge c438306771 into 5f30ea447e Simon Leblanc 2012-11-20 17:54:27 -08:00
  • c438306771 syntax correction (in French, the word version is female :-)) Simon Leblanc 2012-11-21 02:48:28 +01:00
  • ac1db1b24a improving the translation of the timeline Simon Leblanc 2012-11-21 02:43:30 +01:00
  • a6cbcc9d51 Merge pull request #1185 from Nikerabbit/develop Marcel Klehr 2012-11-20 13:11:30 -08:00
  • 45c6163166 Merge 4e18df45c6 into 8a23c2ff50 Niklas Laxström 2012-11-20 13:11:14 -08:00
  • 8a23c2ff50 Use ; as comments indicator in i18n files Marcel Klehr 2012-11-20 22:08:42 +01:00
  • 4e18df45c6 Localisation updates from http://translatewiki.net. Niklas Laxström 2012-11-20 20:47:34 +00:00
  • 4053ab2dfa Clarify English strings and rephrase some stupid-sounding messages. Marcel Klehr 2012-11-20 21:35:06 +01:00
  • 383e1fb604 Merge pull request #1184 from joker-x/master Marcel Klehr 2012-11-20 11:58:04 -08:00
  • e53fe2eac0 Merge 1e71797ad5 into b515156041 joker-x 2012-11-20 10:48:26 -08:00
  • 1e71797ad5 Replace Globalize with languages module Iván Eixarch 2012-11-20 19:46:17 +01:00
  • b515156041 Only show errors/warnings on npm install [windows] Marcel Klehr 2012-11-19 15:24:48 +01:00
  • 3e53a11127 Show errors on npm install Marcel Klehr 2012-11-19 15:19:59 +01:00
  • a7e6c6b0ab encrypted the key again, please travis accept this Peter 'Pita' Martischka 2012-11-18 10:25:58 -08:00
  • 9b3ea5de7f Merge 61bdeafca2 into 323517c6dc joker-x 2012-11-18 14:43:41 -08:00
  • 61bdeafca2 Added Translator Assistant Iván Eixarch 2012-11-18 23:22:28 +01:00
  • 323517c6dc Merge pull request #1181 from marcelklehr/fix/lang-test-dont-use-setimeout John McLear 2012-11-18 13:09:35 -08:00
  • 885d42e3f7 Merge c1f9028d19 into 39ec36552f Marcel Klehr 2012-11-18 11:13:20 -08:00
  • c1f9028d19 Fix lang frontend test to 'waitFor' the 'localized' event Marcel Klehr 2012-11-18 20:11:16 +01:00
  • f20af4818c Revert "Make language frontend test pass" Marcel Klehr 2012-11-18 19:55:13 +01:00
  • 39ec36552f Merge pull request #1180 from tux-tn/patch-6 John McLear 2012-11-18 07:51:24 -08:00
  • 077e6a12e6 Merge 67de23225a into 95dee60d2d Sarhan Aissi 2012-11-18 07:45:29 -08:00
  • 67de23225a Fix typo in pad.toolbar.clearAuthorship.title string in fr.ini Sarhan Aissi 2012-11-18 16:44:59 +01:00
  • 95dee60d2d Merge pull request #1179 from marcelklehr/fix/improve-frontendtest-ux John McLear 2012-11-18 07:39:10 -08:00
  • 00df87e52e Merge bec2c3692d into a99ff139c9 Marcel Klehr 2012-11-18 03:51:04 -08:00
  • bec2c3692d Always display the test overview panel Marcel Klehr 2012-11-18 12:49:59 +01:00
  • 1b409d7b9d Scroll down the list of tests after a test completed Marcel Klehr 2012-11-18 12:49:34 +01:00
  • a99ff139c9 updated sauce_key env for new repo Peter 'Pita' Martischka 2012-11-17 11:45:39 -08:00
  • d6c0f96084 Merge pull request #1177 from marcelklehr/fix/optimize-l10n-loading-times John McLear 2012-11-17 07:31:21 -08:00
  • d74e041647 Merge 5baef07b55 into 73eafb92c2 Marcel Klehr 2012-11-17 07:31:19 -08:00
  • 73eafb92c2 Merge pull request #1178 from marcelklehr/fix/tests John McLear 2012-11-17 07:31:03 -08:00
  • 466b1ca39a Merge ff0c9bb4a0 into 5009ab1174 Marcel Klehr 2012-11-17 07:30:51 -08:00
  • ff0c9bb4a0 Make language frontend test pass Marcel Klehr 2012-11-17 16:29:11 +01:00
  • 364e6928b5 Make tests work on windows Marcel Klehr 2012-11-17 16:28:54 +01:00
  • 5baef07b55 Load l10n.js first but asynchronusly Marcel Klehr 2012-11-17 15:28:33 +01:00
  • e131f60071 Serve English strings directly with /locales.ini Marcel Klehr 2012-11-17 14:33:01 +01:00
  • 5009ab1174 Merge pull request #1176 from marcelklehr/fix/padaccess-cookie John McLear 2012-11-17 05:23:19 -08:00
  • 50090b2598 Merge a39faf9368 into faeee3e09a Marcel Klehr 2012-11-17 05:20:56 -08:00
  • a39faf9368 Fix #1115 correctly reference session cookie Marcel Klehr 2012-11-17 14:19:09 +01:00
  • faeee3e09a Merge pull request #1174 from ether/fix-installdeps-line-error John McLear 2012-11-16 13:21:03 -08:00
  • 5b757651dc Merge cefbd8354d into 0b7d488ea4 John McLear 2012-11-16 13:13:44 -08:00
  • cefbd8354d fix tiny error of missing space johnyma22 2012-11-16 21:12:04 +00:00
  • 0b7d488ea4 Merge pull request #1172 from ether/fix-windows-package-extract John McLear 2012-11-16 13:08:52 -08:00
  • 2c206e02fd Merge fbe16da728 into b1b1fa018a John McLear 2012-11-16 12:53:46 -08:00
  • fbe16da728 dont forget to allow for cleanup johnyma22 2012-11-16 20:52:19 +00:00
  • 27c5e8691f mheh, better way of handling the buidl for windows script johnyma22 2012-11-16 20:51:08 +00:00
  • 1321d9e16f Resolve #1171 by not including tests in windows build johnyma22 2012-11-16 20:17:25 +00:00
  • b1b1fa018a Merge pull request #1170 from tux-tn/patch-4 John McLear 2012-11-16 05:46:34 -08:00
  • f7a53c9442 Merge 716aa13a79 into c765b563e4 Sarhan Aissi 2012-11-16 01:40:11 -08:00
  • 716aa13a79 Fix examples url in settings.html to use ether/ Sarhan Aissi 2012-11-16 10:39:38 +01:00
  • c765b563e4 Merge pull request #1168 from tux-tn/patch-3 John McLear 2012-11-15 14:49:41 -08:00
  • a291345779 Merge 2c268f6c48 into bad9b2ee66 Sarhan Aissi 2012-11-15 13:14:31 -08:00
  • 2c268f6c48 Fix the path of run.sh on README.md Sarhan Aissi 2012-11-15 22:11:48 +01:00
  • d3ead86db1 Merge branch 'develop' of git://github.com/ether/etherpad-lite François Boulogne 2012-11-15 20:52:24 +01:00
  • 7761409374 Merge branch 'develop' of github.com:sciunto/etherpad-lite François Boulogne 2012-11-15 20:46:59 +01:00
  • 0d0aade051 fix i18n François Boulogne 2012-11-15 20:19:24 +01:00
  • ff27ddaa5a fix line François Boulogne 2012-11-15 18:07:30 +01:00
  • bad9b2ee66 Merge pull request #1162 from ether/windows-build-script-exclusions John McLear 2012-11-15 08:10:30 -08:00
  • 17968a511e Merge fcee203a1a into 269cd941c2 John McLear 2012-11-15 06:16:29 -08:00
  • fcee203a1a Dont include git history in the windows .zip Marcel Klehr 2012-11-15 15:16:12 +01:00
  • 269cd941c2 Merge pull request #1167 from joker-x/master Marcel Klehr 2012-11-15 06:04:52 -08:00