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

4231 Commits (c65ddad7d6727e9994a32ab2f450e9dd23cfc240)

Author SHA1 Message Date
John McLear d5bec1701e fix export of bad pads and also limit import to files 2015-02-21 12:33:30 +00:00
Siebrand Mazeland abb9b6d833 Localisation updates from https://translatewiki.net. 2015-02-19 13:02:42 +01:00
John McLear ec6a2b5ba9 allow for load testing connections to hit by a setting 2015-02-16 23:02:19 +00:00
John McLear 0900eb5105 Merge branch 'develop' of github.com:ether/etherpad-lite into develop 2015-02-16 12:28:42 +00:00
webzwo0i 37924e441a add try-catch clause around calls to applyToAText 2015-02-16 09:01:30 +01:00
webzwo0i c9a5167b41 throw in applyToText and not in applyToAText 2015-02-16 06:27:18 +01:00
webzwo0i 59328aa33a Revert "51c14d994756e60333b0b60eccb7255cf0c86461 changed the return value of" 
This reverts commit 66582b19e7.
 2015-02-16 06:22:49 +01:00
webzwo0i 83e1bf0dc4 add semicolons 2015-02-16 03:33:57 +01:00
John McLear d1b1f376bb Merge pull request #2519 from Gared/support_node_0.12 
Support node version 0.12.x
 2015-02-16 00:10:09 +00:00
Stefan 0505a47356 Support node version 0.12.x 2015-02-15 22:21:41 +01:00
webzwo0i 66582b19e7 51c14d9947 changed the return value of 
applyToText to an array that includes if there was an error in the
newline part of an changeset op.
easysync_tests need to know this too
 2015-02-15 16:21:07 +01:00
webzwo0i 440f74b2c1 we do not have the text/padid, but at least we can print the changeset 2015-02-15 15:47:45 +01:00
webzwo0i b9dd983f81 print the actual text... 2015-02-15 15:27:27 +01:00
webzwo0i c6ef7f4867 string concat, not multiple arguments... 2015-02-15 15:26:07 +01:00
webzwo0i 1f6a9afae4 better error message 2015-02-15 15:23:43 +01:00
webzwo0i e7f01fa498 remove unnecessary code; because we have checks in every op now we don't 
need this anymore
 2015-02-15 15:12:24 +01:00
webzwo0i ac2c7e9679 add newline counting for - and + op 2015-02-15 15:09:38 +01:00
webzwo0i b4d4b16b1f off by 1 2015-02-15 14:56:20 +01:00
webzwo0i 4313bd27f8 add a comment to make clear that the string in stringIterator 
does not change; only curIndex is increased. Newlines are counted
between curIndex and the end of string.
 2015-02-15 13:25:57 +01:00
webzwo0i c191a8716e totally wrong, introduced by myself in 
3354b9406b
the first part is always false so the second part which is always true
in case a cs deleted some lines was never triggered...sigh
 2015-02-14 16:41:50 +01:00
John McLear e39b442840 bump v for #2505 fix 2015-02-13 01:25:29 +00:00
John McLear c481d135a5 Merge pull request #2517 from ether/version-on-admin-page 
Puts Git revision on the info page
 2015-02-11 18:07:00 +00:00
John McLear d0caebc21f may aswell make the git sha a link to the commit 2015-02-11 18:05:01 +00:00
John McLear ddc69831b2 working, need to test though 2015-02-11 17:59:05 +00:00
John McLear 7e7eb542be Merge pull request #2515 from ether/rewrite-pad-path 
seems right
 2015-02-11 02:07:58 +00:00
John McLear 275592e423 seems right 2015-02-11 02:07:20 +00:00
John McLear 0ad09c17db fix JS error in timeslider if offset doesn't exist 2015-02-09 23:04:30 +00:00
John McLear 26ae375727 minor css polish for user input 2015-02-09 19:53:32 +00:00
John McLear ac7a5689af Merge pull request #2510 from ether/chat-users-flow-css 
better css
 2015-02-09 19:47:14 +00:00
John McLear b216f9271b should be final logic for chatandusers 2015-02-09 19:11:35 +00:00
John McLear 5245d2b797 and even mroe polish 2015-02-09 18:36:11 +00:00
John McLear 8c6507e78c more styling stuff 2015-02-09 18:01:45 +00:00
John McLear 4af46921e1 better css 2015-02-09 17:37:20 +00:00
Mike DeRosa 4c6bd37286 Adding api call for appending a chat message. 2015-02-09 00:18:12 -05:00
John McLear 5c31d1f528 Merge pull request #2508 from ether/fix-chat-scroll 
Fix chat scroll
 2015-02-08 14:35:59 +00:00
John McLear ebff7d128b cleaner fix for queue issue 2015-02-08 14:35:22 +00:00
John McLear 7adcd5cba4 cleaner fix for queue issue 2015-02-08 14:34:48 +00:00
John McLear 4e3c106192 Merge pull request #2507 from ether/fix-chat-scroll 
fix scroll issue where focus is not well managed
 2015-02-07 23:26:50 +00:00
John McLear 1652ed42c5 fix scroll issue where focus is not well managed 
remove console logs
 2015-02-07 23:26:02 +00:00
John McLear fe4dd98a6e remove console logs 2015-02-07 23:24:24 +00:00
John McLear 4c667ecef6 fix scroll issue where focus is not well managed 2015-02-07 23:23:33 +00:00
John McLear b9802616b6 use latest cleanCSS 2015-02-04 17:57:34 +00:00
John McLear 9afcd89167 bump versions to see if it's stable 2015-02-04 17:52:27 +00:00
John McLear f0d29567b5 Merge pull request #2500 from JulR43/patch-1 
Change git-core to git
 2015-02-01 23:31:54 +00:00
John McLear 35da64be5c hrm bit of a hack, anyone any ideas on better way? 2015-01-28 19:09:47 +00:00
JulR43 b9b110c82f Change git-core to git 
git-core package is an obsolete transitional package, it was renamed git.
 2015-01-28 17:29:16 +00:00
John McLear 0216a10a12 better variable name 2015-01-27 20:10:38 +00:00
John McLear a9910c741e Merge branch 'develop' of github.com:ether/etherpad-lite into develop 2015-01-27 19:41:09 +00:00
John McLear bdfce1cbef change to cc.. 2015-01-27 19:41:01 +00:00
John McLear 8fbd7d83b6 content collector should also register the blocks, no idea why this wasnt in before 2015-01-27 19:16:36 +00:00