e308c265af
Localisation updates from http://translatewiki.net .
2013-10-14 08:55:30 +00:00
be78488635
Merge pull request #1940 from piratenfraktion-nrw/fix_readonly_if_require_session
...
pass correct padID to checkAccess if pad is requested via readOnly link
2013-10-13 13:41:41 -07:00
77c2313025
pass correct padID to checkAccess if pad is requested via readOnly link
2013-10-13 22:31:41 +02:00
ef4e0d0eb0
Merge pull request #1939 from ether/fix/padList-cache-performance-hole
...
You don't need the padList if you want to alter it
2013-10-13 12:22:07 -07:00
200f250717
You don't need the padList if you want to alter it
...
Don't query the db for caching a list of pads if you only want to alter the list
2013-10-13 21:20:19 +02:00
680d9a2811
Don't try to populate padlist on each req
...
This is an important fix, prolly wants merging into master ASAP.
Before this fix each new pad request would re-populate the all pads object, this is a blocking procedure and slows down the loading to a point where it's almost useless :(
Testing didn't find this because our testing stack isn't populated with pad data :| TLDR. Our tests still suck, hard.
2013-10-13 16:39:45 +01:00
8c9e543b91
Fix disconnect modals
2013-10-12 22:29:03 +02:00
76bd25ac21
Merge branch 'release/1.2.12'
...
Conflicts:
README.md
2013-10-12 20:38:51 +02:00
b9cc91e6ad
Update CHANGELOG
2013-10-12 20:35:23 +02:00
614ca6bd90
Merge branch 'develop' into release/1.2.12
2013-10-12 20:29:49 +02:00
64392542f9
Merge pull request #1938 from ether/fix/unknown-connection-message
...
Drop messages from unknown connections
2013-10-12 11:24:51 -07:00
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
aa77a615da
Drop messages from unknown connections
...
fixes #1908
2013-10-12 18:51:04 +02:00
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
74bc2bd761
Prepare release
2013-10-12 14:16:06 +02:00
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
7f10b9a42f
Add explanations for more disconnect scenarios
2013-10-10 21:11:15 +02:00
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
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
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
46511d6144
Polish the error messages of the easysync lib
2013-10-10 20:02:13 +02:00
b7c7685dc7
Polish logging of client-side errors on the server
2013-10-10 18:45:22 +02:00
d4c99d40b8
Never keep processing a changeset if it's corrupted
2013-10-10 18:19:25 +02:00
6689a3c02e
Catch errors during preparation of client vars
...
... and disconnect the user
2013-10-10 16:38:41 +02:00
ccf4683558
Easysync: Throw an error if an unknown attrib is referneced
2013-10-10 16:38:16 +02:00
d86d99bc16
Merge pull request #1925 from ether/move-padlist-init
...
Move padlist init
2013-10-09 11:45:59 -07:00
2992e3ea2b
clean up
2013-10-09 16:34:50 +01:00
40a65bd41c
more warns
2013-10-09 16:17:36 +01:00
c93acdfc87
suggestion
2013-10-09 16:14:16 +01:00
7663b2ec49
Merge pull request #1923 from ether/fix/filter-historicalAuthorData
...
filter historical author data
2013-10-07 10:20:01 -07:00
de73de38b1
Filter author attribs in client_vars.historicalAuthorData
2013-10-07 18:58:20 +02:00
9fac515885
Revert "do not pass historical author data to read only users"
...
This reverts commit b32aaaeb1b
2013-10-07 18:54:57 +02:00
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
d7088031fa
remove white space
2013-10-06 15:16:32 +01:00
b32aaaeb1b
do not pass historical author data to read only users
2013-10-06 15:15:43 +01:00
eb611e2b36
Localisation updates from http://translatewiki.net .
2013-10-05 21:56:44 +00:00
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
bf1e1c3007
allow author manager to use custom error module
2013-10-03 14:45:23 +01:00
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
d69df91709
use val not value, broken with newer jq
2013-10-03 00:36:15 +01:00
ba1ff46867
Merge pull request #1917 from maixithn/patch-2
...
Update README.md
2013-10-02 06:09:34 -07:00
0630b3e93a
Update README.md
...
delete double wordings
2013-10-02 14:00:48 +02:00
7b17bd58ae
Merge branch 'pr/1756' into develop
...
Conflicts:
src/node/handler/SocketIORouter.js
2013-09-29 16:45:12 +02:00
9afbedc908
Merge pull request #1862 from codingisacopingstrategy/etherpad-lite-to-etherpad
...
‘Etherpad Lite’ -> ‘Etherpad’
2013-09-29 07:03:22 -07:00
b34224559d
‘Etherpad Lite’ -> ‘Etherpad’
2013-09-29 13:57:37 +02:00
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
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
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
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
6fbdc2cfd9
whoops, not supposed to be there
2013-09-27 14:49:05 +01:00
Siebrand Mazeland