Commit graph

  • f4e9a8c633 Merge 7db6448e2a into 5eb09f981b mluto 2013-01-14 22:33:01 -08:00
  • 7db6448e2a Load npm before everything else in checkPad.js mluto 2013-01-15 07:31:51 +01:00
  • 5eb09f981b Merge pull request #1358 from mluto/clientvars-hook John McLear 2013-01-14 14:26:30 -08:00
  • 9f6587adaa Merge 41cb5d8265 into bb9097e528 mluto 2013-01-14 14:26:08 -08:00
  • bb9097e528 Merge pull request #1355 from mluto/chat-no-empty-line John McLear 2013-01-14 14:25:46 -08:00
  • a57a05f1db Merge adf5c97664 into 92325a3780 mluto 2013-01-14 14:25:32 -08:00
  • 92325a3780 Merge pull request #1359 from mluto/package-json-ueberDB John McLear 2013-01-14 14:23:50 -08:00
  • 8a472f96e0 Merge 27c5498c54 into 025c92f346 mluto 2013-01-14 14:22:59 -08:00
  • 27c5498c54 Require ueberDB 0.1.9, not 0.1.8; this is needed for findKeys mluto 2013-01-14 23:22:12 +01:00
  • 41cb5d8265 Added hook for clientVars and hook-doc mluto 2013-01-14 22:51:26 +01:00
  • 94f9b05c4c Only create clientVars when they are needed mluto 2013-01-14 22:08:33 +01:00
  • 96b7b5e8d0 Removed unnecessary return statement Swen 2013-01-14 21:12:40 +01:00
  • 18e98382c0 Added a simple test mluto 2013-01-14 20:37:51 +01:00
  • a4ed01d146 Merge e931769dd6 into 025c92f346 mluto 2013-01-14 09:04:15 -08:00
  • e931769dd6 merged latest develop mluto 2013-01-14 18:03:26 +01:00
  • adf5c97664 Added test for empty-message-block mluto 2013-01-14 17:45:11 +01:00
  • 3eba1cd1a0 Merge f09ecf0b10 into 344e8be328 nareshv 2013-01-14 08:14:41 -08:00
  • 025c92f346 Merge pull request #1328 from mluto/run-sh-root-argument John McLear 2013-01-14 08:14:13 -08:00
  • 08cc98a196 Merge 6a27a54727 into 654654b4e1 mluto 2013-01-14 08:14:06 -08:00
  • 654654b4e1 Merge pull request #1342 from spcsser/feature/padlisting John McLear 2013-01-14 08:13:57 -08:00
  • 259d41eece Merge 9687ecbb82 into 2b89fa8713 Swen 2013-01-14 08:13:47 -08:00
  • 77401f2759 prevent empty chat-messages from being sent mluto 2013-01-14 17:11:56 +01:00
  • 2b89fa8713 Merge pull request #1354 from ether/better-timeslider-blocks John McLear 2013-01-13 19:43:08 -08:00
  • d6c0d59f79 Merge 1e7bcdba59 into 33e0ec2097 John McLear 2013-01-13 19:43:03 -08:00
  • 1e7bcdba59 more sensible timeslider blocks.. John McLear 2013-01-14 03:42:09 +00:00
  • 6a7f4a8906 Removed dateonlyformat in az, el and fr locales (to fix merge-problems) mluto 2013-01-13 19:34:52 +01:00
  • 33e0ec2097 Merge pull request #1334 from mluto/load-more-chat-messages John McLear 2013-01-13 10:31:45 -08:00
  • 404ec721f0 Merge 21b99ccd53 into 6104987a4b mluto 2013-01-13 10:28:29 -08:00
  • 6104987a4b Merge pull request #1353 from ether/feature/log4js-config-setting John McLear 2013-01-13 10:28:15 -08:00
  • 81aee5552d Merge f4b95c5ca4 into 0bcfef5aa4 Marcel Klehr 2013-01-13 10:28:09 -08:00
  • 0bcfef5aa4 Merge pull request #1352 from ether/timeslider-eejs John McLear 2013-01-13 10:27:50 -08:00
  • 598a6c0944 Merge eb0338d40c into f8d6ffa22a John McLear 2013-01-13 10:24:00 -08:00
  • eb0338d40c better shindig John McLear 2013-01-13 18:23:35 +00:00
  • f8d6ffa22a Localisation updates from http://translatewiki.net. Siebrand Mazeland 2013-01-13 15:01:03 +00:00
  • f4b95c5ca4 Add log4js config setting Marcel Klehr 2013-01-13 12:20:49 +01:00
  • 21b99ccd53 use always() instead of done() and call expect() in there, fixed whitespace mluto 2013-01-13 11:29:28 +01:00
  • c3dd433c99 Fixed test-names, use waitFor instead of setTimeout mluto 2013-01-13 11:03:52 +01:00
  • 176719b331 Added tests mluto 2013-01-13 10:39:13 +01:00
  • e137919c3d add a body eejs block to timeslider John McLear 2013-01-12 23:51:35 +00:00
  • 2786807f2f Fix broken relative paths 0ip 2013-01-12 18:41:56 +01:00
  • 9687ecbb82 Modified pad list manager to return an ordered list. spcsser 2013-01-11 18:31:53 +01:00
  • 062dbff738 Added listAllPads api docu spcsser 2013-01-11 12:59:02 +01:00
  • e9726890a4 Edited getPads function to be able to work without callback Swen 2013-01-11 04:43:59 +01:00
  • 9f92b2156f Merge pull request #1348 from ether/drag-timeslider John McLear 2013-01-10 07:15:37 -08:00
  • 1630369239 Merge 730266256c into 7a62661705 John McLear 2013-01-10 07:15:32 -08:00
  • e0ba68c0fb Merge 730266256c into 344e8be328 John McLear 2013-01-10 07:15:03 -08:00
  • 730266256c fix #1341 by adding css to stop highlighting John McLear 2013-01-10 15:14:10 +00:00
  • 7a62661705 Merge pull request #1346 from ether/fix-timeslider-date-not-changing Marcel Klehr 2013-01-10 04:50:12 -08:00
  • 675a7f77a9 Merge ac448937ab into fadfa6772e John McLear 2013-01-09 16:03:22 -08:00
  • ac448937ab fix egils fix of time delta resolves #1345 John McLear 2013-01-10 00:01:38 +00:00
  • c9f137b2e5 Added functionality to use spcsser/ueberDB findKey functionality. Swen 2013-01-09 20:45:39 +01:00
  • 7a49c82e16 Added comments Swen 2013-01-08 20:21:14 +01:00
  • 8c3263a6ea Added comments Swen 2013-01-08 20:19:10 +01:00
  • 198754222d Added functionality to list pads on this server. Swen 2013-01-08 20:14:01 +01:00
  • 344e8be328 Merge branch 'master' of github.com:ether/etherpad-lite 1.2.4 John McLear 2013-01-07 19:41:59 +00:00
  • 1f37475ae8 Merge pull request #1337 from ether/release/releases-1.2.4 Marcel Klehr 2013-01-07 11:39:54 -08:00
  • 66db8392c5 Merge branch 'release/releases-1.2.4' John McLear 2013-01-07 19:39:16 +00:00
  • 0c741c5835 Merge fadfa6772e into a42f220ee2 John McLear 2013-01-07 11:37:33 -08:00
  • fadfa6772e changelog and package file John McLear 2013-01-07 19:31:29 +00:00
  • e6d523ba1c Merge pull request #1317 from ether/enter-on-plugins Marcel Klehr 2013-01-07 10:46:05 -08:00
  • 1c5d0a88b9 Merge 8e366da82e into 2a142a01e9 John McLear 2013-01-07 10:45:39 -08:00
  • 2a142a01e9 Merge pull request #1332 from ether/dont-run-timeslider-test Marcel Klehr 2013-01-07 10:44:30 -08:00
  • 089384acd4 Merge 7a2f16f288 into 5453764e31 John McLear 2013-01-07 10:44:17 -08:00
  • 5453764e31 Merge pull request #1336 from poscar/ie_console_fix Marcel Klehr 2013-01-07 10:43:48 -08:00
  • 32fce98d96 Merge f00dddd09c into 042c1c0c98 Oscar Perez 2013-01-07 10:41:55 -08:00
  • 92feecb4c3 Merge f00dddd09c into a42f220ee2 Oscar Perez 2013-01-07 10:31:16 -08:00
  • f00dddd09c Moved console existence check before the variable is used. This was causing a crash in Internet Explorer when the console was not enabled (console is off by default). Oscar Perez 2013-01-07 13:24:40 -05:00
  • bc05f9eb0a converted load-more-link to button, added loading-gif, fixed typo mluto 2013-01-07 19:15:55 +01:00
  • 825b258d99 only load 20 messages when pressing the load-link, fixed whitespace mluto 2013-01-07 17:43:03 +01:00
  • 5f81daed0a Added link to load more chat-messages using new GET_CHAT_MESSAGES mluto 2013-01-07 17:36:03 +01:00
  • 042c1c0c98 Merge pull request #1333 from mluto/fix-readme-link John McLear 2013-01-07 08:21:15 -08:00
  • 3e8d74b1dd Merge a65c7e1b6a into 1782c68d4d mluto 2013-01-07 07:27:18 -08:00
  • a65c7e1b6a fixed 'client implementations'-link in README.md mluto 2013-01-07 16:25:43 +01:00
  • 7a2f16f288 dont run timeslider test for now John McLear 2013-01-07 11:49:04 +00:00
  • 8e366da82e use .val() instead of [0] John McLear 2013-01-07 11:27:40 +00:00
  • 1782c68d4d Localisation updates from http://translatewiki.net. Siebrand Mazeland 2013-01-07 10:18:02 +00:00
  • b96dc24876 fixed broken placeholders in locales mluto 2013-01-07 08:03:15 +01:00
  • 44981e8907 Merge pull request #1331 from mluto/fix-locales John McLear 2013-01-06 12:03:34 -08:00
  • eac2758b8e Merge c57ecf06ca into 1e723d02b1 mluto 2013-01-06 12:02:54 -08:00
  • 1e723d02b1 Merge pull request #1330 from mluto/fix-extractPadData John McLear 2013-01-06 12:02:39 -08:00
  • b3c72cd0ed Merge e7d9359737 into 2a89dc5913 mluto 2013-01-06 11:20:58 -08:00
  • e7d9359737 Added error-handling for npm mluto 2013-01-06 20:20:46 +01:00
  • b26c1a67f0 Merge 7ec7ccc402 into a42f220ee2 mluto 2013-01-06 10:26:42 -08:00
  • 7ec7ccc402 Fixed extractPadData.js, #1320 mluto 2013-01-06 19:25:32 +01:00
  • c57ecf06ca fixed broken placeholders in locales mluto 2013-01-06 18:50:52 +01:00
  • 2a89dc5913 Merge pull request #1327 from mluto/order-styles-script Marcel Klehr 2013-01-06 09:46:57 -08:00
  • 5592c4b0fe client loads messages using the new client loads messages using new method, getChatMessages restructured and renamed to getLastChatMessages, added GET_CHAT_MESSAGES, getChatMessages restructured and renamed to getLastChatMessages mluto 2013-01-06 16:11:48 +01:00
  • 9484b92ae2 fixed and unified indenting, added comments in handleClientReady mluto 2013-01-06 14:55:33 +01:00
  • e932b206e2 Added day-seperator in chat mluto 2013-01-06 12:56:25 +01:00
  • 6a27a54727 Added --root argument to run.sh to bypass the root-check, fix for #1324 mluto 2013-01-06 12:48:32 +01:00
  • dea3702389 Merge 77315aa1d4 into 6e7b694243 mluto 2013-01-06 03:28:08 -08:00
  • 77315aa1d4 Load CSS before JS, in timeslider mluto 2013-01-06 12:26:00 +01:00
  • c56c7b8ca9 Load CSS before JS mluto 2013-01-06 12:19:56 +01:00
  • 0eeed7abef i18nized date-format on chat messages mluto 2013-01-04 20:09:56 +01:00
  • d1062fea5e Introduced new i18n message 'timeslider.dateonlyformat' mluto 2013-01-04 20:05:55 +01:00
  • 4ea6ab6827 Show current date when hovering the time of a chat-message mluto 2013-01-04 17:18:03 +01:00
  • 6e7b694243 Merge pull request #1318 from stephan48/develop John McLear 2013-01-02 06:20:59 -08:00
  • 40ab6054dd Merge 9f9f7a627e into 1d5dbd45ca Stephan Jauernick 2013-01-02 06:20:23 -08:00
  • 9f9f7a627e corrected a documentation glitch for checkToken - clarified which token is validated Stephan Jauernick 2013-01-02 15:14:46 +01:00
  • 3289354f7a Merge c370f779cc into a42f220ee2 John McLear 2013-01-02 06:03:55 -08:00