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

2524 Commits (3fb2f02875bfd0da7097a3fa021c7959bde1811b)

Author SHA1 Message Date
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
Marcel Klehr 5453764e31 Merge pull request #1336 from poscar/ie_console_fix 
Fixed IE crash related to console usage. (Fix #1321)
 2013-01-07 10:43:48 -08:00
Oscar Perez 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). 2013-01-07 13:24:40 -05:00
mluto bc05f9eb0a converted load-more-link to button, added loading-gif, fixed typo 2013-01-07 19:15:55 +01:00
mluto 825b258d99 only load 20 messages when pressing the load-link, fixed whitespace 2013-01-07 17:43:03 +01:00
mluto 5f81daed0a Added link to load more chat-messages using new GET_CHAT_MESSAGES 2013-01-07 17:36:03 +01:00
John McLear 042c1c0c98 Merge pull request #1333 from mluto/fix-readme-link 
fixed 'client implementations'-link in README.md
 2013-01-07 08:21:15 -08:00
mluto a65c7e1b6a fixed 'client implementations'-link in README.md 2013-01-07 16:25:43 +01:00
John McLear 7a2f16f288 dont run timeslider test for now 2013-01-07 11:49:04 +00:00
John McLear 8e366da82e use .val() instead of [0] 2013-01-07 11:27:40 +00:00
Siebrand Mazeland 1782c68d4d Localisation updates from http://translatewiki.net. 2013-01-07 10:18:02 +00:00
John McLear 44981e8907 Merge pull request #1331 from mluto/fix-locales 
Fixed broken placeholders in locales
 2013-01-06 12:03:34 -08:00
John McLear 1e723d02b1 Merge pull request #1330 from mluto/fix-extractPadData 
Fixed extractPadData.js, #1320
 2013-01-06 12:02:39 -08:00
mluto e7d9359737 Added error-handling for npm 2013-01-06 20:20:46 +01:00
mluto 7ec7ccc402 Fixed extractPadData.js, #1320 2013-01-06 19:25:32 +01:00
mluto c57ecf06ca fixed broken placeholders in locales 2013-01-06 18:50:52 +01:00
Marcel Klehr 2a89dc5913 Merge pull request #1327 from mluto/order-styles-script 
Optimize the order of styles and scripts
 2013-01-06 09:46:57 -08:00
mluto 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 2013-01-06 16:11:48 +01:00
mluto 9484b92ae2 fixed and unified indenting, added comments in handleClientReady 2013-01-06 14:55:33 +01:00
mluto 6a27a54727 Added --root argument to run.sh to bypass the root-check, fix for #1324 2013-01-06 12:48:32 +01:00
mluto 77315aa1d4 Load CSS before JS, in timeslider 2013-01-06 12:26:00 +01:00