Commit graph

  • ef7fb5c7f0 Update npm Marcel Klehr 2013-03-25 12:18:06 +01:00
  • aabbd8e528 adds missing semicolons in src/static/js folder disy-mk 2013-03-24 03:44:17 +01:00
  • 046dad97a6 adds missing semicolons in src/node/db disy-mk 2013-03-24 02:58:14 +01:00
  • 655e079399 adds missing semicolons in src/node folder disy-mk 2013-03-24 02:36:50 +01:00
  • 3703aaa6f0 adds missing semicolons in src/node/eejs folder disy-mk 2013-03-24 02:31:13 +01:00
  • 2e7a9796de option to show sticky chat on screen, note i use a literal string, how am i supposed to add a l10n title? John McLear 2013-03-24 01:12:01 +00:00
  • bd7b0c5fdd Merge af80e37ac7 into 34e3e2f432 John McLear 2013-03-23 18:09:26 -07:00
  • c440e98145 Merge 0a468e92b6 into 34e3e2f432 Marcel Klehr 2013-03-23 18:09:25 -07:00
  • 13109789ed Merge a79782a36d into 34e3e2f432 Manuel Knitza 2013-03-23 17:36:55 -07:00
  • a79782a36d adds missing semicolons in src/node/handler folder disy-mk 2013-03-24 01:33:28 +01:00
  • 34e3e2f432 Merge pull request #1662 from disy-mk/jshint_semicol_utils John McLear 2013-03-23 17:31:33 -07:00
  • 9a36c2db3c Merge c78aad16ea into 35e4891217 Manuel Knitza 2013-03-23 17:29:48 -07:00
  • c78aad16ea adds missing semicolons in src/node/utils folder disy-mk 2013-03-24 01:18:44 +01:00
  • 0a468e92b6 Use a node domain per message to stabilize the server feature/message-domains Marcel Klehr 2013-03-23 22:22:14 +01:00
  • d515acae96 expires was never defined John McLear 2013-03-23 18:01:44 +00:00
  • b3988e30d5 pump isdeprecated John McLear 2013-03-23 17:55:34 +00:00
  • af80e37ac7 missed this one.. John McLear 2013-03-23 15:03:56 +00:00
  • c565b5bde4 Merge branch 'develop' of github.com:ether/etherpad-lite into develop John McLear 2013-03-23 07:59:33 -07:00
  • ab2e805aa0 changelog John McLear 2013-03-23 14:50:00 +00:00
  • 35e4891217 Localisation updates from http://translatewiki.net. Siebrand Mazeland 2013-03-23 13:26:38 +00:00
  • 5ede02ffb7 Merge pull request #1656 from ether/cookies Marcel Klehr 2013-03-23 04:08:27 -07:00
  • 5ad49b3fb1 Merge 0063933041 into 73afc595e5 John McLear 2013-03-22 20:00:46 -07:00
  • 0063933041 fix cookies John McLear 2013-03-23 02:59:12 +00:00
  • 06532a04f3 this is why cookies weren't working in plugins re-enable-cookies John McLear 2013-03-23 02:18:22 +00:00
  • e050ad57e4 fix typo John McLear 2013-03-22 17:39:22 +00:00
  • 73afc595e5 Merge pull request #1655 from simong/cassandra John McLear 2013-03-22 08:24:34 -07:00
  • 5d2884847e Merge cbde18945c into 09edfb0d5e Simon Gaeremynck 2013-03-22 08:22:28 -07:00
  • cbde18945c Bumped the ueberDB package version to 0.1.96 to add in Cassandra support. Simon Gaeremynck 2013-03-22 15:15:45 +00:00
  • 2c34f6673c Merge branch 'custom-obj-msg' of github.com:ether/etherpad-lite into develop John McLear 2013-03-21 18:49:03 -07:00
  • 23415eae49 Merge branch 'develop' of github.com:ether/etherpad-lite into custom-obj-msg John McLear 2013-03-22 00:40:17 +00:00
  • 1bf9d53f6a Merge branch 'custom-obj-msg' of github.com:ether/etherpad-lite into develop John McLear 2013-03-21 16:47:37 -07:00
  • 09edfb0d5e Merge pull request #1649 from sahilamoli/FirefoxFixForLineBreaks John McLear 2013-03-20 16:36:10 -07:00
  • 8e10999761 Merge 23abafb3cb into d40a64893c sahilamoli 2013-03-20 15:50:11 -07:00
  • 23abafb3cb Issue #1648 - Long lines without any spaces don't wrap on Firefox, the text ends up going off screen Sahil Amoli 2013-03-20 15:39:10 -07:00
  • d40a64893c Merge pull request #1633 from ether/mobile-msg-css John McLear 2013-03-19 18:17:31 -07:00
  • b245c3901b Merge 2a1859cc6d into 9d14c3708d John McLear 2013-03-19 18:15:22 -07:00
  • 2a1859cc6d mm k John McLear 2013-03-20 01:14:04 +00:00
  • 4ea7ccd104 merge develop John McLear 2013-03-20 01:11:27 +00:00
  • 9d14c3708d Merge pull request #1644 from ether/chatMsgHook John McLear 2013-03-19 18:10:31 -07:00
  • 021a608d3c Merge bcb92f25a6 into 588fd399cd John McLear 2013-03-19 12:21:40 -07:00
  • bcb92f25a6 Refactor chat notifications and the chatNewMessage hook Marcel Klehr 2013-03-19 20:21:27 +01:00
  • 588fd399cd Merge pull request #1645 from ether/fix/import-without-files John McLear 2013-03-19 10:41:32 -07:00
  • 83b8dc1121 Merge c30697cb07 into 5e07f24c69 Marcel Klehr 2013-03-19 10:41:00 -07:00
  • c30697cb07 Don't break the whole server if an import failed because no files were uploaded Marcel Klehr 2013-03-19 18:40:39 +01:00
  • 5e07f24c69 Merge pull request #1646 from ether/feature/log-http-on-debug-level John McLear 2013-03-19 10:39:15 -07:00
  • 49fa7b053a Merge a628317b55 into cb45c44b4d Marcel Klehr 2013-03-19 10:37:41 -07:00
  • a628317b55 Log http on debug log level Marcel Klehr 2013-03-19 18:34:21 +01:00
  • a9bd081a44 more clean up John McLear 2013-03-19 16:55:42 +00:00
  • 9bb0587447 working and jsonify obj John McLear 2013-03-19 16:40:51 +00:00
  • 2916b39c24 make sure the sessionID target is right John McLear 2013-03-19 16:21:04 +00:00
  • cb45c44b4d Merge pull request #1588 from disy-mk/patch-2 Marcel Klehr 2013-03-19 08:47:26 -07:00
  • d0e656d0a6 Merge branch 'develop' of github.com:ether/etherpad-lite into custom-obj-msg John McLear 2013-03-19 13:59:07 +00:00
  • 11341eb095 add a test to show weird behavior John McLear 2013-03-19 12:52:14 +00:00
  • e2489182db Merge d464ea9817 into 07adb45503 Manuel Knitza 2013-03-19 05:47:51 -07:00
  • 8406cc95ab docs for hook John McLear 2013-03-19 03:43:38 +00:00
  • 7741f762e2 hook for chat msg John McLear 2013-03-19 02:21:53 +00:00
  • 13ee96dce0 more tests but still fundamental flaw with arrow keys John McLear 2013-03-18 22:14:41 +00:00
  • ee6a7d0b0c most test pass but important ones failed John McLear 2013-03-18 22:09:51 +00:00
  • 07adb45503 Merge pull request #1643 from ether/fix/html10n-update John McLear 2013-03-18 14:38:22 -07:00
  • fc5e10d33a Merge b3dbf1c995 into e49620ea07 Marcel Klehr 2013-03-18 14:38:19 -07:00
  • e49620ea07 update ueber for pg John McLear 2013-03-18 21:36:50 +00:00
  • b3dbf1c995 Update html10n.js Marcel Klehr 2013-03-18 22:29:42 +01:00
  • 65e51473bc Merge pull request #1642 from ether/fix/import John McLear 2013-03-18 14:12:09 -07:00
  • 159db66342 Merge 2bc45de106 into 83ed9303da Marcel Klehr 2013-03-18 14:11:21 -07:00
  • 2bc45de106 Fix #1639 by removing bodyParser middleware introduced with swagger REST API Marcel Klehr 2013-03-18 22:09:47 +01:00
  • fb9d46fc51 document the required tests John McLear 2013-03-18 20:08:58 +00:00
  • 3562672a75 stop start point going negative John McLear 2013-03-18 18:44:01 +00:00
  • 27e9f91864 page up, down etc all working, still no shift page up/down for highlight but that never worked anyways John McLear 2013-03-18 18:03:37 +00:00
  • 9f54a65c88 refactored arrow keys now work after paste in chrome John McLear 2013-03-18 17:40:18 +00:00
  • 256a64e700 small *optical* updates Manuel Knitza 2013-03-18 10:49:42 +01:00
  • 83ed9303da Localisation updates from http://translatewiki.net. Siebrand Mazeland 2013-03-18 00:43:57 +00:00
  • 61cc528140 Update http_api.md Manuel Knitza 2013-03-18 01:26:37 +01:00
  • 1b10498a22 Update http_api.md Manuel Knitza 2013-03-18 01:26:10 +01:00
  • a70dfb43cf /API/versions endpoint Manuel Knitza 2013-03-18 01:03:27 +01:00
  • 9c754a7397 collecting all available API versions to a list Manuel Knitza 2013-03-18 01:01:55 +01:00
  • 99ac407f08 working caret position function John McLear 2013-03-17 23:16:23 +00:00
  • bf29feb321 A nicer way to handle the API versions Manuel Knitza 2013-03-17 23:44:54 +01:00
  • 81f0ef73ab beginning of FE tests for caret tracking which is easily broken when you add weird line heights to pads John McLear 2013-03-17 22:15:18 +00:00
  • f238ba2f26 Merge pull request #1636 from maixithn/patch-1 John McLear 2013-03-17 14:25:44 -07:00
  • 5e6ccdd118 Merge b084cf4f28 into 755965d904 maixithn 2013-03-17 13:58:03 -07:00
  • b084cf4f28 Update README.md maixithn 2013-03-17 21:57:14 +01:00
  • 3e0a80cb74 remove console log John McLear 2013-03-17 15:17:36 +00:00
  • 693b9b9b94 better mobile support for gritter messages, before it was awful John McLear 2013-03-17 01:23:31 +00:00
  • 755965d904 Merge pull request #1632 from ether/enable-buttons-reconnect John McLear 2013-03-16 10:58:27 -07:00
  • 72f5749c67 Merge a1d9d27cde into d26660bce1 John McLear 2013-03-16 10:58:20 -07:00
  • a1d9d27cde much cleaner way of showing / hiding overlay John McLear 2013-03-16 17:57:23 +00:00
  • 69a4ab76cf hide modal once reconnect is good John McLear 2013-03-16 17:50:53 +00:00
  • d26660bce1 Merge pull request #1629 from accolade/patch-1 John McLear 2013-03-16 09:16:51 -07:00
  • b097103580 Merge f972d2a92d into a31605216f accolade 2013-03-16 09:16:23 -07:00
  • f972d2a92d (( 2 typos accolade 2013-03-16 17:05:23 +01:00
  • 13ad46aa67 a safer approach I think but still be careful John McLear 2013-03-16 13:19:12 +00:00
  • cd9c78998e Fix path.join in Settings.js Marcel Klehr 2013-03-16 09:47:10 +01:00
  • 5a9393d5da Update version checks Marcel Klehr 2013-03-16 09:46:35 +01:00
  • a31605216f Merge branch 'release/1.2.9' 1.2.9 Marcel Klehr 2013-03-15 21:43:58 +01:00
  • 54433db47f release v1.2.9 Marcel Klehr 2013-03-15 21:43:29 +01:00
  • 84d44d5f0e Merge pull request #1622 from ether/fix/submitting-submitting-faked-changesets Marcel Klehr 2013-03-15 12:20:31 -07:00
  • 57de00d80b Merge de552df6db into cf041dcb08 Marcel Klehr 2013-03-15 10:09:07 -07:00
  • de552df6db Fix clearing authorship colors which was broken by #1609 Marcel Klehr 2013-03-15 18:08:51 +01:00
  • ffe7e65db6 allow strict transport if ssl is on and stop x-frame-options, this might break embedded pads, please test John McLear 2013-03-14 19:03:20 -03:00
  • cf041dcb08 Merge pull request #1618 from ether/tidy-up John McLear 2013-03-14 14:32:13 -07:00