Commit graph

  • 476f43ac6f Merge dd845f7731 into 5f30ea447e joker-x 2012-11-15 04:43:19 -08:00
  • dd845f7731 fixed label languague Iván Eixarch 2012-11-15 13:41:44 +01:00
  • ef01fc0b77 Fix the path of run.sh for linux installation Sarhan Aissi 2012-11-15 13:26:15 +01:00
  • 0911158f49 Merge 12ff834038 into 5f30ea447e Sarhan Aissi 2012-11-15 04:19:00 -08:00
  • 12ff834038 Fix Examples url to use ether/ Sarhan Aissi 2012-11-15 13:18:45 +01:00
  • 907886c39d Merge ce371235b3 into 5f30ea447e joker-x 2012-11-15 03:16:16 -08:00
  • ce371235b3 Traducción al castellano/Spanish translation Iván Eixarch 2012-11-15 11:44:31 +01:00
  • a3a0e1d77f Merge branch 'master' of github.com:Pita/etherpad-lite into develop John McLear 2012-11-14 15:23:38 -08:00
  • 5f30ea447e Merge pull request #1160 from ether/release/releases-1.2 1.2.0 John McLear 2012-11-14 13:29:51 -08:00
  • 486b7774f3 Merge 6d2391dba6 into 3944517aff John McLear 2012-11-14 13:02:56 -08:00
  • 6d2391dba6 Fix version number in changelog and package.json Marcel Klehr 2012-11-14 22:02:40 +01:00
  • ae2fee8be8 Sigh. I must have forgotten to commit this.. John McLear 2012-11-14 19:38:17 +00:00
  • 6ede651813 v1.2 news into changelog johnyma22 2012-11-14 19:30:46 +00:00
  • 8b50f194a3 fix README to use ether/ johnyma22 2012-11-14 19:26:37 +00:00
  • dff8910966 Fix links in README Marcel Klehr 2012-11-14 20:05:58 +01:00
  • 26ee9c2f16 Update CONTRIBUTING.md John McLear 2012-11-14 19:01:05 +00:00
  • 97d82fd19f Update README.md John McLear 2012-11-14 19:00:40 +00:00
  • 68b1d78f32 Merge pull request #1159 from marcelklehr/fix/lang-autodetection John McLear 2012-11-14 10:58:07 -08:00
  • e54c4a1eff Merge b416402f10 into a3ff346547 Marcel Klehr 2012-11-14 10:57:16 -08:00
  • a3ff346547 Merge pull request #1152 from marcelklehr/fix/updatePadClients-error John McLear 2012-11-14 10:44:30 -08:00
  • 59df68a3ac Merge e24ed46a08 into 3821c1441c Marcel Klehr 2012-11-14 10:43:01 -08:00
  • 3821c1441c Merge pull request #1150 from marcelklehr/fix/script-migrate-dirty-mysql John McLear 2012-11-14 10:40:11 -08:00
  • 5e413c64d3 Merge b057759eae into dcff0d74ef Marcel Klehr 2012-11-14 10:40:02 -08:00
  • b416402f10 Fix language auto-detection Marcel Klehr 2012-11-14 19:38:35 +01:00
  • dcff0d74ef Fix Timeslider translation not showing up 0ip 2012-11-14 19:31:09 +01:00
  • a5c4fb154f Update README.md Peter 'Pita' Martischka 2012-11-14 09:29:49 -08:00
  • 2aaf80c880 Initial commit Peter 'Pita' Martischka 2012-11-14 09:27:21 -08:00
  • 6426b05c67 Merge pull request #1158 from Pita/feature/i18n Marcel Klehr 2012-11-14 09:06:56 -08:00
  • e6260e944d Merge 37450340ee into 5b23e99d8c John McLear 2012-11-14 09:06:16 -08:00
  • 37450340ee Fix typo in timeslider.pageTitle string in french translation Marcel Klehr 2012-11-14 18:05:51 +01:00
  • bb33cfb23d Add in docs for L10n Marcel Klehr 2012-11-14 18:01:01 +01:00
  • b69396d5a0 Fix French locale une autre fois 0ip 2012-11-14 17:29:06 +01:00
  • 7ee42edcf1 Document 'lang' Parameter 0ip 2012-11-14 17:21:45 +01:00
  • d65460a409 Add missing colon in fr-locale 0ip 2012-11-14 17:15:28 +01:00
  • 440804ce0b Update French localization 0ip 2012-11-14 16:34:44 +01:00
  • f5563ab704 Move locale detection to the client Marcel Klehr 2012-11-14 17:01:59 +01:00
  • ffb7cf47f2 Mate timslider page title translateable Marcel Klehr 2012-11-14 15:31:43 +01:00
  • 6b6315ca3c Tidy up settings 0ip 2012-11-14 14:26:49 +01:00
  • 2d31d3fc46 add colon to language John McLear 2012-11-14 12:20:41 +00:00
  • 2657f06887 Merge branch 'develop' of github.com:Pita/etherpad-lite into feature/i18n John McLear 2012-11-14 10:19:52 +00:00
  • 838a1e3d69 just export on timeslider, no import.. John McLear 2012-11-14 09:31:27 +00:00
  • 0e6a701f92 Update src/templates/timeslider.html John McLear 2012-11-14 09:20:16 +00:00
  • e0935d9e25 Update src/locales/fr.ini John McLear 2012-11-13 20:09:02 +00:00
  • c65a03aaff Update src/locales/fr.ini John McLear 2012-11-13 20:08:38 +00:00
  • a041cea834 French translation thanks to Francis-William Rhaume johnyma22 2012-11-13 20:06:44 +00:00
  • 5b23e99d8c resolve #1044 John McLear 2012-11-13 19:23:55 +00:00
  • c008d7bbbe Merge branch 'develop' into feature/i18n Peter 'Pita' Martischka 2012-11-13 08:47:38 -08:00
  • 7d174855c4 Give the browser more time to save the cookie at change_user_name test Peter 'Pita' Martischka 2012-11-13 08:39:48 -08:00
  • e13219fec9 deactive test for issue #1125 Peter 'Pita' Martischka 2012-11-13 08:05:05 -08:00
  • 3830c878d2 change language test -- note i didnt include test for cookie persistance johnyma22 2012-11-13 00:23:34 +00:00
  • 6de7634357 merged develop back in Peter 'Pita' Martischka 2012-11-13 07:43:48 -08:00
  • 4c095202bd Merged branch feature/frontend-tests Peter 'Pita' Martischka 2012-11-13 07:29:57 -08:00
  • b28afe4c47 Adjust border-color of #sidediv 0ip 2012-11-13 12:42:52 +01:00
  • c2253e49b6 Add ability to set language via URL parameter 0ip 2012-11-12 18:31:02 +01:00
  • 3e76446685 Merge b38f5d8f0c into dc3db7a4a8 Marcel Klehr 2012-11-12 09:17:22 -08:00
  • b38f5d8f0c Fix German translation 0ip 2012-11-12 18:11:06 +01:00
  • 19c12239f6 Simplify lang setting in pad.html template Marcel Klehr 2012-11-12 18:04:21 +01:00
  • 993d501943 Make L10n.js requireable Marcel Klehr 2012-11-12 17:42:07 +01:00
  • ed3020c729 Translate timeslider export links Marcel Klehr 2012-11-12 17:34:29 +01:00
  • e81563e18d German translation for timeslider Marcel Klehr 2012-11-12 17:26:20 +01:00
  • 3bc59f0a7c Add english translation file Marcel Klehr 2012-11-12 17:25:53 +01:00
  • 378a74fb4e Remove translated strings from template files Marcel Klehr 2012-11-12 17:24:14 +01:00
  • 4154d464a5 Fix german translation Marcel Klehr 2012-11-12 16:53:39 +01:00
  • 7021a8b885 Add pad setting for UI lang Marcel Klehr 2012-11-12 16:49:15 +01:00
  • 03d3cd9f24 back to sauce connect download from sauce labs Peter 'Pita' Martischka 2012-11-11 19:07:41 -08:00
  • 68ed9b219f Fixed another sendkeys bug Peter 'Pita' Martischka 2012-11-11 19:04:28 -08:00
  • e385e78310 IE9 doesn't need special IE treatment and works much better with the W3C sendkeys methods Peter 'Pita' Martischka 2012-11-11 18:21:43 -08:00
  • fb340793da Add an empty locales/en.ini - English is default lang in templates Marcel Klehr 2012-11-11 11:56:59 +01:00
  • e914c972f4 Add german translation for index.html and pad.html Marcel Klehr 2012-11-10 14:13:51 +01:00
  • e5d1c6b279 Allow translation of pad.html Marcel Klehr 2012-11-10 14:13:10 +01:00
  • 145e893273 Allow translations for index.html Marcel Klehr 2012-11-10 14:12:58 +01:00
  • a3504f70c4 Add i18n component Marcel Klehr 2012-11-10 14:12:17 +01:00
  • e24ed46a08 PadMessageHandler: Make sure sessioninfos[session] still exists before pushing data to user. Marcel Klehr 2012-11-10 10:47:12 +01:00
  • b057759eae Fix #1142 error in bin/migrateDirtyDBtoMySQL.js Marcel Klehr 2012-11-09 22:06:26 +01:00
  • dc3db7a4a8 Merge pull request #1147 from kingmook/develop John McLear 2012-11-08 11:09:43 -08:00
  • b089508b63 Merge 34594eb88b into 745a1860ac Mike Brousseau 2012-11-08 10:47:41 -08:00
  • 34594eb88b Update src/static/js/pad.js Mike Brousseau 2012-11-08 13:47:21 -05:00
  • 1dd8b98d58 Merge f233641d2b into 3944517aff Mike Brousseau 2012-11-08 10:34:49 -08:00
  • f233641d2b Update src/static/js/pad.js Mike Brousseau 2012-11-08 13:24:15 -05:00
  • 7426ae3d62 Merge bb91107134 into 745a1860ac Fritz Grimpen 2012-11-08 09:24:38 -08:00
  • 745a1860ac Merge pull request #1145 from marcelklehr/fix/contributing-md John McLear 2012-11-08 08:52:44 -08:00
  • feca221a6b Merge 545026affa into 8bb8e484ee Marcel Klehr 2012-11-08 08:50:46 -08:00
  • 545026affa Try to clean up CONTRIBUTING.md Marcel Klehr 2012-11-07 22:03:49 +01:00
  • 8bb8e484ee Merge pull request #1135 from marcelklehr/fix/server-restart-settings-reload John McLear 2012-11-08 08:33:56 -08:00
  • a571e5c0ae Merge d26f5d64f7 into 9f76d24646 Marcel Klehr 2012-11-08 08:30:14 -08:00
  • 9f76d24646 Merge pull request #1143 from JasonWoof/fix-linux-install-instructions John McLear 2012-11-08 06:15:40 -08:00
  • be4505d7fc Merge 0b6709392b into e1edc8079f Jason Woofenden 2012-11-07 20:47:24 -08:00
  • 363edf75db Merge 01727d1542 into e1edc8079f Jason Woofenden 2012-11-07 20:43:39 -08:00
  • 0b6709392b remove trailing whitespace Jason Woofenden 2012-11-07 23:40:59 -05:00
  • 01727d1542 fix typo in Linux install instructions Jason Woofenden 2012-11-07 23:31:24 -05:00
  • 14335b3c76 Merge 30e75a3761 into 3944517aff Jason Woofenden 2012-11-07 12:12:43 -08:00
  • 30e75a3761 fix typo in instructions for linux Jason Woofenden 2012-11-07 15:09:20 -05:00
  • e1edc8079f Merge pull request #1138 from btherres/develop John McLear 2012-11-07 04:13:25 -08:00
  • 049d32fa15 Merge 05f96429ef into 6148548e00 Bastian Therres 2012-11-07 03:56:27 -08:00
  • 05f96429ef added solaris compatibility: removed -v flag from cp, witch is not known by solaris cp // added condition for gnu-grep (ggrep), solaris grep has no -o flag Bastian 2012-11-07 12:51:51 +01:00
  • 6148548e00 Fix unclickable / broken links to IRC webchat John McLear 2012-11-07 11:10:36 +01:00
  • 920fdccfca Merge 3747b0eeec into 3944517aff Bastian Therres 2012-11-07 01:24:42 -08:00
  • 3747b0eeec Update bin/installDeps.sh Bastian Therres 2012-11-07 10:18:46 +01:00
  • d0aabfc152 Update bin/installDeps.sh Bastian Therres 2012-11-07 09:43:55 +01:00
  • d26f5d64f7 Fix #1130 Reload settings on /admin/settings server restart Marcel Klehr 2012-11-06 17:35:52 +01:00