John McLear
|
8c795b4e8a
|
Merge pull request #2477 from gabrielliwerant/develop-readme-instructions
Add subdirectory installation instructions
|
2015-03-31 23:21:02 +01:00 |
|
John McLear
|
b6ff1807da
|
Merge pull request #2482 from ether/chrome-list-handling
chrome list handling fix for #2412
|
2015-03-31 23:19:47 +01:00 |
|
John McLear
|
b404af7c17
|
Merge pull request #2530 from webzwo0i/exception-handling-for-mimatched-composition
do not crash when encountering mismatched compositions. log the changese...
|
2015-03-31 23:17:51 +01:00 |
|
John McLear
|
e47992f5b7
|
Merge pull request #2538 from webzwo0i/check-author-attribution
Check author attribution and fix clearAuthorship test
|
2015-03-31 23:14:22 +01:00 |
|
John McLear
|
64a89a3ec0
|
Merge pull request #2541 from cristo-rabani/patch-3
fixed + support for value
|
2015-03-31 22:58:10 +01:00 |
|
John McLear
|
4397191f55
|
Merge pull request #2565 from tm-linkwerk/feature-2558-attributes-on-position
feature #2558 get attributes on position
|
2015-03-31 22:46:00 +01:00 |
|
John McLear
|
ab2a3b83af
|
Merge pull request #2568 from tm-linkwerk/feature-2567-contentcollector-keyvalue-attributes
Feature #2567 Added workaround to enable contentcollector to write key-v...
|
2015-03-31 22:45:05 +01:00 |
|
John McLear
|
52f520b479
|
Merge pull request #2571 from LeoVerto/patch-1
Fix minor typo in safeRun.sh email report
|
2015-03-31 18:24:57 +01:00 |
|
LeoVerto
|
7e9bc1b7b9
|
Fix minor typo in safeRun.sh email report
|
2015-03-31 18:33:47 +02:00 |
|
Thomas Muehlichen
|
a930161cb9
|
feature #2558 added documentation
|
2015-03-31 10:58:47 +02:00 |
|
Thomas Muehlichen
|
1e8e64d675
|
feature #2567 added documentation
|
2015-03-31 10:50:20 +02:00 |
|
Thomas Muehlichen
|
1c05933dc9
|
Feature #2567 Added workaround to enable contentcollector to write key-value attributes
|
2015-03-26 18:49:35 +01:00 |
|
Thomas Muehlichen
|
fbcbc3c8a2
|
feature #2558 more precise documentation
|
2015-03-25 13:29:03 +01:00 |
|
Thomas Muehlichen
|
e8d85c1173
|
feature #2558 added functions to get all attributes at the current or an abritrary position
|
2015-03-25 12:04:10 +01:00 |
|
cristo-rabani
|
ed3ec96838
|
own list
|
2015-03-24 20:04:28 +01:00 |
|
John McLear
|
a67664055d
|
disable cut renumbering of OLs so cut paste works
|
2015-03-24 09:58:02 +00:00 |
|
John McLear
|
83e6591f1a
|
temp fix for cut paste but might break some OL functionality
|
2015-03-24 09:52:17 +00:00 |
|
cristo-rabani
|
382804e44c
|
fix
|
2015-03-22 23:14:17 +01:00 |
|
John McLear
|
17db8ed4a4
|
Merge pull request #2561 from simong/ueberdb-cassandra
Bumped ueberDB to 0.2.14 so Cassandra suport is included
|
2015-03-22 16:30:31 +01:00 |
|
Simon Gaeremynck
|
9bde17b91c
|
Bumped ueberDB to 0.2.14 so Cassandra suport is included
|
2015-03-22 12:27:54 +00:00 |
|
John McLear
|
f2e5dce6fa
|
Merge pull request #2559 from tm-linkwerk/fix-2556-attributemanager
fixes #2556 error toggling line attribute; clarified documentation
|
2015-03-21 18:15:58 +01:00 |
|
Thomas Muehlichen
|
a3f07c1048
|
fixes #2556 (error toggling line attribute) and clarified method documentation (AttributeManager.toggleAttributeOnLine)
|
2015-03-20 11:58:56 +01:00 |
|
Stefan
|
6c933a1296
|
Merge pull request #2553 from ether/master
Merge branch master back to develop
|
2015-03-15 15:27:35 +01:00 |
|
Stefan
|
b9cdf4352b
|
Merge pull request #2552 from ether/release/1.5.2
Release/1.5.2
|
2015-03-15 14:51:27 +01:00 |
|
Stefan
|
c0260bcc40
|
Add changelog for v1.5.2
|
2015-03-15 14:28:47 +01:00 |
|
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 |
|
Cristo
|
da1bf00a78
|
fixed + support for value
|
2015-03-06 23:02:31 +01: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 |
|
webzwo0i
|
547046830e
|
actually disconnect should NOT be visible...
|
2015-03-03 16:51:18 +01:00 |
|
webzwo0i
|
f249b42ab4
|
empty author should be allowed to support clearAuthorship functionality
|
2015-03-03 16:39:14 +01:00 |
|
webzwo0i
|
393a4e54e5
|
recognize reconnect in clear_authorship_colors test
|
2015-03-03 16:17:39 +01:00 |
|
webzwo0i
|
0693c0ae97
|
- operator do not show up in the attribs of a pad, but authors could still leak to the pool
|
2015-03-03 15:37:56 +01:00 |
|
webzwo0i
|
01cd82427a
|
check author in = operator
|
2015-03-03 15:20:33 +01:00 |
|
webzwo0i
|
0f82cd8711
|
print revision numbers - not changesets - in warn-log
|
2015-03-02 11:14:24 +01:00 |
|
webzwo0i
|
683c9dfb7c
|
callback with argument error in async.series instead
|
2015-03-02 11:05:33 +01: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 |
|
webzwo0i
|
7719117e1e
|
do not crash when encountering mismatched compositions. log the changesets and padid
|
2015-02-26 14:57:49 +01: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 |
|