libretic/etherpad-lite
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
3323 commits 2 branches 0 tags 24 MiB
Commit graph

3323 commits

This branch
This branch
All branches
Author SHA1 Message Date
John McLear
3c4c0de38a Merge pull request #1985 from ldidry/fix/uncomplete-api-doc 
Forgot to bump the API version for API documentation
 2013-11-07 14:31:29 -08:00
Luc Didry
b769acaee0 Forgot to bump the API version 2013-11-07 23:28:07 +01:00
John McLear
7e6e2501d5 Merge pull request #1983 from ldidry/fix/uncomplete-api-doc 
Fixed #1981 - uncomplete HTTP API documentation
 2013-11-07 13:48:17 -08:00
Luc Didry
5bccfdf060 Forgot a small chunck of documentation for getRevisionChangeset 2013-11-07 22:46:35 +01:00
Luc Didry
a4194efaf1 Fixed #1981 - uncomplete HTTP API documentation 2013-11-07 22:22:37 +01:00
Siebrand Mazeland
c9b80c6120 Localisation updates from http://translatewiki.net. 2013-11-04 16:04:11 +00:00
Marcel Klehr
68caa06eed Merge pull request #1974 from ether/fix/fix-list-all-pads 
Update padList correctly
 2013-11-02 04:28:01 -07:00
Marcel Klehr
8ab2442cc9 Update padList correctly 
fixes #1971
 2013-11-01 14:16:26 +01:00
Marcel Klehr
e72511349d Merge branch 'pr/1789' into develop 
Conflicts:
	.travis.yml
 2013-10-28 12:20:10 +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
5bce9bc336 Add docs for stats 2013-10-27 21:59:40 +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
Marcel Klehr
f532c1c6fb Merge pull request #1968 from KenanSulayman/patch-1 
Refactors APIHandler:callAPI
 2013-10-25 06:34:23 -07: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
8fffe4777e Merge branch 'release/1.3' 2013-10-21 20:35:29 +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 - doh.)
 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
John McLear
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
vileda
77c2313025 pass correct padID to checkAccess if pad is requested via readOnly link 2013-10-13 22:31:41 +02:00
John McLear
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
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
76bd25ac21 Merge branch 'release/1.2.12' 
Conflicts:
	README.md
 2013-10-12 20:38:51 +02:00
Marcel Klehr
b9cc91e6ad Update CHANGELOG 2013-10-12 20:35:23 +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
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