Georg Ehrke a357e5b284 merge conflicts ...		2013-07-10 12:41:53 +02:00
..
api.php	Style-fix: Breakup long lines	2013-02-14 08:38:37 +01:00
app.php	fixing returns	2013-01-06 23:57:27 +01:00
backgroundjob.php	Move legacy backgroundjob classes to a place where they can be autoloaded	2013-05-03 16:42:48 +02:00
config.php	Style-fix: Breakup long lines	2013-02-14 08:38:37 +01:00
constants.php	Whitespace cleanup	2013-01-16 18:09:16 +01:00
contacts.php	Correct lib/public/contacts.php tests	2013-02-06 17:37:47 +01:00
db.php	Whitespace cleanup	2013-01-16 18:09:16 +01:00
defaults.php	add public api	2013-07-04 10:11:55 +02:00
files.php	add a searchbymime to the public api. Please all remember that access to internal oc classes will be disabled for all app for ownCloud 6. So please port yur stuff to the public api :-)	2013-03-19 14:27:02 +01:00
groupinterface.php	Offer User and Group interfaces in public API	2012-07-25 12:56:08 +02:00
iaddressbook.php	Fix indentation style	2013-02-14 08:36:26 +01:00
json.php	style fixes for public json api	2012-09-08 16:14:06 +02:00
preview.php	first version of the new previewer lib. It currently only created previews/thumbnails for images. It get´s more interesting when we add PDFs, movies, mp3, text files and more...	2012-11-13 15:11:02 +01:00
response.php	fixing returns	2013-01-06 23:59:02 +01:00
share.php	Only emit permissions hook for files and and include path	2013-07-08 17:28:18 -04:00
template.php	implement server side use of previews	2013-06-26 18:04:22 +02:00
user.php	Whitespace fixes	2013-02-22 19:05:36 +01:00
userinterface.php	Offer User and Group interfaces in public API	2012-07-25 12:56:08 +02:00
util.php	Implement encodePath	2013-07-09 17:46:11 +03:00