public-offering
/
pad.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,569 Commits
190 Branches
71 Tags
55 MiB
Commit Graph

2569 Commits (d478ae23863f85dd1918e4b9494a717592bd60fd)

Author SHA1 Message Date
John McLear 97afd1cc79 Merge pull request #1383 from disy-mk/patch-2 
Patch 2
 2013-01-21 15:58:00 -08:00
Manuel Knitza 7066ed183d Update bin/convert.js 
'lil typo
 2013-01-22 00:56:39 +01:00
John McLear 441dd3785a fix issue #1110 2013-01-20 23:11:59 +00:00
John McLear 8bfa8a7e73 better urls 2013-01-20 22:42:32 +00:00
John McLear 4cbf3869c6 open in external window 2013-01-20 22:36:58 +00:00
John McLear 1bf526124d resolve #1349 2013-01-20 22:34:27 +00:00
John McLear 4204bf9009 Merge branch 'release/releases-1.2.6' into develop 2013-01-20 13:46:11 +00:00
John McLear 6b13bfa1e8 Merge branch 'release/releases-1.2.6' 2013-01-20 13:46:07 +00:00
John McLear 4b5d993f0d bump v and create CHANGELOG 2013-01-20 13:45:16 +00:00
John McLear 280359a36d Merge branch 'develop' of github.com:ether/etherpad-lite into develop 2013-01-20 13:43:14 +00:00
John McLear b282547dbf Merge pull request #1376 from t-8ch/patch-2 
listAllPads needs findKeys from ueberDB 0.1.9
 2013-01-20 05:42:44 -08:00
John McLear 0a06b07f7d Merge pull request #1377 from mluto/add-users-block 
Added a template block for #users
 2013-01-20 05:35:19 -08:00
mluto 9c364d7d38 Added a template block for #users 2013-01-20 13:56:51 +01:00
Thomas Weißschuh 9ee5098ad6 listAllPads needs findKeys from ueberDB 0.1.9 2013-01-19 19:17:52 +00:00
John McLear 74c86da0ae Merge pull request #1375 from jhollinger/develop 
listAllPads should return an object, not an arraay. issue #1374
 2013-01-18 08:42:25 -08:00
Jordan Hollinger 858d8e6e71 listAllPads should return an object, not an arraay. issue #1374 2013-01-18 11:13:03 -05:00
John McLear 37c55effd6 Merge branch 'master' of github.com:ether/etherpad-lite 2013-01-18 13:41:53 +00:00
John McLear ec64f71d23 Merge branch 'release/releases-1.2.5' 2013-01-18 13:41:33 +00:00
John McLear 84065d8309 Merge pull request #1373 from ether/release/releases-1.2.5 
Release/releases 1.2.5
 2013-01-18 05:41:20 -08:00
John McLear 96989e63c7 prepare for release 2013-01-18 13:30:46 +00:00
John McLear 292db5fc44 prepare for release 2013-01-18 13:29:43 +00:00
Marcel Klehr 88e42dd109 Merge pull request #1366 from ether/master 
Bring develop up to date with master
 2013-01-17 08:42:21 -08:00
John McLear c731269a87 Merge pull request #1371 from ether/fix/ie8-onload-html10n 
Fix onload event listener in html10n
 2013-01-17 08:41:10 -08:00
John McLear c8786bfdf5 Merge pull request #1372 from marcelklehr/fix/checkPad-async.series 
Fix #1367: async.series was lacking callback in checkPad.js
 2013-01-17 08:35:50 -08:00
Marcel Klehr 90ca3d53c3 Fix #1367: async.series was lacking callback in checkPad.js 2013-01-17 17:31:56 +01:00
Marcel Klehr a1188c15c0 [html10n] Fix onload event listener (must be attached to window!) 2013-01-16 19:47:54 +01:00
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
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