Robert Helmer
348d9a838f
convert over to server-side crypto
2014-01-15 11:44:57 -08:00
Robert Helmer
ae99c5ea6f
new randomString function should take len arg
2014-01-15 11:44:41 -08:00
Robert Helmer
9ef709e7f7
mozilla bug 844796 - use node crypto module for randomString
2014-01-15 10:58:50 -08:00
Marcel Klehr
adf05576b2
Don't crash if CHANGESET_REQ fails
2013-12-17 16:20:57 +01:00
s1341
5add63165d
Fix server side bug index overflow
...
The server wasn't properly checking that the changesets it needed to
return for changeset_requests actually existed.
2013-12-17 15:37:35 +02:00
John McLear
7d47d91a08
Merge pull request #1514 from ether/dont-die-on-bad-html
...
dont die on bad html but only warn to api logger but dont tell client th...
2013-12-16 03:08:42 -08:00
Lennart Brinkmann
dd8af99e2e
Add input validation for html param in setHTML()
2013-12-14 21:14:56 +01:00
John McLear
58cd71dcce
Merge branch 'fix-exporthtml-styling-tags' of https://github.com/webzwo0i/etherpad-lite into develop
2013-12-10 19:25:36 +00:00
John McLear
58bbfd8a65
resolve merge conflict
2013-12-09 21:55:04 +00:00
John McLear
24e96c4f8b
Merge pull request #2028 from webzwo0i/remove-deadcode
...
Remove deadcode
2013-12-09 10:49:57 -08:00
John McLear
438f3fc717
Merge pull request #2030 from ether/import_hook
...
Working import hooks
2013-12-09 10:22:40 -08:00
John McLear
3180b96213
Remove console logs
2013-12-09 18:13:07 +00:00
webzwo0i
9400425b1e
[virtual_lines] remove traces of virtual_lines/makeVirtualLineView. this code was used for FF2 key handling code and is long unused
2013-12-08 17:33:58 +01:00
webzwo0i
aadcfbb3d1
do not send globalPadId in clientvars - its not used anywhere
2013-12-08 17:29:41 +01:00
webzwo0i
ca6f877db2
[padDiff] remove unused functions a?lines_length
2013-12-08 17:28:43 +01:00
webzwo0i
e1fbb1d1aa
fix loop
2013-12-08 13:53:26 +01:00
webzwo0i
9557dc9dba
remove unused require
2013-12-08 13:48:21 +01:00
webzwo0i
c3081c046b
function scope: variables only need to be declared once
2013-12-08 13:47:05 +01:00
webzwo0i
0fa0d6dc2c
remove now unused code
2013-12-08 13:45:45 +01:00
webzwo0i
27e0c37779
refactor export of style attributes
...
1. mark all attributes that are used
2. find the outermost attribute that is no longer used
3. close all tags upto this attribute
4. open all tags that are used and not open
(5. close all open tags)
2013-12-08 13:39:50 +01:00
webzwo0i
f968b5a057
useless var statement (function scope)
2013-12-08 11:37:47 +01:00
webzwo0i
51769585a9
workaround so that at least one tag stays open if its the outermost tag. saves some space in the output
2013-12-08 11:37:07 +01:00
webzwo0i
656a558af9
be more clear about the value in propVals
2013-12-08 11:35:28 +01:00
webzwo0i
a534b1ec22
some more docs for attribute export and cleanup empty lines
2013-12-08 11:34:11 +01:00
webzwo0i
70c51d731b
add some documentation for styling attributes export
2013-12-08 11:33:20 +01:00
webzwo0i
86791707cd
fix export so no tags are omitted
2013-12-08 11:31:23 +01:00
webzwo0i
01c71085e4
fix closing of </title> tag
2013-12-07 00:18:36 +01:00
Luc Didry
3d8452b143
Replace tabs indentation with spaces indentation
...
Some files are obviously external libraries, I didn't touch them
2013-12-05 08:41:29 +01:00
John McLear
271dd663bf
foo
2013-11-28 17:22:34 +00:00
John McLear
6fcc7c77f9
not working and erally confused
2013-11-27 00:23:11 +00:00
s1341
9b7203d4d2
have the server parse the settings file using minify and strip commas
2013-11-26 10:20:59 +02:00
s1341
45e0680484
move copy/move pad into a new api version
2013-11-24 22:34:56 +02: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
Marcel Klehr
8ab2442cc9
Update padList correctly
...
fixes #1971
2013-11-01 14:16:26 +01: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
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
fbe4e43c3d
Privacy: Add an option to disable IP logging
2013-10-19 21:37:11 +02: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
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
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
