Commit graph

  • 71f10bff5b Merge pull request #1568 from ether/client-stability John McLear 2013-03-03 13:19:10 -08:00
  • f279c5d808 Merge 994c4ebeed into fb605fb527 John McLear 2013-03-03 08:31:30 -08:00
  • fb605fb527 Merge pull request #1569 from ether/doc/log4js-appenders John McLear 2013-03-03 08:29:50 -08:00
  • d9a05857ad Merge 5c03c039d1 into 827c1291b5 Marcel Klehr 2013-03-03 07:45:17 -08:00
  • 5c03c039d1 [settings.json.template] Shrink things together a bit and consistently indent comments Marcel Klehr 2013-03-03 16:39:34 +01:00
  • 827c1291b5 Merge pull request #1575 from ether/fix-tests Marcel Klehr 2013-03-02 05:03:38 -08:00
  • ec154932b4 Merge d8154deee3 into 8eb095b42a John McLear 2013-03-02 04:37:23 -08:00
  • 8eb095b42a Merge pull request #1576 from ether/remove-lite-ref Marcel Klehr 2013-03-02 04:35:54 -08:00
  • d8154deee3 more fixes John McLear 2013-03-01 23:40:25 +00:00
  • 4e205fe0af fix monospace text John McLear 2013-03-01 23:33:24 +00:00
  • cadb671ae1 this approach seems to work better for change in latest jQ John McLear 2013-03-01 23:29:12 +00:00
  • bf72e981f8 Merge 36923313fa into 13c9b66e6e John McLear 2013-03-01 15:09:21 -08:00
  • 36923313fa remove more references to lite John McLear 2013-03-01 23:08:39 +00:00
  • 3460159f68 fix a test John McLear 2013-03-01 14:04:33 +00:00
  • 13c9b66e6e Merge pull request #1571 from marcelklehr/fix/settings-object-prototype John McLear 2013-02-28 07:20:42 -08:00
  • e2e58de40f Merge c4966543ed into 22bfe78c4f Marcel Klehr 2013-02-28 07:18:04 -08:00
  • c4966543ed Fix settings object having constructors of another vm.context Marcel Klehr 2013-02-28 16:16:26 +01:00
  • 176a6c36d8 Document the endless possibilities of log4js Marcel Klehr 2013-02-27 20:39:38 +01:00
  • 994c4ebeed stop the client disconnecting of the server sends out a bad revision #, this is very dangerous, the server really shouldn't be sending the same rev #, we could really do with some strong tests case that cover this. Either way this commit 'resolves' #1510 John McLear 2013-02-27 19:29:59 +00:00
  • 22bfe78c4f Merge pull request #1565 from ether/dont-crash-on-mismatch John McLear 2013-02-27 08:20:46 -08:00
  • a6e11af52f Merge ebd8b85072 into 3986835f58 John McLear 2013-02-27 08:18:57 -08:00
  • ebd8b85072 patch documented here https://github.com/ether/etherpad-lite/issues/472 adds some stability but not a perfect solution John McLear 2013-02-27 16:17:50 +00:00
  • 3986835f58 Merge pull request #1564 from marcelklehr/fix/extract-pad John McLear 2013-02-27 07:44:56 -08:00
  • 9c301d88e4 Merge af25606ea8 into 08ffdac409 Marcel Klehr 2013-02-27 07:39:25 -08:00
  • 08ffdac409 Merge pull request #1563 from ether/postTimesliderInit-docs Marcel Klehr 2013-02-27 07:31:44 -08:00
  • af25606ea8 Fix bin/extractPadData on windows Marcel Klehr 2013-02-27 16:26:22 +01:00
  • a88babeec6 Merge 716cac9c95 into 18b6cf1534 John McLear 2013-02-27 07:18:17 -08:00
  • 716cac9c95 timeslider init hook docs John McLear 2013-02-27 15:17:22 +00:00
  • 18b6cf1534 Merge pull request #1523 from ether/store-sessions-in-db John McLear 2013-02-26 18:03:54 -08:00
  • 9b9febf5d6 Merge 2c69066591 into 57d923e822 John McLear 2013-02-26 18:02:37 -08:00
  • 2c69066591 remove pointless stuff John McLear 2013-02-27 02:02:18 +00:00
  • 57d923e822 Merge pull request #1561 from ether/callback-for-delete-script John McLear 2013-02-26 16:14:15 -08:00
  • a395144f27 Merge ea4307ae97 into 80be45ad71 John McLear 2013-02-26 16:14:07 -08:00
  • ea4307ae97 remove console error John McLear 2013-02-26 16:32:34 -08:00
  • 1fd99bfd43 fix deletePad script by remembering not to miss a callback.. John McLear 2013-02-26 16:32:09 -08:00
  • 80be45ad71 Merge pull request #1559 from ether/url-report John McLear 2013-02-26 05:26:29 -08:00
  • 801cf57bc3 Merge ad52b40597 into ad82c8d754 John McLear 2013-02-26 05:24:52 -08:00
  • ad52b40597 post correct url, heh John McLear 2013-02-26 13:24:24 +00:00
  • b2eb1b3814 post url with pad error msg John McLear 2013-02-26 13:14:17 +00:00
  • ad82c8d754 Merge pull request #1557 from ether/delete-pad-cli-script John McLear 2013-02-26 03:53:18 -08:00
  • 6eca9ad68e Merge b7d96b1dcf into cf6413383b John McLear 2013-02-26 03:53:14 -08:00
  • b7d96b1dcf a cli tool for deleting pads John McLear 2013-02-26 11:44:22 +00:00
  • cf6413383b Merge pull request #1537 from ether/expose-socket-timeslider John McLear 2013-02-25 02:14:24 -08:00
  • 17ace39f0a Merge f915285f15 into 5b89242c5b John McLear 2013-02-25 02:14:00 -08:00
  • f915285f15 merge develop John McLear 2013-02-25 10:13:50 +00:00
  • 5b89242c5b Merge pull request #1538 from ether/timeslider-init-hook John McLear 2013-02-25 02:12:37 -08:00
  • 6476acfae1 Merge 9eff8576ef into 26ccb1fa3e John McLear 2013-02-25 02:12:30 -08:00
  • 71ad6bc250 Merge ddba3878e9 into 26ccb1fa3e mluto 2013-02-25 00:00:15 -08:00
  • 26ccb1fa3e Localisation updates from http://translatewiki.net. Siebrand Mazeland 2013-02-24 16:38:27 +00:00
  • 654175dd36 Merge pull request #1530 from ether/dont-lose-caret Marcel Klehr 2013-02-21 08:21:13 -08:00
  • 850cf40157 more mess, again dont merge, just for me err-on-bad-data John McLear 2013-02-21 01:56:57 +00:00
  • 1e6fc26780 throw and post err on bad pad data John McLear 2013-02-21 01:39:03 +00:00
  • f15e11a138 Merge 4a98ec3c23 into 945d5b98e8 John McLear 2013-02-20 14:37:58 -08:00
  • 4a98ec3c23 resolve merge conflict John McLear 2013-02-20 22:37:27 +00:00
  • 945d5b98e8 Merge pull request #1547 from ulikoehler/develop Marcel Klehr 2013-02-20 12:50:57 -08:00
  • d7cbcb242b Merge 813583c9ce into ec4a6bbaf2 Uli Köhler 2013-02-20 12:40:19 -08:00
  • 813583c9ce Update link to dev guidelines Uli Köhler 2013-02-20 21:38:24 +01:00
  • ec4a6bbaf2 Merge pull request #1545 from ether/fix-clients-conn-count John McLear 2013-02-20 08:21:31 -08:00
  • 9e9f99d3b2 Merge fb3e4a6232 into c986a8565a John McLear 2013-02-20 08:12:20 -08:00
  • fb3e4a6232 only show clients on this pad resolves issue #1544 John McLear 2013-02-20 16:10:27 +00:00
  • e52dc2b17c dont reset head count, use the one we should :) John McLear 2013-02-19 02:05:51 +00:00
  • 9eff8576ef timeslider init hook John McLear 2013-02-18 22:04:58 +00:00
  • cda3a0e78b a different approach John McLear 2013-02-18 21:03:52 +00:00
  • c986a8565a Merge pull request #1535 from ether/fix-extractPadData John McLear 2013-02-18 12:41:46 -08:00
  • d4a892bcca Merge 0a19589509 into 4592397bd9 John McLear 2013-02-18 12:40:59 -08:00
  • 0a19589509 fix path for windows John McLear 2013-02-18 20:40:34 +00:00
  • 19964498f3 no need to parse already parsed json John McLear 2013-02-18 20:38:32 +00:00
  • f6eeb3ba1b Merge f4992fa40e into 4592397bd9 Chad Weider 2013-02-18 12:18:11 -08:00
  • 4592397bd9 Merge pull request #1491 from ether/export-txt-with-indent Marcel Klehr 2013-02-18 12:13:06 -08:00
  • 818d360842 Merge aefd8d8d0d into 1a177d730a John McLear 2013-02-18 12:09:28 -08:00
  • ab81b5cfe9 dont jump pages John McLear 2013-02-18 19:46:31 +00:00
  • 5441179e78 dont jump pages John McLear 2013-02-18 19:38:25 +00:00
  • 1a177d730a Merge pull request #1536 from ether/timeslider-scripts-block John McLear 2013-02-18 11:34:53 -08:00
  • 64440ae43b Merge 3f87a32a12 into 1e7d24c03b John McLear 2013-02-18 11:34:45 -08:00
  • 1e7d24c03b Merge branch 'develop' of github.com:ether/etherpad-lite into develop John McLear 2013-02-18 19:34:19 +00:00
  • c37875e09a update changelog John McLear 2013-02-18 19:33:31 +00:00
  • fb97920163 update changelog John McLear 2013-02-18 19:32:07 +00:00
  • e7a07a495c Merge pull request #1531 from ether/fix-for-long-strings John McLear 2013-02-18 11:26:46 -08:00
  • c9fc2fddac Merge 51a9ecf1f0 into 2ee3d0469e John McLear 2013-02-18 11:26:23 -08:00
  • 2ee3d0469e Merge pull request #1533 from ether/indenting-text John McLear 2013-02-18 11:25:55 -08:00
  • 6cc7545bcc Merge 77d03d3473 into abadfb7b6a John McLear 2013-02-18 11:25:26 -08:00
  • 196f998186 Merge 48ffbde731 into abadfb7b6a John McLear 2013-02-18 11:23:15 -08:00
  • 7fcc71710f dont exposrt sendSocketMs John McLear 2013-02-18 18:59:53 +00:00
  • 75fd27998e expose socket timeslider with a bad hack John McLear 2013-02-18 18:58:58 +00:00
  • 3f87a32a12 timestlider script block John McLear 2013-02-18 18:07:01 +00:00
  • f76cfad42b remove cruft John McLear 2013-02-18 08:30:42 -08:00
  • 4cfac2f624 fix extract and checkPad John McLear 2013-02-18 08:29:25 -08:00
  • abadfb7b6a Update README.md John McLear 2013-02-18 15:12:37 +00:00
  • b30e1de3e5 Update README.md John McLear 2013-02-18 15:12:11 +00:00
  • c493b19292 Merge 6086d6a8ac into 7c03bc2610 Nelson Silva 2013-02-18 02:11:09 -08:00
  • 6086d6a8ac Address @marcelklehr comments and 'dry' things Nelson Silva 2013-02-18 10:10:58 +00:00
  • 77d03d3473 Try to add some sanity to indentation John McLear 2013-02-18 01:40:34 +00:00
  • 48ffbde731 allow colon to indent line John McLear 2013-02-18 01:10:54 +00:00
  • eeeeb04840 remove cruft John McLear 2013-02-18 00:37:47 +00:00
  • 6e46a53288 this is probably bad, please sanity check John McLear 2013-02-18 00:36:31 +00:00
  • 11a8295150 eureka John McLear 2013-02-18 00:29:53 +00:00
  • 6d7e709ecb Merge branch 'develop' of github.com:ether/etherpad-lite into store-sessions-in-db John McLear 2013-02-17 23:44:26 +00:00
  • 51a9ecf1f0 better support for other browsers John McLear 2013-02-17 21:19:15 +00:00
  • 7e023ce8e1 make the focus jump back to the left if it's required John McLear 2013-02-17 21:03:19 +00:00
  • 26699618ac Merge pull request #1529 from marcelklehr/fix/i18n/two-part-locale-specs John McLear 2013-02-17 12:37:12 -08:00