Marcel Klehr
|
614ca6bd90
|
Merge branch 'develop' into release/1.2.12
|
2013-10-12 20:29:49 +02:00 |
|
Marcel Klehr
|
64392542f9
|
Merge pull request #1938 from ether/fix/unknown-connection-message
Drop messages from unknown connections
|
2013-10-12 11:24:51 -07:00 |
|
Marcel Klehr
|
a5b34a2ce3
|
Merge pull request #1937 from ether/fix/non-existant-read-only-pads
Don't create new pad if a non-existant read-only pad is accessed
|
2013-10-12 11:24:12 -07:00 |
|
Marcel Klehr
|
aa77a615da
|
Drop messages from unknown connections
fixes #1908
|
2013-10-12 18:51:04 +02:00 |
|
Marcel Klehr
|
048d55a64c
|
Don't create new pad if a non-existant read-only pad is accessed
fixes #1848
|
2013-10-12 18:41:48 +02:00 |
|
Marcel Klehr
|
74bc2bd761
|
Prepare release
|
2013-10-12 14:16:06 +02:00 |
|
Marcel Klehr
|
c3a96b34bb
|
Merge pull request #1929 from ether/feature/add-more-disconnect-scenarios
Add explanations for more disconnect scenarios
|
2013-10-10 12:18:05 -07:00 |
|
Marcel Klehr
|
7f10b9a42f
|
Add explanations for more disconnect scenarios
|
2013-10-10 21:11:15 +02:00 |
|
Marcel Klehr
|
de50efc71a
|
Merge pull request #1927 from ether/fix/client-side-error-logging-in-server-log
Polish logging of client-side errors on the server
|
2013-10-10 11:14:54 -07:00 |
|
Marcel Klehr
|
22e9e5fdcd
|
Merge pull request #1926 from ether/fix/no-connect-to-corrupt-pad
Fix a whole range of bugs related to corrupted changesets
|
2013-10-10 11:07:37 -07:00 |
|
Marcel Klehr
|
c5890adf6f
|
Merge pull request #1928 from ether/fix/easysync-error-messages
Polish the error messages of the easysync lib
|
2013-10-10 11:07:12 -07:00 |
|
Marcel Klehr
|
46511d6144
|
Polish the error messages of the easysync lib
|
2013-10-10 20:02:13 +02:00 |
|
Marcel Klehr
|
b7c7685dc7
|
Polish logging of client-side errors on the server
|
2013-10-10 18:45:22 +02:00 |
|
Marcel Klehr
|
d4c99d40b8
|
Never keep processing a changeset if it's corrupted
|
2013-10-10 18:19:25 +02:00 |
|
Marcel Klehr
|
6689a3c02e
|
Catch errors during preparation of client vars
... and disconnect the user
|
2013-10-10 16:38:41 +02:00 |
|
Marcel Klehr
|
ccf4683558
|
Easysync: Throw an error if an unknown attrib is referneced
|
2013-10-10 16:38:16 +02:00 |
|
John McLear
|
d86d99bc16
|
Merge pull request #1925 from ether/move-padlist-init
Move padlist init
|
2013-10-09 11:45:59 -07:00 |
|
John McLear
|
2992e3ea2b
|
clean up
|
2013-10-09 16:34:50 +01:00 |
|
John McLear
|
40a65bd41c
|
more warns
|
2013-10-09 16:17:36 +01:00 |
|
John McLear
|
c93acdfc87
|
suggestion
|
2013-10-09 16:14:16 +01:00 |
|
John McLear
|
7663b2ec49
|
Merge pull request #1923 from ether/fix/filter-historicalAuthorData
filter historical author data
|
2013-10-07 10:20:01 -07:00 |
|
Marcel Klehr
|
de73de38b1
|
Filter author attribs in client_vars.historicalAuthorData
|
2013-10-07 18:58:20 +02:00 |
|
Marcel Klehr
|
9fac515885
|
Revert "do not pass historical author data to read only users"
This reverts commit b32aaaeb1b.
|
2013-10-07 18:54:57 +02:00 |
|
John McLear
|
7f42f70732
|
Merge pull request #1921 from ether/dont-pass-padid-in-historical-authors
Dont pass padid in historical authors
|
2013-10-06 07:31:44 -07:00 |
|
John McLear
|
d7088031fa
|
remove white space
|
2013-10-06 15:16:32 +01:00 |
|
John McLear
|
b32aaaeb1b
|
do not pass historical author data to read only users
|
2013-10-06 15:15:43 +01:00 |
|
Siebrand Mazeland
|
eb611e2b36
|
Localisation updates from http://translatewiki.net.
|
2013-10-05 21:56:44 +00:00 |
|
John McLear
|
37586d646e
|
Merge pull request #1920 from ether/allow-err-msg-from-listpadsof-author
allow author manager to use custom error module
|
2013-10-03 06:46:17 -07:00 |
|
John McLear
|
bf1e1c3007
|
allow author manager to use custom error module
|
2013-10-03 14:45:23 +01:00 |
|
John McLear
|
6dc4240985
|
Merge pull request #1919 from ether/make-username-show-properly
use val not value, broken with newer jq
|
2013-10-02 16:37:29 -07:00 |
|
John McLear
|
d69df91709
|
use val not value, broken with newer jq
|
2013-10-03 00:36:15 +01:00 |
|
John McLear
|
ba1ff46867
|
Merge pull request #1917 from maixithn/patch-2
Update README.md
|
2013-10-02 06:09:34 -07:00 |
|
maixithn
|
0630b3e93a
|
Update README.md
delete double wordings
|
2013-10-02 14:00:48 +02:00 |
|
Marcel Klehr
|
7b17bd58ae
|
Merge branch 'pr/1756' into develop
Conflicts:
src/node/handler/SocketIORouter.js
|
2013-09-29 16:45:12 +02:00 |
|
John McLear
|
9afbedc908
|
Merge pull request #1862 from codingisacopingstrategy/etherpad-lite-to-etherpad
‘Etherpad Lite’ -> ‘Etherpad’
|
2013-09-29 07:03:22 -07:00 |
|
Eric Schrijver
|
b34224559d
|
‘Etherpad Lite’ -> ‘Etherpad’
|
2013-09-29 13:57:37 +02:00 |
|
John McLear
|
6e4d94069f
|
Merge pull request #1906 from ether/down-arrow-dont-be-weird
Down arrow dont be weird
|
2013-09-28 23:38:45 -07:00 |
|
John McLear
|
f59df2bb80
|
Merge pull request #1902 from ether/fix/handle-message-continuation
Don't stop processing changesets if there is an error
|
2013-09-28 23:38:26 -07:00 |
|
John McLear
|
e573461c9b
|
Merge pull request #1909 from ether/dont-crash-blank-html-import
dont crash on importing blank html
|
2013-09-27 12:06:05 -07:00 |
|
Marcel Klehr
|
56bc632d41
|
Merge pull request #1907 from ether/clear-cache
Press Ctrl and f5 to load clean page
|
2013-09-27 07:15:42 -07:00 |
|
John McLear
|
6fbdc2cfd9
|
whoops, not supposed to be there
|
2013-09-27 14:49:05 +01:00 |
|
John McLear
|
c615ccf514
|
dont crash on importing blank html
|
2013-09-27 14:47:34 +01:00 |
|
John McLear
|
7d1d73f8a6
|
doh, wasnt supposed to add this background
|
2013-09-25 22:20:13 +01:00 |
|
John McLear
|
ed04842801
|
more sensible reload without cache message
|
2013-09-25 22:18:51 +01:00 |
|
John McLear
|
c8109b7398
|
sanity also control home support
|
2013-09-25 15:56:56 +01:00 |
|
John McLear
|
487f1a969f
|
vast improvement on movement of caret due to isolation of cause of problem - TLDR is Chrome detects blank rows line heights as incorrect
|
2013-09-25 14:57:02 +01:00 |
|
John McLear
|
3e1e92c100
|
Merge pull request #1904 from ether/fix/plugin-search
/admin/plugins: Fix search algorithm (use string match in lower case)
|
2013-09-23 10:58:26 -07:00 |
|
Marcel Klehr
|
6a02302fc9
|
/admin/plugins: Fix search algorithm (use string match in lower case)
fix #1903
|
2013-09-23 19:55:35 +02:00 |
|
Marcel Klehr
|
7f7d506ff3
|
Don't stop processing changesets if there is an error
fixes #1895
|
2013-09-23 16:38:55 +02:00 |
|
John McLear
|
7898c350f7
|
Merge pull request #1900 from ether/dont-include-file-name-on-import
strip title out of html during import, pesky abiword behavior
|
2013-09-21 15:38:51 -07:00 |