John McLear
d991dab8b2
Merge pull request #2550 from webzwo0i/fix-export-leak
...
oops, fix export with wildcards
2015-03-13 23:34:05 +00:00
webzwo0i
a0fb65205c
oops, fix export with wildcards
2015-03-14 00:02:23 +01:00
John McLear
ec7ff3a0ca
Merge pull request #2548 from lid2000/patch-1
...
Return true from handleCut function
2015-03-13 10:51:25 +00:00
lid2000
7894545556
Return true from handleCut function
2015-03-13 16:01:18 +11:00
John McLear
56dbad41ad
a should always have white space pre-wrap stops caret walking in chrome on them
2015-03-04 17:46:49 +00:00
John McLear
4e0353b3ef
bump ueber
2015-03-02 08:59:53 +00:00
John McLear
cc0eaba7e2
Merge pull request #2533 from cjb/issue-2514-renumber-on-cut
...
Trigger renumbering when deleting (via cut) the first item of a list
2015-02-27 22:07:08 +00:00
Chris Ball
063219bbce
Trigger renumbering when deleting (via cut) the first item of a list
...
Fixes #2514 .
2015-02-27 12:54:29 -05:00
John McLear
152f51aeab
Merge pull request #2527 from ldidry/issue-1870-get-saved-revisions-count
...
Fixes #1870
2015-02-27 12:03:03 +00:00
John McLear
38a4f1be5f
bump ueberdb
2015-02-26 12:14:01 +00:00
John McLear
178309e10d
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
2015-02-26 12:13:41 +00:00
Luc Didry
92022e493e
Add backend tests for new API functions
...
These new functions are:
* getSavedRevisionsCount
* listSavedRevisions
* saveRevision
+ typo fixing in backend tests
2015-02-25 01:05:58 +01:00
Luc Didry
845788c39d
Add a saveRevision API function
...
Calling saveRevision create an author which name is "API"
2015-02-25 01:04:27 +01:00
Luc Didry
a08c50a77d
Fixes #1870
...
Add two functions to API :
* getSavedRevisionsCount
* listSavedRevisions
2015-02-24 23:42:35 +01:00
John McLear
768b012e8b
Merge pull request #2525 from ldidry/fix-doc-api-number
...
Set correct API version in doc
2015-02-22 22:11:11 +00:00
Luc Didry
4166f19078
Set correct API version in doc
...
The doc says current version is 1.2.9, but there is getPadID which uses 1.2.10 API.
2015-02-22 22:32:18 +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
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 66582b19e7a196b77df1e9a912db020189a93014.
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
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
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
