summaryrefslogtreecommitdiffstats
path: root/apps/media
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2012-08-221-0/+1
|
* Merge branch 'share_api'Michael Gapczynski2012-08-194-2/+132
|\ | | | | | | | | | | | | Conflicts: apps/contacts/lib/vcard.php apps/files/index.php lib/files.php
| * Merge branch 'master' into share_apiMichael Gapczynski2012-08-141-0/+14
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/group.php lib/group/backend.php lib/group/database.php lib/group/interface.php lib/public/user.php lib/user.php lib/user/backend.php lib/user/database.php lib/user/interface.php
| * \ Merge branch 'master' into share_apiMichael Gapczynski2012-08-091-5/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: apps/contacts/lib/vcard.php apps/files_sharing/sharedstorage.php
| * \ \ Merge branch 'master' into share_apiMichael Gapczynski2012-08-062-0/+15
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/contacts/lib/app.php apps/contacts/templates/part.chooseaddressbook.rowfields.php
| * \ \ \ Merge branch 'master' into share_apiMichael Gapczynski2012-07-312-2/+17
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/contacts/lib/app.php apps/files_sharing/js/share.js
| * \ \ \ \ Merge branch 'master' into share_apiMichael Gapczynski2012-07-257-7/+135
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/calendar/js/loader.js apps/contacts/index.php apps/contacts/js/loader.js apps/files/js/files.js apps/files_sharing/sharedstorage.php lib/filesystemview.php
| * | | | | | Make file actions permissions awareMichael Gapczynski2012-07-251-2/+2
| | | | | | |
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-08-201-2/+3
| |_|_|_|_|/ |/| | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-08-121-0/+14
| |_|_|_|/ |/| | | |
* | | | | Remove useless setting of RUNTIME_NOAPPSBart Visscher2012-08-081-4/+0
| | | | |
* | | | | Remove unused RUNTIME_NOSETUPFS varBart Visscher2012-08-081-2/+1
| |_|_|/ |/| | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2012-07-312-0/+15
| |_|/ |/| |
* | | Set filter to empty if not set by Ampache clientMichael Gapczynski2012-07-271-3/+2
| | |
* | | Set the user id when authenticating user for Ampache, fixes bug oc-219Michael Gapczynski2012-07-271-0/+2
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2012-07-261-0/+14
| |/ |/|
* | remove unused variablesRobin Appelman2012-07-203-6/+4
| |
* | fix remote and public.phpRobin Appelman2012-07-131-1/+1
|/
* remove superfluous ?> at the end of .php files (left out apps/*/templates)Jörn Friedrich Dreyer2012-07-096-9/+0
|
* Don't call getLocalFile() until you know it actually is musicMichael Gapczynski2012-06-261-1/+1
|
* Media: Change includes in app.php to use the autoloaderBart Visscher2012-06-252-15/+16
|
* Use intervals for sessions deletion with postgres fix oc-492Brice Maron2012-06-241-2/+8
|
* Resolve scanning issue case comparison of songsBrice Maron2012-06-241-1/+1
|
* Correct seq name in media songs fix oc-589Brice Maron2012-06-241-1/+1
|
* Remove references to /apps/ and correct inclusion of settingsBrice Maron2012-06-221-3/+3
|
* Merge branch 'master' into multi_app_dirBrice Maron2012-06-214-9/+12
|\ | | | | | | | | | | | | | | | | | | Conflicts: lib/app.php lib/base.php lib/minimizer/css.php lib/minimizer/js.php lib/template.php lib/util.php
| * correct presentation of HTML encoded charactersBjoern Schiessle2012-06-211-1/+1
| |
| * use new sanitizeHTML() functionBjoern Schiessle2012-06-202-8/+8
| |
| * write_close the session when scanning files or musicRobin Appelman2012-06-161-0/+3
| |
* | Merge branch 'master' into multi_app_dirBrice Maron2012-06-142-1/+5
|\| | | | | | | | | | | | | | | Conflicts: apps/bookmarks/ajax/addBookmark.php config/config.sample.php lib/app.php remote.php
| * utf8 in der DB configMarco B2012-06-111-1/+1
| |
| * prevent opening non-music files through the media ajax apiRobin Appelman2012-06-091-0/+4
| |
* | Correct remote and public, and last occurence of OC::Brice Maron2012-06-062-4/+4
|/
* update translationsRobin Appelman2012-06-062-1/+14
|
* xss vulnerability fixedBjoern Schiessle2012-06-051-3/+3
|
* Remove OC_App::register functionBart Visscher2012-05-311-2/+0
| | | | The data supplied is never used in OwnCloud. Removed the call from all the apps, and made the public API function empty.
* add lib collection and lib scanner to media's appinfo/app.phpGeorg Ehrke2012-05-291-0/+2
|
* remove not needed includesFrank Karlitschek2012-05-282-6/+1
|
* mark the apps as part of the shipped package and increase the requirement to ↵Frank Karlitschek2012-05-181-1/+2
| | | | ownCloud 4
* update translationsRobin Appelman2012-05-172-4/+17
|
* removing executable bit - againThomas Mueller2012-05-1513-0/+0
|
* selective app loading for remote/publicRobin Appelman2012-05-141-1/+5
|
* Variable not declared in media app, fixes bug oc-633. Thanks to die3lustigen2.Michael Gapczynski2012-05-131-1/+1
|
* update translationsRobin Appelman2012-05-131-2/+2
|
* load remote and public paths from info.xml during upgrade instead of setting ↵Robin Appelman2012-05-114-81/+4
| | | | them every time
* Fix music file action i.e. click to play, make OC.filePath act like ↵Michael Gapczynski2012-05-101-1/+0
| | | | OC_Helper::linkTo() for index.php links
* update translationsRobin Appelman2012-05-0912-19/+71
|
* Add remote for media/tomahawk.phpBart Visscher2012-05-082-4/+3
|
* Create a function for linking to remote.phpBart Visscher2012-05-072-2/+2
|
* fix path for ampache in settingsGeorg Ehrke2012-05-071-1/+1
|