summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2576 from owncloud/fixing-2125-masterJan-Christoph Borchardt2013-03-311-1/+1
|\
| * fixes #2125 - the warning is now displayed with a disabled buttonThomas Mueller2013-03-261-1/+1
* | [tx-robot] updated from transifexJenkins for ownCloud2013-03-314-0/+6
* | [tx-robot] updated from transifexJenkins for ownCloud2013-03-305-4/+21
* | Merge pull request #2575 from owncloud/fixing-1461-masterJörn Friedrich Dreyer2013-03-281-5/+25
|\ \
| * | fixes #1463 - file size is now displayed correctly in IE8Thomas Mueller2013-03-261-2/+6
| * | fixes #1461Thomas Mueller2013-03-261-3/+19
| |/
* | Files External: show display names instead of internal user names in Settings UIArthur Schiwon2013-03-272-1/+2
* | [tx-robot] updated from transifexJenkins for ownCloud2013-03-2716-21/+64
* | prevent to fire delete ajax a second time.Thomas Mueller2013-03-262-3/+3
|/
* Merge pull request #2270 from owncloud/fix_json_encoded_pubic_downloadBjörn Schießle2013-03-262-2/+8
|\
| * let public link download handle json encoded file listsBjörn Schießle2013-03-132-2/+8
* | the old path no longer exists after rename, update the parent folder insteadBjörn Schießle2013-03-251-1/+1
* | LDAP: fix wrong return valueArthur Schiwon2013-03-251-2/+2
* | fix indentionBjörn Schießle2013-03-251-12/+12
* | skip update if the recipient is the same user as the owner, otherwise we run ...Björn Schießle2013-03-251-5/+9
* | add backticks around table namesBjörn Schießle2013-03-252-12/+12
* | [tx-robot] updated from transifexJenkins for ownCloud2013-03-234-4/+13
* | [tx-robot] updated from transifexJenkins for ownCloud2013-03-212-6/+6
* | 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 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 wr...Arthur Schiwon2013-03-191-0/+5
* | | 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 ope...Arthur Schiwon2013-03-191-0/+9
* | | 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
|\ \ \
| * | | 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
|\| | |
| * | | 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 errorsBrice Maron2013-03-152-12/+12
| | |/ /
| * | | Merge pull request #2317 from owncloud/create_version_on_uploadFrank Karlitschek2013-03-151-3/+10
| |\ \ \
| | * | | 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
| |\ \
| | * | 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
| |\ \ | | |/ | |/|
| | * only prevent shared action for the Shared folder in the root dirBjörn Schießle2013-03-131-1/+1