summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #6129 from owncloud/chunking-fixtouchafterassembleFrank Karlitschek2013-11-291-1/+1
|\ | | | | Fixed touch after chunk assembling
| * Fixed touch after chunk assemblingVincent Petry2013-11-291-1/+1
| | | | | | | | | | | | | | Fixed touch after chunk assembling which was using the wrong path, resulting in the creation of an extra file. Fixes #6007
* | Merge pull request #6127 from owncloud/minimum_php_versionMorris Jobke2013-11-291-4/+4
|\ \ | |/ |/| make 5.3.8 the minimum supported version.
| * make 5.3.8 the minimum supported version. This fixes several issues with ↵Frank Karlitschek2013-11-291-4/+4
|/ | | | | | broken PHP versions like: https://github.com/owncloud/core/issues/5734 Also make the version compare clearer. It was pure luck that floatval on a php version returned the correct value.
* Merge pull request #5984 from owncloud/nav-scrollbarFrank Karlitschek2013-11-292-5/+12
|\ | | | | always show app navigation scrollbar when too many apps in there
| * Fix for IE - an ugly horizontal scrollbar appearsMorris Jobke2013-11-272-0/+6
| | | | | | | | | | | | | | * for IE9 the nav bar was too narrow * for other IEs the width of each app element was to wide and cause the horizontal scoll bar - now this content is hidden like before this PR
| * fix navbarMorris Jobke2013-11-271-1/+0
| |
| * prevent shift of app names caused by scrollbar, part 2Jan-Christoph Borchardt2013-11-271-1/+3
| |
| * prevent shift of app titles caused by scrollbarJan-Christoph Borchardt2013-11-271-0/+1
| |
| * always show app navigation scrollbar when too many apps in thereJan-Christoph Borchardt2013-11-271-5/+4
| |
* | Merge pull request #6077 from owncloud/fix-api-documentationFrank Karlitschek2013-11-293-2/+31
|\ \ | | | | | | API doc for contacts manager, server container and share
| * | add comment from @DeepDiverMorris Jobke2013-11-271-2/+1
| | |
| * | API doc for contacts manager, server container and shareMorris Jobke2013-11-273-2/+32
| | |
* | | Merge pull request #6111 from owncloud/non-floating-trash-button-chromeFrank Karlitschek2013-11-293-3/+5
|\ \ \ | | | | | | | | Fix resize issue for trash button in chrome and overflowing spinner in ....
| * | | Fix resize issue for trash button in chrome and overflowing spinner in ↵Morris Jobke2013-11-283-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | .update class fixes #6108
* | | | Merge pull request #6099 from owncloud/fix_source_not_found_warningsMorris Jobke2013-11-285-24/+72
|\ \ \ \ | | | | | | | | | | make sure that we don't try to access an already deleted files
| * | | | 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 ↵Bjoern Schiessle2013-11-285-25/+72
| | | | | | | | | | | | | | | | | | | | file source not found warnings
* | | | | Merge pull request #6106 from owncloud/fix_preview_creationMorris Jobke2013-11-283-19/+37
|\ \ \ \ \ | |_|/ / / |/| | | | Fix preview creation
| * | | | 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 problem
| * | | | Fix filellist/rename/summary problemganomi2013-11-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Fixes #6055 This contribution is MIT licensed!
* | | | | Merge pull request #6097 from owncloud/extstorage-ftptrailingslashMorris Jobke2013-11-282-0/+15
|\ \ \ \ \ | | | | | | | | | | | | Add trailing slash in FTP root path when missing
| * | | | | Add trailing slash in FTP root path when missingVincent Petry2013-11-282-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #6093
* | | | | | Merge pull request #6098 from owncloud/files-renamediriconfixMorris Jobke2013-11-281-0/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fixed directory icon after rename
| * | | | | | 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 username
| * | | | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | Redetect mime type whenever extension is renamed
| * | | | | | Fixed unit tests for ajax renameVincent Petry2013-11-271-19/+44
| | | | | | |
| * | | | | | Update file list entry on renameVincent Petry2013-11-272-7/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever a file is renamed, if the extension changes, the mime type and preview might change. This fix passes the updated info to the client that updates it.
| * | | | | | 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
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | New file box now has default file name + extension
| * | | | | | | 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
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever a user creates a file or folder in the web UI, the input field will contain a default file name, pre-selected up to the extension for easier typing. The purpose is mostly to prevent users creating text files without an extension. Fixes #6045
* | | | | | | Merge pull request #6070 from ganomi/showstarsFrank Karlitschek2013-11-281-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Show stars as password placeholder for sharing
| * | | | | | | 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...
| * | | | | | on mssql the schema migration sometimes fails due to an already existing ↵Thomas Mueller2013-11-261-0/+2
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | transaction - error: 'New transaction is not allowed because there are other threads running in the session.' The solution is to simple reconnect to the database to start with a fresh connection
* | | | | | Merge pull request #6094 from owncloud/enc_fix_resharesVincent Petry2013-11-281-2/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | fix path reconstruction for reshares
| * | | | | 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 custom routes defined by apps
| * | | | | Fix getRawPathInfo for the '/' edge caseRobin Appelman2013-11-271-1/+5
| | | | | |
| * | | | | fix custom routes defined by appsRobin Appelman2013-11-271-1/+1
| | |_|_|/ | |/| | |