server/apps/media
Brice Maron 4753cc3ebd Merge branch 'master' into multi_app_dir
Conflicts:
	apps/bookmarks/ajax/addBookmark.php
	config/config.sample.php
	lib/app.php
	remote.php
2012-06-14 21:16:59 +00:00
..
ajax prevent opening non-music files through the media ajax api 2012-06-09 17:39:14 +02:00
appinfo utf8 in der DB config 2012-06-11 23:04:28 +02:00
css adding proper copyright and license notice to the style files 2012-04-23 14:19:03 +02:00
js Variable not declared in media app, fixes bug oc-633. Thanks to die3lustigen2. 2012-05-13 16:45:03 -04:00
l10n update translations 2012-06-06 00:29:28 +02:00
server Correct remote and public, and last occurence of OC:: 2012-06-06 20:24:15 +00:00
templates removing executable bit - again 2012-05-15 00:52:00 +02:00
index.php remove not needed includes 2012-05-28 13:57:45 +02:00
lib_ampache.php removing executable bit - again 2012-05-15 00:52:00 +02:00
lib_collection.php removing executable bit - again 2012-05-15 00:52:00 +02:00
lib_media.php removing executable bit - again 2012-05-15 00:52:00 +02:00
lib_scanner.php xss vulnerability fixed 2012-06-05 10:46:28 +02:00
remote.php Correct remote and public, and last occurence of OC:: 2012-06-06 20:24:15 +00:00
settings.php removing executable bit - again 2012-05-15 00:52:00 +02:00