Thomas Tanghus 5a99310cdf Merge git://gitorious.org/owncloud/owncloud into contact_thumbnails ... Fixed some conflicts. Conflicts: apps/contacts/css/styles.css apps/contacts/templates/index.php		2011-12-28 10:14:59 +01:00
..
admin_dependencies_chk	Correct ldap check in dependencies_chk app	2011-11-25 23:43:24 +01:00
admin_export	Don't use sys_get_temp_dir(), as it reports the wrong path in restricted environments	2011-10-19 23:38:35 +02:00
bookmarks	Bookmarks: make a soft-requirement of php-curl	2011-11-24 21:36:34 +01:00
calendar	Merge branch 'tanghus_remote_backup' of git://gitorious.org/~tanghus/owncloud/tanghus-owncloud	2011-12-27 22:18:01 +01:00
contacts	Merge git://gitorious.org/owncloud/owncloud into contact_thumbnails	2011-12-28 10:14:59 +01:00
external	use oc_appconfig instead of oc_config for the external apps	2011-11-18 20:19:55 +01:00
files_imageviewer	Imageviewer: fix fancybox.png image url in fancybox css	2011-12-07 20:41:00 +01:00
files_pdfviewer	some coding style fixes for the pdf viewer	2011-12-27 14:19:07 +01:00
files_sharing	Fix shared status for files inside a shared folder	2011-12-17 21:13:54 -05:00
files_texteditor	Little trick to avoid editor loading twice on double click	2011-10-19 22:42:44 +02:00
gallery	removing and renaming albums	2011-12-21 21:55:52 +01:00
media	Music - Fix album and artist expand layout.	2011-11-24 02:55:51 +01:00
remoteStorage	bump version number to force db rebuild	2011-12-08 17:19:38 +07:00
user_ldap	Total rewite of fix.	2011-11-24 02:57:53 +01:00
user_openid	remove unneeded definiton of get_temp_dir	2011-10-20 01:27:04 +02:00
user_webfinger	compliance with http://www.w3.org/community/unhosted/wiki/remoteStorage	2011-12-07 21:51:47 +07:00
.gitkeep	apps are now stored in /apps	2011-04-16 09:46:58 +02:00