56 commits

Author	SHA1	Message	Date
John McLear	cfa3f15f94	Merge pull request #2373 from webzwo0i/avoid-global-vairables ... dont make local variables global	2014-12-16 00:41:41 +00:00
webzwo0i	5d15f655f0	dont make local variables global	2014-12-14 22:01:28 +01:00
Cristo	f7dd756642	Update API.js	2014-11-12 19:53:56 +01:00
Cristo	f59238fe58	Update API.js	2014-11-12 19:50:43 +01:00
Cristo	24ac082cae	Update API.js	2014-11-12 19:49:08 +01:00
Cristo	9d39c9591a	update pad clients	2014-11-12 19:46:50 +01:00
Cristo	c33c6e085e	comment addded	2014-11-08 01:39:27 +01:00
Cristo	d246a191c6	Added option to restore revisions #1791	2014-11-08 01:12:40 +01:00
Stephan Jauernick	412bdd1857	Renamed the variable to prevent possible problems.	2014-06-01 21:19:15 +02:00
Stephan Jauernick	d42a9eb3a6	Enhanced the Example for the API Method getPadID and make the return value consistent to other functions	2014-05-31 11:53:44 +02:00
Stephan Jauernick	fffdde0c59	Implemented the the new API method getPadID for reversing the Readonly ID. Based on: ff88c19fc1	2014-05-31 00:43:31 +02:00
John McLear	44b1ac2b16	Merge pull request #1984 from ldidry/fix/getRevisionChangeset-crash ... Fix getRevisionChangeset API call making etherpad crash	2014-05-14 14:10:44 +01:00
Lennart Brinkmann	dd8af99e2e	Add input validation for html param in setHTML()	2013-12-14 21:14:56 +01:00
John McLear	58bbfd8a65	resolve merge conflict	2013-12-09 21:55:04 +00:00
Luc Didry	3d8452b143	Replace tabs indentation with spaces indentation ... Some files are obviously external libraries, I didn't touch them	2013-12-05 08:41:29 +01:00
s1341	52a99eb9e5	fix bugs, add force option to overwrite destination	2013-11-18 08:25:46 +02:00
s1341	93fcab0461	change parameter names	2013-11-17 21:01:02 +02:00
s1341	29d8bb7716	add pad copy/move API functions	2013-11-17 17:02:44 +00:00
Luc Didry	4a9602cc57	Fix getRevisionChangeset API call making etherpad crash	2013-11-07 22:49:20 +01:00
Eric Schrijver	b34224559d	‘Etherpad Lite’ -> ‘Etherpad’	2013-09-29 13:57:37 +02:00
Bernard `Guyzmo` Pratz	0e5a89becc	added full comments to the new API functions. ... Signed-off-by: Bernard `Guyzmo` Pratz <guyzmo+github@m0g.net>	2013-04-04 19:07:11 +02:00
Bernard `Guyzmo` Pratz	3df3b90bd9	fixed missing API functions declaration in API ; fixed a typo in APIHandler. ... Signed-off-by: Bernard `Guyzmo` Pratz <guyzmo+github@m0g.net>	2013-04-04 19:06:51 +02:00
Guyzmo	8f1348b40b	Added getAttributePool, getRevisionOfHead and getRevisionChangeset methods to API v1.2.8 ... Signed-off-by: Bernard `Guyzmo` Pratz <guyzmo+github@m0g.net>	2013-04-01 17:19:48 +02:00
John McLear	2c69066591	remove pointless stuff	2013-02-27 02:02:18 +00:00
John McLear	7c03bc2610	when exporting HTML include html and body	2013-02-14 01:13:23 +00:00
John McLear	c723aefdfe	when exporting HTML include html and body	2013-02-14 01:10:47 +00:00
John McLear	e152c477c7	include the callback call, for sanity and stop the pad from being nuked so early in the function	2013-02-12 23:38:02 +00:00
Jordan Hollinger	718421a46d	Bugfixes to getChatHistory API method	2013-02-04 00:57:51 -05:00
John McLear	4378561882	change to createDiffHTML	2013-01-28 16:52:23 +00:00
John McLear	3fac18f88a	resolve merge conflict	2013-01-27 17:54:26 +00:00
John McLear	ed5644d4e5	docs	2013-01-27 17:51:40 +00:00
Peter 'Pita' Martischka	07a267be7a	Added colors to pad diff	2013-01-27 16:45:09 +00:00
mluto	cb2b93b133	Added getChatHistory and getChatHead (api+code+doc)	2013-01-26 14:35:26 +01:00
John McLear	3fb2f02875	semi working	2013-01-22 23:16:49 +00:00
John McLear	d21585b880	mheh	2013-01-22 23:06:52 +00:00
John McLear	205d983225	make it crash	2013-01-22 22:48:05 +00:00
John McLear	5d416579ee	bring in some padDiff stuff that doesnt suck	2013-01-22 22:33:51 +00:00
Jordan Hollinger	858d8e6e71	listAllPads should return an object, not an arraay. issue #1374	2013-01-18 11:13:03 -05:00
John McLear	654654b4e1	Merge pull request #1342 from spcsser/feature/padlisting ... API & backend to list pads on epl instance	2013-01-14 08:13:57 -08:00
Swen	198754222d	Added functionality to list pads on this server.	2013-01-08 20:14:01 +01:00
Stephan Jauernick	9f9f7a627e	corrected a documentation glitch for checkToken - clarified which token is validated	2013-01-02 15:14:46 +01:00
Stephan Jauernick	4318d210ce	Update src/node/db/API.js ... Corrected function documentation.	2012-12-07 11:28:03 +01:00
Stephan Jauernick	26ece95905	Update src/node/db/API.js ... Added a missing symicolon and removed the padID argument which is not passed(and thus leads to an errors because the callback lands in there).	2012-12-07 11:28:03 +01:00
Stephan Jauernick	8686da87e8	Update src/node/db/API.js ... Added a checkToken method for checking if the API token is valid.	2012-12-07 11:28:03 +01:00
Marcel Klehr	f8f002adc0	Add listAllGroups API endpoint ... Adds a database key that lists all groups	2012-09-17 23:03:56 +02:00
John McLear	40a7b43799	Update src/node/db/API.js	2012-09-04 17:23:33 +02:00
Mark Holmquist	f9469ef256	Add in padUsers HTTP API call ... I needed the list of users this time, so I got it. There are docs and everything.	2012-08-17 13:39:16 -07:00
Mark Holmquist	3d4fb81796	Add in an HTTP API call to send a custom message type. ... You cannot currently send any data with your custom message, but this patch is just begging for a second one that will allow that.	2012-08-08 10:12:11 -07:00
Jordan Hollinger	a7dd620b9f	Don't crash if setText isn't passed any text. issue #861	2012-07-10 00:53:55 -04:00
Jordan Hollinger	6d5fe459f0	Bugfix to getLastEdited API method, issue #845	2012-07-07 13:22:27 -04:00