Siebrand Mazeland
106661712d
Localisation updates from http://translatewiki.net .
2013-11-19 06:43:22 +00:00
s1341
52a99eb9e5
fix bugs, add force option to overwrite destination
2013-11-18 08:25:46 +02:00
s1341
93fcab0461
change parameter names
2013-11-17 21:01:02 +02:00
s1341
29d8bb7716
add pad copy/move API functions
2013-11-17 17:02:44 +00:00
Siebrand Mazeland
1ee7c7000f
Localisation updates from http://translatewiki.net .
2013-11-12 13:44:57 +00:00
Marcel Klehr
8e5af48f79
en.json: Add keyboard shortcuts for indent and outdent to translations
2013-11-08 15:18:23 +00:00
Siebrand Mazeland
c9b80c6120
Localisation updates from http://translatewiki.net .
2013-11-04 16:04:11 +00:00
Marcel Klehr
8ab2442cc9
Update padList correctly
...
fixes #1971
2013-11-01 14:16:26 +01:00
Marcel Klehr
975eae350e
Merge pull request #1963 from eyesonlyhack/allLinksTranslatingToHTTP
...
Fix #1776 - All links regardless of protocol translate to http:// links
2013-10-28 04:15:17 -07:00
Marcel Klehr
7b84e7308b
Merge branch 'metrics' into develop
...
Conflicts:
src/node/handler/PadMessageHandler.js
2013-10-28 12:11:25 +01:00
Marcel Klehr
3ad4b1b837
stats: Add http500, memoryUsage, pendingEdits gauges
...
and turn edits metric into a timer instead of a simple meter
2013-10-27 21:43:32 +01:00
Siebrand Mazeland
84b19a56d5
Localisation updates from http://translatewiki.net .
2013-10-27 19:17:18 +00:00
Marcel Klehr
387091c5c9
Expose current stats at /stats
2013-10-27 18:11:50 +01:00
Marcel Klehr
940f114a84
Record metrics with 'measured'
2013-10-27 17:42:55 +01:00
Kenan Sulayman
7ab65d7112
Refactors APIHandler:callAPI
...
Refactors and optimizes the APIHandler->callAPI.
2013-10-25 12:14:22 +02:00
Grant Woodford
c3a58f42e7
Added a better way of detecting when a url does not have a protocol specified
2013-10-21 22:15:46 +02:00
Marcel Klehr
e8c69a5474
Update changelog and bump version
2013-10-21 20:18:16 +02:00
Marcel Klehr
d43945db07
Merge pull request #1950 from eyesonlyhack/disableIPlogging
...
Privacy: Add an option to disable IP logging
2013-10-21 08:05:05 -07:00
Grant Woodford
fbe4e43c3d
Privacy: Add an option to disable IP logging
2013-10-19 21:37:11 +02:00
Siebrand Mazeland
b1b801e7c7
Localisation updates from http://translatewiki.net .
2013-10-19 19:37:02 +00:00
John McLear
a120d78b7e
Merge pull request #1943 from ether/fix/listAllPads-fix
...
Pad list cache: You can't change the cache if it's not initiated
2013-10-14 09:21:27 -07:00
Marcel Klehr
22b0bafafd
Pad list cache: You can't change the cache if it's not initiated
...
(as per 200f250717
2013-10-14 18:20:24 +02:00
Siebrand Mazeland
96c366b1e1
Consistent spelling style
...
Spotted by Shirayuki in https://translatewiki.net/wiki/Thread:Support/About_EtherpadLite:Pad.modals.badChangeset.cause/en
2013-10-14 11:11:31 +00:00
Siebrand Mazeland
e308c265af
Localisation updates from http://translatewiki.net .
2013-10-14 08:55:30 +00:00
vileda
77c2313025
pass correct padID to checkAccess if pad is requested via readOnly link
2013-10-13 22:31:41 +02:00
Marcel Klehr
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
John McLear
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
Marcel Klehr
8c9e543b91
Fix disconnect modals
2013-10-12 22:29:03 +02:00
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
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
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
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
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
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
