libretic/etherpad-lite
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
798 commits 2 branches 0 tags 24 MiB
Commit graph

253 commits

Author SHA1 Message Date
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
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
Peter 'Pita' Martischka
a47ada46d7 forgot to change the default settings in Settings.js 2011-08-17 19:26:56 +01:00
Peter 'Pita' Martischka
c2457e06d8 send client side javascript errors to the server 2011-08-17 19:24:44 +01:00
Peter 'Pita' Martischka
b58bdb4e4d support jsonp api calls 2011-08-17 18:24:14 +01:00
Peter 'Pita' Martischka
41883e688b moved require joose to the correct place 2011-08-17 17:49:05 +01:00
Peter 'Pita' Martischka
3ec7dc224b added a loglevel setting 2011-08-17 17:45:47 +01:00
Peter 'Pita' Martischka
77ba4e3e6c ensure wrong socketio messages doesn't kill the server 2011-08-17 17:28:30 +01:00
Peter 'Pita' Martischka
296777ab53 added a graceful shutdown 2011-08-17 15:58:42 +01:00
John McLear
5d30c8b4a5 Peter will hate this but I extended Etherpad to support 64 colors and removed the requirements for a background image on the colorpicker dialogue 2011-08-16 21:29:51 +01:00
Peter 'Pita' Martischka
5da30a40bf changed content type of api responses to application/json 2011-08-16 20:06:59 +01:00
Peter 'Pita' Martischka
d2c502e2be added deletePad API function 2011-08-16 20:02:30 +01:00
Peter 'Pita' Martischka
783c192726 ensure password and publicStatus functions are only used with group pads 2011-08-16 18:17:46 +01:00
Peter 'Pita' Martischka
1151ec3278 Merge branch 'api' of ../etherpad-lite.dev/ 2011-08-16 17:22:15 +01:00
Peter 'Pita' Martischka
3ff34f50d1 added a security control at socketiorouter, pad security is now fully enforced 2011-08-16 15:53:09 +01:00
Peter 'Pita' Martischka
da7ddfb5d7 fixed #84 Import bug 2011-08-16 13:40:01 +01:00
Peter 'Pita' Martischka
317370da2c restricted access to pad import and export 2011-08-15 22:20:37 +01:00
Peter 'Pita' Martischka
48980f9e19 Show permission messages on the browser side 2011-08-15 18:27:11 +01:00
Peter 'Pita' Martischka
255dc5a325 fixed merge conflicts 2011-08-15 16:58:22 +01:00
Peter 'Pita' Martischka
793ef42704 added a error message for invalid padIDs 2011-08-15 15:45:28 +01:00
Peter 'Pita' Martischka
936a9985e1 use the temp enviroment variable for windows 2011-08-15 15:45:28 +01:00
Peter 'Pita' Martischka
da6caedb45 fixed abiword on windows 2011-08-15 15:45:28 +01:00
John McLear
10c2497fcc Allow cross site export 2011-08-14 14:47:41 +01:00
Peter 'Pita' Martischka
b300dc1d2c fixed merge conflicts 2011-08-13 22:18:42 +01:00
Peter 'Pita' Martischka
d0e378f63a added a security manager to control pad access on group pads 2011-08-13 22:07:21 +01:00
Peter 'Pita' Martischka
4730c3b46e added a error message for invalid padIDs 2011-08-13 20:20:30 +01:00
Peter 'Pita' Martischka
3c99e07030 fixed regular expression PadID check 2011-08-13 17:48:36 +01:00
Peter 'Pita' Martischka
3a77d96c98 use the temp enviroment variable for windows 2011-08-13 13:11:48 +01:00
Peter 'Pita' Martischka
5252bee124 fixed abiword on windows 2011-08-13 13:02:27 +01:00
Peter 'Pita' Martischka
0e05e58c76 changed copyright from Peter 'Pita' Martischka to Peter 'Pita' Martischka (Primary Technology Ltd) 2011-08-11 15:27:16 +01:00
Peter 'Pita' Martischka
9cc3b543cc Merge branch 'master' of git://github.com/Pita/etherpad-lite into api 2011-08-10 22:47:50 +01:00
Peter 'Pita' Martischka
ce1012438e added setPublicStatus, getPublicStatus, setPassword and isPasswordProtected 2011-08-10 22:44:16 +01:00
Peter 'Pita' Martischka
292c68a0a5 harmonize different ID types, improved the prefixes 2011-08-10 22:44:08 +01:00
Peter 'Pita' Martischka
f6b87daa27 added deleteSession 2011-08-10 22:43:58 +01:00
Peter 'Pita' Martischka
dc15682a27 changed name of getMapped*4 functions to create*IfNotExistsFor 2011-08-10 22:43:38 +01:00
Peter 'Pita' Martischka
0e4a54328a fixed #61 2011-08-10 17:48:36 +01:00
Peter 'Pita' Martischka
dc10985ba3 beautify exporthtml 2011-08-10 17:31:20 +01:00
Peter 'Pita' Martischka
183d1597c6 clean up 2011-08-09 20:22:39 +01:00
Peter 'Pita' Martischka
dbf9dc6dfb added listSessionsOfGroup and listSessionsOfAuthor 2011-08-09 20:14:32 +01:00
Peter 'Pita' Martischka
4b48380a2f added createSession and getSessionInfo 2011-08-09 16:45:49 +01:00
Peter 'Pita' Martischka
f01906d815 added getMappedAuthor4 2011-08-09 14:42:12 +01:00
Peter 'Pita' Martischka
e336b4f940 added create Author 2011-08-09 12:09:04 +01:00
Peter 'Pita' Martischka
e6ba60bddc cleaned up authormanager 2011-08-09 11:55:12 +01:00
Peter 'Pita' Martischka
1a824bd130 Merge branch 'master' of .git into api 2011-08-09 11:08:27 +01:00
Peter 'Pita' Martischka
a6df6ab0a7 change api calls from POST to GET 2011-08-08 20:14:01 +01:00
Peter 'Pita' Martischka
9d91a3873c added logging for http api calls 2011-08-08 17:45:44 +01:00
Peter 'Pita' Martischka
4670cbc60a added the listPads and createGroupPad 2011-08-08 17:35:40 +01:00
Peter 'Pita' Martischka
8d28fcbf23 ensure server header is also send with the api functions 2011-08-08 17:34:51 +01:00
Peter 'Pita' Martischka
178b4a95ec added getMappedGroup4 and createGroup 2011-08-08 16:21:31 +01:00
Peter 'Pita' Martischka
de0e341b4b fixed ok response 2011-08-04 19:22:46 +01:00
Peter 'Pita' Martischka
9fa52c0e66 added createPad 2011-08-04 19:20:14 +01:00
Peter 'Pita' Martischka
8dabdc8e95 split createPad to createPad and createGroupPad 2011-08-04 18:22:03 +01:00
Peter 'Pita' Martischka
3e0f30bdde added getReadOnlyID 2011-08-04 17:40:51 +01:00
Peter 'Pita' Martischka
7b030710d2 added getRevisionsCount 2011-08-04 17:24:36 +01:00
Peter 'Pita' Martischka
d5d9830dd3 added setText and simplified getText 2011-08-04 17:18:59 +01:00
Peter 'Pita' Martischka
820c18c7e9 check the padID with a regular expression 2011-08-04 16:07:58 +01:00
Peter 'Pita' Martischka
ce725ba6fc Do not try to spawn a gzip process on windows 2011-08-04 13:42:02 +01:00
Peter 'Pita' Martischka
53242d4660 use abiword with abicommand under unix, spawn abiword processes under windows 2011-08-04 13:35:42 +01:00
Randy
e8d84b6058 Use abiword --to parameter instead of abicommand for document conversions. 2011-08-03 15:57:11 -07:00
Peter 'Pita' Martischka
f45b7ce9ea Installed API infrastructure, getText works already 2011-08-03 19:31:25 +01:00
Peter 'Pita' Martischka
39b5f57d4e Let settings warnings output as warnings, not as an error 2011-08-03 19:30:45 +01:00