John McLear
8313083cd9
better handling for attribute queries
2013-12-17 20:48:19 +00:00
John McLear
af5b8d3e24
Merge pull request #2039 from ether/fix/dont-crash-on-failed-changeset_req
...
Don't crash if CHANGESET_REQ fails
2013-12-17 07:42:05 -08:00
Marcel Klehr
adf05576b2
Don't crash if CHANGESET_REQ fails
2013-12-17 16:20:57 +01:00
John McLear
d1cad04647
Merge pull request #2038 from s1341/fix/server_not_checking_changeset_req_bounds
...
Server doesn't check bounds on CHANGESET_REQ arguments
2013-12-17 06:45:40 -08: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
Siebrand Mazeland
6f6a86faa6
Localisation updates from https://translatewiki.net .
2013-12-17 08:52:50 +00: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
John McLear
3d8edef926
Merge pull request #2035 from lebrinkma/dont-die-on-bad-html
...
Add input validation for html param in setHTML()
2013-12-16 03:07:50 -08:00
Lennart Brinkmann
dd8af99e2e
Add input validation for html param in setHTML()
2013-12-14 21:14:56 +01:00
Lennart Brinkmann
7dd29454e9
Remove duplicate doc entry for setHTML()
2013-12-14 21:11:37 +01:00
John McLear
7c4479d5aa
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
2013-12-12 00:22:27 +00:00
John McLear
37015e728b
Merge pull request #2032 from webzwo0i/fix-exporthtml-styling-tags
...
Fix exporthtml styling tags
2013-12-10 11:26:58 -08: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
John McLear
505dc70df5
Merge pull request #2013 from ether/getAttributeOnSelection
...
getAttributeOnSelection function
2013-12-09 09:46:57 -08:00
John McLear
bae77666a4
Merge pull request #2027 from webzwo0i/fix-import
...
fix closing of </title> tag
2013-12-09 06:56:22 -08:00
webzwo0i
77cf2aafac
[pad_modals] remove unused variables. for the hide/show functions jquery's default variables are used everywhere
2013-12-08 17:35:11 +01: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
ab797c9831
[pad_connectionstatus] padeditbar is not used anywhere in pad_connectionstatus
2013-12-08 17:31:46 +01:00
webzwo0i
906ab1820b
[timeslider] do not include underscore, as its not (longer) used
2013-12-08 17:31:18 +01:00
webzwo0i
1fa8c2a7e6
[collab_client] remove unused function getStats
2013-12-08 17:30:48 +01:00
webzwo0i
6aaf4c4065
[collab_client] remove keys function, which was not used and variable reconnectTimes which was used for some long gone disconnect tracking code
2013-12-08 17:30:25 +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
021db28a02
[Changeset] a?lines_length was not used within inverse function
2013-12-08 17:27:48 +01:00
webzwo0i
e04f46d477
[ace2_inner] init() has replaced setup(), reflect this change in the comments and remove the unused setup()
2013-12-08 17:25:12 +01:00
webzwo0i
020bd3915c
remove empty&unused overlaysdiv
2013-12-08 17:24:12 +01:00
webzwo0i
4dd3584532
[ace2inner] remove unused function boldColorFromColor
2013-12-08 17:22:55 +01:00
webzwo0i
a714f63597
[ace2inner] remove unused recolorLineByKey that was part of old recolor module
2013-12-08 17:22:20 +01:00
webzwo0i
3dc844eb08
[ace2_inner] remove unused getLineKeyForOffset that was part of old recolor module
2013-12-08 17:21:53 +01:00
webzwo0i
eee355979d
[ace2_inner] remove unused function htmlForRemovedChild
2013-12-08 17:21:27 +01:00
webzwo0i
8175af3017
[collab_client] remove socketid because its not used
2013-12-08 17:20:53 +01:00
webzwo0i
f25fed1c25
[ace2_inner] remove incorpIfQuick because its unused since July
2013-12-08 17:15:38 +01:00
webzwo0i
4044d5ae47
remove hidden input field padId which is send on every import but not used
2013-12-08 17:14:01 +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
John McLear
d9ef40f9d7
docs but not sure how to specify the verison this was introduced
2013-12-07 17:48:06 +00:00
John McLear
8a547b24ba
resolve issue where first char showed all formatting
2013-12-07 17:37:52 +00:00