mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2026-05-08 05:36:09 +02:00
Code Issues Projects Releases Wiki Activity
9,717 Commits 231 Branches 137 Tags
Commit Graph

6121 Commits

Author SHA1 Message Date
Luc Didry
a08c50a77d Fixes #1870 
Add two functions to API :
 * getSavedRevisionsCount
 * listSavedRevisions
 2015-02-24 23:42:35 +01:00
John McLear
1c044588e6 mobile stylings for chat always on screen 2015-02-22 17:56:44 +00:00
John McLear
470b0ba2a6 Merge pull request #2520 from ether/load-testing-settings 
allow for load testing connections to hit by a setting
 2015-02-22 14:41:09 +00:00
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
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 66582b19e7a196b77df1e9a912db020189a93014.
 2015-02-16 06:22:49 +01:00
webzwo0i
83e1bf0dc4 add semicolons 2015-02-16 03:33:57 +01:00
webzwo0i
66582b19e7 51c14d994756e60333b0b60eccb7255cf0c86461 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 
3354b9406b94e1a04b5eee1c0152914dde73ba89
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
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
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
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
7adcd5cba4 cleaner fix for queue issue 2015-02-08 14:34:48 +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
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
35da64be5c hrm bit of a hack, anyone any ideas on better way? 2015-01-28 19:09:47 +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
Siebrand Mazeland
78c3a8d65b Localisation updates from https://translatewiki.net. 2015-01-26 22:58:30 +01:00
John McLear
b6e7ddf874 bump v 2015-01-26 16:11:15 +00:00
John McLear
4de42da2e3 Merge pull request #2497 from ether/image-support-hook 
clean support for image hook
 2015-01-26 16:07:56 +00:00
John McLear
c4f1189ebd even cleaner 2015-01-26 02:39:43 +00:00
John McLear
18121a1507 much cleaner 2015-01-26 02:32:58 +00:00
John McLear
8156930208 clean support for image hook 2015-01-26 01:44:40 +00:00
Stefan
4c64b7a670 Revert 'asyncLineHTMLForExport' hook 2015-01-25 22:08:40 +01:00
John McLear
aca745ddf6 tell installer if old etherpad needs updating during plugin install 2015-01-25 02:44:10 +00:00
John McLear
831151cfba Merge pull request #2487 from ether/html-e-hook 
Better HTML Export rewrite hook allows functions to be passed instead of strings means state is saved between plugins
 2015-01-25 00:07:34 +00:00
John McLear
f3e5682a0f fix issue with load of showuserandchat 2015-01-24 18:31:19 +00:00