summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2324 from owncloud/html_video_tagBjörn Schießle2013-03-201-1/+8
|\ | | | | use html video tag to preview videos for public shares
| * use html video tag to preview videos for public sharesBjörn Schießle2013-03-141-1/+8
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2013-03-204-4/+20
| |
* | LDAP: user exists check on getHome, otherwise check will be performed with ↵Arthur Schiwon2013-03-191-0/+5
| | | | | | | | wrong configs on a multi LDAP server setup.
* | LDAP: avoid irritating log outputArthur Schiwon2013-03-191-1/+4
| |
* | LDAP: check whether user exists for before trying to determine displaynameArthur Schiwon2013-03-191-0/+4
| |
* | LDAP: check first whether group exists in this backend before doing other ↵Arthur Schiwon2013-03-191-0/+9
| | | | | | | | operations
* | LDAP: remove unnecessary func call, was a leftover from earlier refactorArthur Schiwon2013-03-191-1/+0
| |
* | LDAP: specify appid when selecting from appconfigArthur Schiwon2013-03-191-1/+2
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2013-03-193-1/+9
| |
* | Merge pull request #2363 from owncloud/uploadsizeBernhard Posselt2013-03-182-1/+3
|\ \ | | | | | | Improve behaviour when max upload size is unknown
| * | Don't block uploads if the max upload size is unknownRobin Appelman2013-03-151-0/+2
| | |
| * | Improve handeling of unlimited max upload sizeRobin Appelman2013-03-151-1/+1
| | |
* | | add some error logs to the trash bin appBjörn Schießle2013-03-182-0/+3
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-03-183-1/+56
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-03-166-2/+56
| | |
* | | Merge remote-tracking branch 'upstream/master'sherbrecher2013-03-15643-5393/+44385
|\| | | | | | | | | | | | | | Conflicts: apps/files_external/templates/settings.php
| * | remove backticks around table namesBjörn Schießle2013-03-151-3/+3
| | |
| * | add backtick for db queries to prevent postgresql errorsBjörn Schießle2013-03-151-3/+3
| | |
| * | Merge pull request #2336 from eMerzh/fix_trashpgBjörn Schießle2013-03-152-12/+12
| |\ \ | | | | | | | | Add backtick for trash app to prevent pg errors
| | * | Add backtick for trash app to prevent pg errorsBrice Maron2013-03-152-12/+12
| | |/
| * | Merge pull request #2317 from owncloud/create_version_on_uploadFrank Karlitschek2013-03-151-3/+10
| |\ \ | | | | | | | | create new version if the same file is uploaded again over the web interface
| | * | fix var nameBjörn Schießle2013-03-141-2/+2
| | | |
| | * | fix var nameBjörn Schießle2013-03-141-1/+1
| | | |
| | * | create new version if the same file is uploaded again over the web interfaceBjörn Schießle2013-03-141-3/+10
| | |/
| * / [tx-robot] updated from transifexJenkins for ownCloud2013-03-1511-4/+39
| |/
| * [tx-robot] updated from transifexJenkins for ownCloud2013-03-147-0/+31
| |
| * Merge pull request #2277 from owncloud/fix_sharing_hooksBernhard Posselt2013-03-131-1/+1
| |\ | | | | | | listen to the pre delete hook in the sharing app [master]
| | * we need to listen to the pre delete hook, otherwise the file is already goneBjörn Schießle2013-03-131-1/+1
| | |
| * | Merge pull request #2265 from owncloud/no_share_option_for_shared_folderBjörn Schießle2013-03-131-1/+1
| |\ \ | | |/ | |/| don't add share action to the Shared folder
| | * only prevent shared action for the Shared folder in the root dirBjörn Schießle2013-03-131-1/+1
| | |
| | * don't add share action to the Shared folderBjörn Schießle2013-03-121-1/+1
| | |
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-03-137-3/+13
| | |
| * | Merge pull request #2234 from owncloud/fix_ldap_edirectoryFrank Karlitschek2013-03-121-2/+2
| |\ \ | | |/ | |/| LDAP: compatibility with Novell eDirectory UUID
| | * LDAP: compatibility with Novell eDirectory UUIDArthur Schiwon2013-03-111-2/+2
| | |
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-03-125-13/+42
| |/
| * Merge pull request #1786 from owncloud/shared-folder-etagsBernhard Posselt2013-03-115-39/+181
| |\ | | | | | | Include etags for the root of the shared folder
| | * Fix correctFolders and retrieve the correct storage cacheMichael Gapczynski2013-03-082-17/+17
| | |
| | * not only files can be reshared but also foldersBjörn Schießle2013-03-081-1/+1
| | |
| | * Fix share hook for updaterMichael Gapczynski2013-03-081-2/+14
| | |
| | * use pre_unshare hook, otherwise the share is already removed. Which means ↵Björn Schießle2013-03-081-1/+1
| | | | | | | | | | | | that we have no chance to determine which folder has to be updated
| | * Merge branch 'master' into shared-folder-etagsMichael Gapczynski2013-03-0719-32/+140
| | |\ | | | | | | | | | | | | | | | | Conflicts: apps/files_sharing/lib/sharedstorage.php
| | * | itemSource parameter should be fileSourceMichael Gapczynski2013-03-071-2/+2
| | | |
| | * | Update Shared folders ETags of users with resharesMichael Gapczynski2013-03-061-5/+11
| | | |
| | * | Move hook connectors from shared storage to app.php, add post_unshare hookMichael Gapczynski2013-03-052-4/+5
| | | |
| | * | Merge branch 'master' into shared-folder-etagsMichael Gapczynski2013-03-05172-522/+696
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_sharing/appinfo/app.php
| | * | | Fix variable name in Shared_UpdaterMichael Gapczynski2013-03-021-1/+1
| | | | |
| | * | | Update ETag when file is sharedMichael Gapczynski2013-03-022-0/+11
| | | | |
| | * | | Merge branch 'master' into shared-folder-etagsMichael Gapczynski2013-02-28230-1122/+1681
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_sharing/lib/sharedstorage.php
| | * | | | Fix target path and reuse mtimeMichael Gapczynski2013-02-261-4/+4
| | | | | |