public-offering
/
pad.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,774 Commits
190 Branches
71 Tags
55 MiB
Commit Graph

3774 Commits (253d6da2ac4b534d717caf2013aa265d9c1e1711)

Author SHA1 Message Date
Siebrand Mazeland 728958e131 Localisation updates from https://translatewiki.net. 2014-01-24 19:51:24 +00:00
Marcel Klehr fd4dd915ce Merge pull request #2062 from Gared/enable_import_buttons 
Fix #1835 Enable import buttons after failed import (timeout)
 2014-01-24 08:26:37 -08:00
Marcel Klehr 4b87f77aae Merge pull request #2068 from webzwo0i/fix-randomstring 
fix randomstring
 2014-01-24 07:43:19 -08:00
webzwo0i a43123880a fix randomstring 2014-01-24 01:19:14 +01:00
Gared bf6ec18ead Fix #1835 Enable import buttons after failed import (timeout) 2014-01-19 20:04:09 +01:00
John McLear e4fbf4bbcd Merge pull request #2061 from Gared/url_square_brackets 
Fix #2058 Add square brackets to url characters
 2014-01-19 10:26:16 -08:00
Gared 3715535f86 Fix #2058 Add square brackets to url characters 2014-01-19 19:23:11 +01:00
John McLear be4adec122 Merge pull request #2060 from rhelmer/bug844796-session-token-generation 
Bug844796 session token generation
 2014-01-15 11:46:55 -08:00
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
John McLear 346c03911d Merge pull request #2059 from rhelmer/bug844796-session-token-generation 
mozilla bug 844796 - use node crypto module for randomString
 2014-01-15 11:14:55 -08:00
Robert Helmer 9ef709e7f7 mozilla bug 844796 - use node crypto module for randomString 2014-01-15 10:58:50 -08:00
Siebrand Mazeland 2f9a9d8695 Localisation updates from https://translatewiki.net. 2014-01-11 16:47:39 +00:00
Siebrand Mazeland a35254c772 Localisation updates from https://translatewiki.net. 2014-01-06 11:01:26 +00:00
Marcel Klehr 9c64b6e268 Try to find related languages as a fallback 
fixes #2029
 2013-12-30 13:06:13 +01:00
Siebrand Mazeland 1e0456c7ed Localisation updates from https://translatewiki.net. 2013-12-28 17:43:47 +00:00
Siebrand Mazeland 44f817da01 Localisation updates from https://translatewiki.net. 2013-12-23 20:11:18 +00:00
John McLear b5ca52a5e5 Merge pull request #2045 from ether/exposeUpdateBrowserSel 
expose update browser selection function
 2013-12-18 14:13:50 -08:00
John McLear 333d2f119b expose update browser selection function 2013-12-18 22:13:03 +00:00
John McLear 1c2f05cb96 Merge pull request #2044 from ether/ff-del-firstchar 
dont error when pressing del on rep 0 0
 2013-12-18 10:35:25 -08:00
John McLear 1a138438eb dont error when pressing del on rep 0 0 2013-12-18 18:34:35 +00:00
John McLear 33ecd3d52f Merge pull request #2041 from ether/fix-get-attr 
better handling for attribute queries
 2013-12-17 12:49:28 -08:00
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