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

237 Commits (20b63f1fa7dfa590f824a77022f7ff0269e30f76)

Author SHA1 Message Date
John McLear 642b716553 Merge pull request #289 from jhollinger/no_spaces 
Sanitize pad names
 2012-01-08 07:30:07 -08:00
John McLear 86902c2c0b Merge pull request #291 from jhollinger/export_revisions 
Add ability to export specific pad revisions
 2012-01-08 07:06:13 -08:00
Jordan 7c84d8cc74 Bugfix to API calling indexOf on an undefined padID 2011-12-22 00:22:36 -05:00
Jordan 2a86d57e46 Add ability to export specific pad revisions 2011-12-18 00:18:35 -05:00
Jordan e8ef99fb72 Sanitize pad names 2011-12-16 15:41:11 -05:00
Peter 'Pita' Martischka 609701961e Added some comments to help us documentating the code 2011-12-11 19:45:40 +01:00
Peter 'Pita' Martischka c72cd49ede Merge branch 'dokuwiki-merge' of git://github.com/adrianlang/etherpad-lite into dokuwiki 2011-12-11 18:09:51 +01:00
Peter 'Pita' Martischka 6684d6ed52 replaced all stop callbacks with customError callbacks. Fixes #270 2011-12-10 16:46:47 +01:00
Peter 'Pita' Martischka 49006a3b6a Don't make the globalPads too global ;) 2011-12-08 23:32:51 +01:00
Adrian Lang 40c5e70aa7 Add DokuWiki export 2011-12-07 13:03:08 +01:00
Peter 'Pita' Martischka 18f90866ae fixed reconnect 2011-12-04 22:01:49 +01:00
Peter 'Pita' Martischka 7075fbebe6 fixed a bug in auto reconnect 2011-12-04 19:43:05 +01:00
Peter 'Pita' Martischka 8a6704beef reduced the httpAuth timeout to 1000ms 2011-12-04 17:27:36 +01:00
Peter 'Pita' Martischka a4eef2780e Merge branch 'issue241' of git://github.com/alx/etherpad-lite into httpAuth 2011-12-04 17:22:00 +01:00
Peter 'Pita' Martischka bfbdac10d3 fixed #250 2011-12-04 17:09:31 +01:00
Peter 'Pita' Martischka 5c56e62d67 Changed all error handling to async-stacktrace style + fixed import/export on unix 2011-12-04 16:50:02 +01:00
Peter 'Pita' Martischka db1ba6a65e Don't let express catch errors, let the process die 2011-12-04 15:19:24 +01:00
Peter 'Pita' Martischka e44b41f4a3 Fixed the easysync test 2011-12-03 21:32:52 +01:00
Alexandre Girard 71fee11656 add the ability to set global password with http basic auth 2011-12-01 16:44:51 +01:00
Peter 'Pita' Martischka f33af4700b Merge pull request #242 from jaseg/master 
Random filename generation fix, made a windows-only delay actually windows-only.
 2011-11-26 12:23:44 -08:00
Peter 'Pita' Martischka 3aacc0a1eb Merge pull request #222 from jhollinger/master 
API-only access, per issue #150
 2011-11-26 12:22:04 -08:00
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
Jordan 6297e628eb Permissions checks on pad and timeslider in server.js are redudant 2011-11-21 15:51:54 -05:00
Jordan 5e7c5d5dd3 Add editOnly option 2011-11-21 12:44:33 -05:00
Alexandre Girard 90e9d552f0 fix issue with newline in APIKEY.txt when checking api key 2011-11-21 16:39:54 +01:00
Jordan 9850ba43ee Implement a 'requireSession' mode, which requires any user to have a valid session 2011-11-21 01:45:37 -05: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 b0976a292f Fixed a somewhat quirky random string generator, made another windows-only delay actually windows-only. 2011-11-10 11:39:46 +01: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