Bart Visscher cbaf858dea Merge remote-tracking branch 'gitorious/master' into routing ... Conflicts: apps/files/js/fileactions.js apps/files_archive/js/archive.js		2012-08-29 20:16:39 +02:00
..
ajax	Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-support	2012-08-25 00:05:07 +02:00
appinfo	add backticks to SQL, use limit parameter instead of LIMIT SQL	2012-08-25 01:52:27 +02:00
css	Limit styles so they don't interfere with sharing dropdown.	2012-08-23 05:02:30 +02:00
img	Optimized image size	2012-08-18 13:56:04 +02:00
js	Merge remote-tracking branch 'gitorious/master' into routing	2012-08-29 20:16:39 +02:00
l10n	Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-support	2012-08-25 03:14:26 +02:00
lib	Merge remote-tracking branch 'gitorious/master' into routing	2012-08-29 20:16:39 +02:00
templates	Use correct js class in first-run template.	2012-08-23 22:03:35 +02:00
carddav.php	Code style.	2012-07-20 17:11:13 +02:00
export.php	Code style.	2012-07-20 17:11:13 +02:00
import.php	Code style.	2012-07-20 17:11:13 +02:00
index.php	Add support for IMPP properties.	2012-08-22 18:51:17 +02:00
photo.php	Another take at profile photo/thumbnail caching. oc-839.	2012-08-09 16:32:05 +02:00
settings.php	Implemented app settings in popup.	2012-07-31 12:23:22 +02:00
thumbnail.php	Another take at profile photo/thumbnail caching. oc-839.	2012-08-09 16:32:05 +02:00
tmpphoto.php	Code style.	2012-07-20 17:11:13 +02:00