summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fix delete files from trash binBjoern Schiessle2013-12-023-16/+34
* fix restore from files in sub-foldersBjoern Schiessle2013-11-292-2/+3
* Merge pull request #6099 from owncloud/fix_source_not_found_warningsMorris Jobke2013-11-285-24/+72
|\
| * use better coding styleBjoern Schiessle2013-11-281-1/+2
| * correctFolder() already resolves the dirname internallyBjoern Schiessle2013-11-281-1/+1
| * make sure that we don't try to access an already deleted files, fixes some fi...Bjoern Schiessle2013-11-285-25/+72
* | Merge pull request #6106 from owncloud/fix_preview_creationMorris Jobke2013-11-283-19/+37
|\ \
| * | remove duplicateBjoern Schiessle2013-11-281-1/+0
| * | add PHPDoc for setMimetype()Bjoern Schiessle2013-11-281-0/+4
| * | detect mimetype from the original filename, without the versioning timestampBjoern Schiessle2013-11-281-2/+3
| * | detect mimetype from the original filename, without the delete timestampBjoern Schiessle2013-11-281-2/+9
| * | we need to be able to set the mimetype manuallyBjoern Schiessle2013-11-281-15/+22
| |/
* | Merge pull request #6090 from ganomi/summaryfixganomi2013-11-281-1/+1
|\ \
| * | Fix filellist/rename/summary problemganomi2013-11-271-1/+1
* | | Merge pull request #6097 from owncloud/extstorage-ftptrailingslashMorris Jobke2013-11-282-0/+15
|\ \ \
| * | | Add trailing slash in FTP root path when missingVincent Petry2013-11-282-0/+15
* | | | Merge pull request #6098 from owncloud/files-renamediriconfixMorris Jobke2013-11-281-0/+6
|\ \ \ \
| * | | | Fixed directory icon after renameVincent Petry2013-11-281-0/+6
* | | | | Merge pull request #6100 from owncloud/fix_loginnameusageMorris Jobke2013-11-281-4/+5
|\ \ \ \ \
| * | | | | loginname is not necessarily usernameArthur Schiwon2013-11-281-4/+5
| |/ / / /
* / / / / ownCloud 6 RC1v6.0.0RC1Frank Karlitschek2013-11-281-2/+2
|/ / / /
* | | | Merge pull request #6089 from owncloud/files-mimetyperefreshafterrenameFrank Karlitschek2013-11-285-26/+87
|\ \ \ \
| * | | | Fixed unit tests for ajax renameVincent Petry2013-11-271-19/+44
| * | | | Update file list entry on renameVincent Petry2013-11-272-7/+29
| * | | | Redetect mime type whenever extension is renamedVincent Petry2013-11-272-0/+14
* | | | | Merge pull request #6096 from owncloud/files-txtextfornewfilesVincent Petry2013-11-282-5/+15
|\ \ \ \ \
| * | | | | Moved new file extension out of the translated stringVincent Petry2013-11-281-1/+1
| * | | | | New file box now has default file name + extensionVincent Petry2013-11-282-5/+15
| | |/ / / | |/| | |
* | | | | Merge pull request #6070 from ganomi/showstarsFrank Karlitschek2013-11-281-1/+1
|\ \ \ \ \
| * | | | | Show stars as placeholderganomi2013-11-261-1/+1
| | |_|/ / | |/| | |
* | | | | Merge pull request #6072 from owncloud/mssql-fix-schema-migration-oc6Frank Karlitschek2013-11-281-0/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | on mssql the schema migration sometimes fails due to an already existing tran...Thomas Mueller2013-11-261-0/+2
* | | | | Merge pull request #6094 from owncloud/enc_fix_resharesVincent Petry2013-11-281-2/+2
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | fix path reconstruction for resharesBjoern Schiessle2013-11-271-2/+2
| | |_|/ | |/| |
* | | | Merge pull request #6084 from owncloud/fix-app-routingThomas Müller2013-11-281-1/+5
|\ \ \ \
| * | | | Fix getRawPathInfo for the '/' edge caseRobin Appelman2013-11-271-1/+5
| * | | | fix custom routes defined by appsRobin Appelman2013-11-271-1/+1
* | | | | Merge pull request #6048 from owncloud/encryption_initial_enc_indicatorMorris Jobke2013-11-276-17/+89
|\ \ \ \ \
| * | | | | improve encryption messageMorris Jobke2013-11-273-2/+6
| * | | | | some small js fixesBjoern Schiessle2013-11-271-2/+2
| * | | | | add spinner to the template so that it can be loaded in timeBjoern Schiessle2013-11-272-1/+3
| * | | | | switch to large spinnerBjoern Schiessle2013-11-273-2/+7
| * | | | | switch from "name" attribute to "id"Bjoern Schiessle2013-11-272-3/+3
| * | | | | Merge branch 'master' into encryption_initial_enc_indicatorBjoern Schiessle2013-11-2733-156/+720
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | with the latest changes in master $this-userID is always the correct ID, so w...Bjoern Schiessle2013-11-272-25/+21
| * | | | | Merge branch 'master' into encryption_initial_enc_indicatorBjoern Schiessle2013-11-26289-1892/+3226
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | added a small version of the dark loading gif, looks nicer on the blue backgr...Bjoern Schiessle2013-11-262-1/+1
| * | | | | use POST instead of GETBjoern Schiessle2013-11-262-3/+3
| * | | | | fix typo in var nameBjoern Schiessle2013-11-261-1/+1
| * | | | | remove debug outputBjoern Schiessle2013-11-251-1/+0