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

212 Commits (6bcd2886e9bec06ed47a0d3ee3f1a98831178b98)

Author SHA1 Message Date
Peter 'Pita' Martischka 932ad0eeeb This may fixes the pdf convert issue 2011-11-25 16:58:00 -08:00
Peter 'Pita' Martischka 7296913cb0 fixed merge confilicts 2011-11-25 16:56:08 -08:00
Peter 'Pita' Martischka dc6d0cda68 Merge branch 'master' of github.com:Pita/etherpad-lite 2011-11-25 16:08:24 -08:00
Peter 'Pita' Martischka fa098d73cd Do a reconnect on network problems. After 10s it gives up 2011-11-25 15:26:01 -08:00
Micah Anderson 97e9eb84af fix for #224 2011-11-25 13:39:33 -05:00
Lorenzo Gil Sanchez 943f8c4682 Stupid syntax error due to last minute refactoring 2011-11-22 16:09:27 +01:00
Lorenzo Gil Sanchez e6de06b103 Transform multiline HTML into a single line stream to avoid spurious lines in the final result 2011-11-22 10:09:10 +01:00
Alexandre Girard 90e9d552f0 fix issue with newline in APIKEY.txt when checking api key 2011-11-21 16:39:54 +01:00
Peter 'Pita' Martischka 2e79bd50a3 fixed socket.io logging 2011-11-19 14:14:31 -08:00
Peter 'Pita' Martischka 2f16dff0ba Merge branch 'master' of https://github.com/jhollinger/etherpad-lite 2011-11-19 12:08:57 -08:00
Peter 'Pita' Martischka 54c8e46cdf Fixed Joes typo commit 2011-11-19 12:07:39 -08:00
Joe Corneli 0aa56136fe Fix message typos 2011-11-19 19:21:23 +00:00
Jordan 411984787a Implement POST requests for HTTP API 2011-11-18 21:52:12 -05:00
Lorenzo Gil Sanchez a26918c69e Hook the ImportHtml module into the API 2011-11-17 10:26:32 +01:00
Lorenzo Gil Sanchez 9fe6c11d87 Main implementation of the setHTML API 2011-11-17 10:26:32 +01:00
Lorenzo Gil Sanchez 09cb367d8e The contentcollector code is harder to adapt since it has the Changeset module as a dependency 2011-11-17 10:26:32 +01:00
Peter 'Pita' Martischka 6d190f517e Merge pull request #184 from thomasf/issue158 
Kind of a hack but fixes issue #158
 2011-11-14 21:35:37 -08:00
Peter 'Pita' Martischka 9eac04aaa6 Fixed a huge problem with the sessioninfos array 2011-11-13 20:33:13 -08:00
Peter 'Pita' Martischka a5a9592031 Revert "Fixing a bug that happens when a socket.io connection closes very early after a CLIENT_READY message" 
This reverts commit 0f559347ee.
 2011-11-13 20:25:22 -08:00
Peter 'Pita' Martischka 820326dc2b Output more informations on message dropped 2011-11-12 16:47:01 -08:00
Peter 'Pita' Martischka 17666339d0 Merge pull request #191 from Yaco-Sistemas/master 
Get the HTML of a Pad via the API
 2011-11-12 15:04:53 -08:00
jaseg 4fc4a35381 Spelling fixes in log messages, made a delay windows-only which according to a comment should be windows-only, fixed a random filename generator. 2011-11-09 17:19:59 +01:00
Peter 'Pita' Martischka f6165eb2ea Fixed another bug that breaked the abiword parser 2011-11-05 19:34:01 +01:00
Peter 'Pita' Martischka 90ba811bb5 Fixed a bug that creates invalid HTML at Export that lets Abiwords parser crash 2011-11-04 03:15:26 +01:00
Thomas Frössman 73711abd97 Added comments 2011-11-03 07:34:51 +01:00
Lorenzo Gil e4481ea22b Allow to get the HTML of the pad with the API 2011-10-31 11:19:51 +01:00
Peter 'Pita' Martischka 0f559347ee Fixing a bug that happens when a socket.io connection closes very early after a CLIENT_READY message 2011-10-19 21:48:36 +02:00
Peter 'Pita' Martischka e0cf6098fb fixing issues with bad import uploads, fixed #186 2011-10-19 21:46:28 +02:00
Thomas Frössman 8223f84714 Kind of a hack but makes issue #158 go away. 
There is probably a deeper error somewhere in either log4js or express, I don't have the time to investigate that atm.
 2011-10-17 23:31:39 +02:00
Rob Speer 2d3272e3b6 make globalPads into an ad-hoc Object that can store values with arbitrary names. Fixes issue #160. 2011-09-30 00:41:46 -04:00
Adrian Lang 7557af3db7 Fix directory traversal fixing RegExp 2011-09-01 23:49:52 +02:00
Adrian Lang 86d3b2ba81 Fix directory traversal 
See https://ada.adrianlang.de/etherpad-lite-directory-traversal
 2011-09-01 23:27:18 +02:00
Peter 'Pita' Martischka e771542961 added deleteGroup API function 2011-08-22 13:11:34 +01:00
Peter 'Pita' Martischka 177abdd29e Don't show PDF Export on Windows 2011-08-21 20:09:25 +01:00
Peter 'Pita' Martischka 8d12c3d7ee added a link to the bugtracker 2011-08-21 19:52:24 +01:00
Peter 'Pita' Martischka d85eeee5f4 check pad access on read only 2011-08-21 19:43:42 +01:00
Peter 'Pita' Martischka 307d0acdeb put expolorer canvas into minify 2011-08-21 19:20:18 +01:00
Peter 'Pita' Martischka 4d7c8a2c7d added ability to set a custom favicon 2011-08-20 19:27:41 +01:00
Peter 'Pita' Martischka fdeb2a45e7 Ops, forgot to replace two throws 2011-08-20 18:56:38 +01:00
Peter 'Pita' Martischka b9f23fa208 handle bad changesets 2011-08-20 18:51:43 +01:00
Peter 'Pita' Martischka 42662d73d0 Merge branch 'master' of /home/jose/etherpad-lite/ 2011-08-20 18:23:58 +01:00
Peter 'Pita' Martischka 9d37d91ce1 added a colorPicker 2011-08-20 18:22:10 +01:00
Peter 'Pita' Martischka 3c6ca617f6 show git version on start 2011-08-19 22:01:33 +01:00
Peter 'Pita' Martischka b9c1b45a8b added utf8 to content type of api responses, thx @0ip 2011-08-19 21:57:15 +01:00
Peter 'Pita' Martischka 82dd4802d7 fixed a API Bug 2011-08-19 21:35:31 +01:00
Peter 'Pita' Martischka caecfd3997 PITA, Y U NO TEST? 2011-08-18 21:29:34 +01:00
Peter 'Pita' Martischka ef6a75ca54 don't do a graceful shutdown on SIGINT on windows 2011-08-18 21:02:54 +01:00
Peter 'Pita' Martischka ad1e8fb4f8 limit the graceful shutdown time to 3 seconds 2011-08-18 20:54:04 +01:00
Peter 'Pita' Martischka 2dd82f82de since we set a global lock level, we can log socket.io debug messages 2011-08-18 13:40:30 +01:00
Peter 'Pita' Martischka 4554c32e64 show the last 100 chat messages, instead of the last 20 2011-08-17 20:04:28 +01:00