fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
2,644 Commits 1 Branch 0 Tags 10 MiB
Commit Graph

2644 Commits

Author SHA1 Message Date
John McLear 6802353306 Merge pull request #1370 from mluto/fix-load-message-IE8 
Fixed message-sending in IE8
 2013-01-16 09:53:39 -08:00
mluto e31b9fd1bd IE8 does not have a string.trim()-function, so use regex.. 2013-01-16 18:48:25 +01:00
John McLear 6055fa9cec Merge pull request #1365 from mluto/fix-load-message-tests 
Fix load message tests
 2013-01-15 14:27:54 -08:00
mluto ae07b73840 Increased timeouts to make IE9 happy, made button-test more strict 2013-01-15 22:51:53 +01:00
Marcel Klehr 92a0e60635 Merge pull request #1364 from t-8ch/fix-readme-links 
fix module links in README.md
 2013-01-15 13:25:54 -08:00
mluto 09fa1d49a1 Added ability to load the same pad twice with helper.newPad, use this in load-message-tests 2013-01-15 22:17:40 +01:00
Thomas Weißschuh 7d2c31d863 fix module links in README.md 2013-01-15 21:16:19 +00:00
John McLear 53b2de51eb Merge pull request #1361 from mluto/fix-checkPad 
Load npm before everything else in checkPad.js
 2013-01-15 06:13:23 -08:00
mluto 7db6448e2a Load npm before everything else in checkPad.js 2013-01-15 07:31:51 +01:00
John McLear 5eb09f981b Merge pull request #1358 from mluto/clientvars-hook 
Make the creation of clientVars hookable
 2013-01-14 14:26:30 -08:00
John McLear bb9097e528 Merge pull request #1355 from mluto/chat-no-empty-line 
prevent empty chat-messages from being sent
 2013-01-14 14:25:46 -08:00
John McLear 92325a3780 Merge pull request #1359 from mluto/package-json-ueberDB 
Require ueberDB 0.1.9, not 0.1.8; this is needed for findKeys
 2013-01-14 14:23:50 -08:00
mluto 27c5498c54 Require ueberDB 0.1.9, not 0.1.8; this is needed for findKeys 2013-01-14 23:22:12 +01:00
mluto 41cb5d8265 Added hook for clientVars and hook-doc 2013-01-14 22:51:26 +01:00
mluto 94f9b05c4c Only create clientVars when they are needed 2013-01-14 22:08:33 +01:00
Swen 96b7b5e8d0 Removed unnecessary return statement 2013-01-14 21:12:40 +01:00
mluto adf5c97664 Added test for empty-message-block 2013-01-14 17:45:11 +01:00
John McLear 025c92f346 Merge pull request #1328 from mluto/run-sh-root-argument 
Added --root argument to run.sh to bypass the root-check, fix for #1324
 2013-01-14 08:14:13 -08:00
John McLear 654654b4e1 Merge pull request #1342 from spcsser/feature/padlisting 
API & backend to list pads on epl instance
 2013-01-14 08:13:57 -08:00
mluto 77401f2759 prevent empty chat-messages from being sent 2013-01-14 17:11:56 +01:00
John McLear 2b89fa8713 Merge pull request #1354 from ether/better-timeslider-blocks 
more sensible timeslider blocks..
 2013-01-13 19:43:08 -08:00
John McLear 1e7bcdba59 more sensible timeslider blocks.. 2013-01-14 03:42:09 +00:00
John McLear 33e0ec2097 Merge pull request #1334 from mluto/load-more-chat-messages 
Load more than 100 chat messages using a 'load more'-link
 2013-01-13 10:31:45 -08:00
John McLear 6104987a4b Merge pull request #1353 from ether/feature/log4js-config-setting 
Add log4js config setting
 2013-01-13 10:28:15 -08:00
John McLear 0bcfef5aa4 Merge pull request #1352 from ether/timeslider-eejs 
add a body eejs block to timeslider
 2013-01-13 10:27:50 -08:00
John McLear eb0338d40c better shindig 2013-01-13 18:23:35 +00:00
Siebrand Mazeland f8d6ffa22a Localisation updates from http://translatewiki.net. 2013-01-13 15:01:03 +00:00
Marcel Klehr f4b95c5ca4 Add log4js config setting 2013-01-13 12:20:49 +01:00
mluto 21b99ccd53 use always() instead of done() and call expect() in there, fixed whitespace 2013-01-13 11:29:28 +01:00
mluto c3dd433c99 Fixed test-names, use waitFor instead of setTimeout 2013-01-13 11:03:52 +01:00
mluto 176719b331 Added tests 2013-01-13 10:39:13 +01:00
John McLear e137919c3d add a body eejs block to timeslider 2013-01-12 23:51:35 +00:00
0ip 2786807f2f Fix broken relative paths 
Bug introduced in 53521c8732
 2013-01-12 18:41:56 +01:00
spcsser 9687ecbb82 Modified pad list manager to return an ordered list. 2013-01-11 18:31:53 +01:00
spcsser 062dbff738 Added listAllPads api docu 2013-01-11 12:59:02 +01:00
Swen e9726890a4 Edited getPads function to be able to work without callback 2013-01-11 04:43:59 +01:00
John McLear 9f92b2156f Merge pull request #1348 from ether/drag-timeslider 
fix #1341 by adding css to stop highlighting
 2013-01-10 07:15:37 -08:00
John McLear 730266256c fix #1341 by adding css to stop highlighting 2013-01-10 15:14:10 +00:00
Marcel Klehr 7a62661705 Merge pull request #1346 from ether/fix-timeslider-date-not-changing 
fix #1345: timeslider time delta
 2013-01-10 04:50:12 -08:00
John McLear ac448937ab fix egils fix of time delta resolves #1345 2013-01-10 00:01:38 +00:00
Swen c9f137b2e5 Added functionality to use spcsser/ueberDB findKey functionality. 2013-01-09 20:45:39 +01:00
Swen 7a49c82e16 Added comments 2013-01-08 20:21:14 +01:00
Swen 8c3263a6ea Added comments 2013-01-08 20:19:10 +01:00
Swen 198754222d Added functionality to list pads on this server. 2013-01-08 20:14:01 +01:00
John McLear 344e8be328 Merge branch 'master' of github.com:ether/etherpad-lite 2013-01-07 19:41:59 +00:00
Marcel Klehr 1f37475ae8 Merge pull request #1337 from ether/release/releases-1.2.4 
Release/releases 1.2.4
 2013-01-07 11:39:54 -08:00
John McLear 66db8392c5 Merge branch 'release/releases-1.2.4' 2013-01-07 19:39:16 +00:00
John McLear fadfa6772e changelog and package file 2013-01-07 19:31:29 +00:00
Marcel Klehr e6d523ba1c Merge pull request #1317 from ether/enter-on-plugins 
/admin/plugins: stop enter reloading new page on search result request
 2013-01-07 10:46:05 -08:00
Marcel Klehr 2a142a01e9 Merge pull request #1332 from ether/dont-run-timeslider-test 
disable timeslider test for now
 2013-01-07 10:44:30 -08:00