Commit graph

  • 84d154b168 Update strings, add UK strings, fix JS root 2012-12-03 11:35:06 +00:00
  • 5b82b6b6d9 Merge e6bec482c9 into 433421cc91 Wikinaut 2012-12-03 02:53:52 -08:00
  • e82924b4eb Made routing behave and disallow funky PadIDs. itguy51 2012-12-02 19:32:25 -08:00
  • 38b14c40f0 Add same color in pad and chat for author Simon Leblanc 2012-12-03 03:43:56 +01:00
  • 7ae8049fc4 Merge b5c263dd37 into 433421cc91 John McLear 2012-12-02 17:43:08 -08:00
  • b5c263dd37 improve search to use description too, bit more cpu heavy for thats okay John McLear 2012-12-03 01:41:01 +00:00
  • 433421cc91 Merge pull request #1205 from joker-x/master John McLear 2012-12-02 16:57:55 -08:00
  • 9b40fcf22b Merge 657322db91 into 8a9045b335 Iván Eixarch 2012-12-02 16:40:20 -08:00
  • 657322db91 fixed git merge confict Iván Eixarch 2012-12-03 01:39:59 +01:00
  • 8a9045b335 remove ssl not enabled message John McLear 2012-12-02 18:33:31 +00:00
  • 489cf7ce2c Merge 7ec09c4bbe into e9e4d65ad4 John McLear 2012-12-02 10:04:27 -08:00
  • 7ec09c4bbe use require for jquery, pretty ghetto but works better(ish) John McLear 2012-12-02 18:03:06 +00:00
  • 0d2eddb62a console.debug socketTransportProtocols Wikinaut 2012-12-02 18:54:30 +01:00
  • 9701c51ac5 removed empty line in settings.json.template Wikinaut 2012-12-02 18:48:47 +01:00
  • 38c6549058 removed wrong comment in settings.json.template Wikinaut 2012-12-02 18:47:06 +01:00
  • 9224e9beef removed wrong comment in Settings.js Wikinaut 2012-12-02 18:44:39 +01:00
  • 8b044254cc add socketTransportProtocols parameter Wikinaut 2012-12-02 18:28:28 +01:00
  • a74defdab7 Merge branch 'focus-on-password' of github.com:ether/etherpad-lite into focus-on-password John McLear 2012-12-02 17:07:23 +00:00
  • c9a5e55654 Merge branch 'develop' of github.com:ether/etherpad-lite into focus-on-password John McLear 2012-12-02 17:06:33 +00:00
  • 3cdf66c2f7 first effort to move into templates but javascript is broken so dont pull root 2012-12-02 17:03:56 +00:00
  • e6bec482c9 revert 53d6d08 socket.io also for IE8 Wikinaut 2012-12-02 13:48:01 +01:00
  • e9e4d65ad4 Localisation updates from http://translatewiki.net. Siebrand Mazeland 2012-12-02 12:35:02 +00:00
  • 322f652501 Updated APIDocs to reflect light API tweak Josh Pruim 2012-12-01 23:11:05 -08:00
  • 6c3bcb33c0 Added in an even better regex. Josh Pruim 2012-12-01 22:29:48 -08:00
  • 604b785dde Added in better regex. Josh Pruim 2012-12-01 22:25:54 -08:00
  • 3d085f168a Removed artifacts from accidental commits. Josh Pruim 2012-12-01 22:09:09 -08:00
  • b81d79e605 Pulled back to reflect branch titling. Josh Pruim 2012-12-01 22:00:06 -08:00
  • c44b6eabdd Added sanitization to API logic Josh Pruim 2012-12-01 21:48:47 -08:00
  • 2b3a67852d replace async loading of l10n because chrome fail to load Iván Eixarch 2012-12-02 06:03:46 +01:00
  • b0b64358f9 Merge remote branch 'ether/develop' into develop Iván Eixarch 2012-12-02 05:57:14 +01:00
  • 4a43fd7ecb Added Sanitization logic for custom PadIDs Josh Pruim 2012-12-01 20:18:55 -08:00
  • 8204b52f55 Added Sanitization logic for custom PadIDs Josh Pruim 2012-12-01 20:18:21 -08:00
  • 2d91d8e185 Added Fading and stuff Josh Pruim 2012-12-01 18:08:14 -08:00
  • 9afbbd5dcd Merge 6596ca13e8 into d4b79a6cba Wikinaut 2012-12-01 03:42:37 -08:00
  • d4b79a6cba Localisation updates from http://translatewiki.net. Niklas Laxström 2012-12-01 11:32:26 +00:00
  • 6596ca13e8 fix 1236 favicon url Wikinaut 2012-12-01 11:13:08 +01:00
  • 7c78a0e9d1 Merge 04e9c8159f into eb93ce2aa6 Wikinaut 2012-12-01 01:44:59 -08:00
  • 04e9c8159f path correction Wikinaut 2012-12-01 10:38:59 +01:00
  • 984c18904d fix 1236 favicon url Wikinaut 2012-12-01 10:32:48 +01:00
  • eb93ce2aa6 a test for adding any letter from alphabet can be extended to include foreign cahrs infact please DO THIS John McLear 2012-11-30 23:33:22 +00:00
  • cfce503d59 Merge remote branch 'upstream/develop'; commit 'd761003588' into favicon-fix-1236 Wikinaut 2012-12-01 00:31:29 +01:00
  • 3dcbd8dd4e fix the control S to save a revision John McLear 2012-11-30 23:28:34 +00:00
  • a4c4d11cd4 fix letter s... John McLear 2012-11-30 15:26:51 -08:00
  • 2fe31bc618 Merge branch 'develop' of github.com:ether/etherpad-lite into develop John McLear 2012-11-30 15:19:47 -08:00
  • d761003588 fix path to favicon resolves #1236 John McLear 2012-11-30 22:50:54 +00:00
  • 065c1ef824 Merge 668ce82569 into ab148ebc1a Wikinaut 2012-11-30 12:58:28 -08:00
  • 668ce82569 warning when SSL is disabled Wikinaut 2012-11-30 21:56:40 +01:00
  • ab148ebc1a Merge pull request #1229 from ether/control-s Marcel Klehr 2012-11-29 08:57:10 -08:00
  • 11af9228db Merge branch 'develop' of github.com:ether/etherpad-lite into develop John McLear 2012-11-29 07:29:30 -08:00
  • a51527c7a8 Merge 2babccc931 into 53d6d0813e Wikinaut 2012-11-29 07:28:40 -08:00
  • f352e0d569 Merge 93e9d7c852 into 53d6d0813e John McLear 2012-11-29 07:28:07 -08:00
  • 53d6d0813e Merge pull request #1233 from marcelklehr/fix/s.io-perf-with-modern-browsers John McLear 2012-11-29 06:55:51 -08:00
  • 556fcd8848 Merge 719fb7e045 into 182ea62de9 Marcel Klehr 2012-11-29 04:44:29 -08:00
  • 719fb7e045 Let socket.io decide which transport is best for the browser Marcel Klehr 2012-11-29 13:42:37 +01:00
  • 795a20b3f2 get languages availables through translatewiki API Iván Eixarch 2012-11-28 23:54:23 +01:00
  • 93e9d7c852 remove control S comment John McLear 2012-11-28 17:20:58 +00:00
  • 8c7939ec9f catch control S and send an event to save a revision John McLear 2012-11-28 17:17:35 +00:00
  • 9ec8a6e3d3 back to globalize... don't work :S Iván Eixarch 2012-11-28 04:02:55 +01:00
  • 1cc0e8cbf0 Restore original ini file Iván Eixarch 2012-11-28 03:27:09 +01:00
  • 523c7aebe5 Merge remote branch 'ether/develop' into develop Iván Eixarch 2012-11-28 03:13:04 +01:00
  • c445197e7f Update src/static/css/pad.css John McLear 2012-11-27 15:10:36 +00:00
  • 182ea62de9 Merge pull request #1218 from ether/remove-alert-on-wrap Marcel Klehr 2012-11-27 06:22:28 -08:00
  • 53cc09a130 Merge b66c9135f7 into df8207e0df John McLear 2012-11-27 06:22:03 -08:00
  • df8207e0df Merge pull request #1225 from disy-mk/patch-1 Marcel Klehr 2012-11-27 06:09:04 -08:00
  • 534476b8f2 Merge bf26f60bac into 491bf515c6 Manuel Knitza 2012-11-27 01:00:28 -08:00
  • 2861693ce4 Merge bf26f60bac into e02054d6fe Manuel Knitza 2012-11-27 01:00:11 -08:00
  • bf26f60bac Update doc/api/http_api.md Manuel Knitza 2012-11-27 09:59:47 +01:00
  • 97d77ea089 added my name in header Iván Eixarch 2012-11-27 00:11:45 +01:00
  • edb1a3c481 Merge branch 'develop' of github.com:ether/etherpad-lite into develop John McLear 2012-11-26 14:49:08 -08:00
  • 6fe6103632 added languages for translatewiki Iván Eixarch 2012-11-26 23:40:31 +01:00
  • 7280376a26 Merge with ether develop Iván Eixarch 2012-11-26 22:11:31 +01:00
  • f880473360 remember the styling for the pasword prompt John McLear 2012-11-26 20:54:28 +00:00
  • fb17154ea4 Merge fddca354b3 into e02054d6fe John McLear 2012-11-26 12:53:15 -08:00
  • fddca354b3 proper fix for focus and some styling of the form and allows for pressing enter on form so generally a better fix John McLear 2012-11-26 20:52:10 +00:00
  • b66c9135f7 Merge branch 'develop' of github.com:ether/etherpad-lite into remove-alert-on-wrap John McLear 2012-11-26 20:20:21 +00:00
  • 6239c66e36 remove alert on line wrap as it doesnt mean anything John McLear 2012-11-26 20:19:27 +00:00
  • 103e0f6747 Add the basic structure of a timeslider test Marcel Klehr 2012-11-26 21:15:10 +01:00
  • 3f8414e499 Merge f722461e8a into 491bf515c6 Iván Eixarch 2012-11-26 11:49:03 -08:00
  • 491bf515c6 Merge pull request #1199 from leblanc-simon/develop John McLear 2012-11-26 11:48:08 -08:00
  • ec1d85ea80 Merge 94e9cf0a32 into 064bafe973 Simon Leblanc 2012-11-26 11:39:17 -08:00
  • db804587bc Merge 2babccc931 into 064bafe973 Wikinaut 2012-11-26 05:07:42 -08:00
  • f722461e8a Added support for all translatewiki languages Iván Eixarch 2012-11-26 10:15:21 +01:00
  • 064bafe973 Merge pull request #1215 from Wikinaut/fix-rightstep-button John McLear 2012-11-26 01:03:20 -08:00
  • cd71092862 Merge a49bab5dae into de5a90b9c7 Wikinaut 2012-11-25 23:59:21 -08:00
  • a49bab5dae fix timeslider rightstep button position Wikinaut 2012-11-26 08:54:13 +01:00
  • d7cca602df Added message translatable about features importing without abiword Iván Eixarch 2012-11-26 03:18:47 +01:00
  • 460200981e Merge remote branch 'ether/develop' Iván Eixarch 2012-11-26 02:21:18 +01:00
  • 2babccc931 partial rerevert Wikinaut 2012-11-25 23:49:13 +01:00
  • 4427ea430d Merge 335dc7fd56 into de5a90b9c7 Wikinaut 2012-11-25 13:55:12 -08:00
  • 335dc7fd56 reverted wrong patch in pad.html Wikinaut 2012-11-25 22:51:22 +01:00
  • 0fef583fb0 fix connectingbar.gif path Wikinaut 2012-11-25 22:44:29 +01:00
  • de5a90b9c7 Localisation updates from http://translatewiki.net. Niklas Laxström 2012-11-25 12:52:08 +00:00
  • fdf0b1a384 Merge pull request #1202 from Wikinaut/fix-1148-add-native-node-https-support John McLear 2012-11-24 16:35:02 -08:00
  • cd53b90e90 Merge 43980ffe11 into 22c6fd0886 Wikinaut 2012-11-24 13:07:20 -08:00
  • 22c6fd0886 Merge pull request #1208 from joker-x/fix1203 John McLear 2012-11-24 10:16:52 -08:00
  • c596cd6f89 Merge d3ead86db1 into 1899e3f48d François Boulogne 2012-11-24 03:59:14 -08:00
  • 2a676a6529 Merge 6d5907562d into 1899e3f48d Iván Eixarch 2012-11-23 18:18:54 -08:00
  • 6d5907562d Fixed installed plugins section in plugins/info Iván Eixarch 2012-11-24 03:18:22 +01:00
  • 8ee7eed14a Merge 8ac49477f9 into e02054d6fe Iván Eixarch 2012-11-23 15:56:48 -08:00
  • 8ac49477f9 Fix 1203: non-escaped html in plugins info Iván Eixarch 2012-11-24 00:42:44 +01:00