summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Added unit test for the test() methodVincent Petry2013-12-032-0/+15
| | | | This is to make sure that method isn't broken
* Merge pull request #6148 from owncloud/fix_trash_restoreVincent Petry2013-12-024-18/+39
|\ | | | | Fix restore anbd delete operations in trash bin
| * check explicitely all possible dir valuesBjoern Schiessle2013-12-021-2/+3
| |
| * set delete all to true if a complete folder was deletedBjoern Schiessle2013-12-021-1/+2
| |
| * fix delete files from trash binBjoern Schiessle2013-12-023-16/+34
| |
| * fix restore from files in sub-foldersBjoern Schiessle2013-11-292-2/+3
| |
* | ownCloud 6 RC2v6.0.0RC2Frank Karlitschek2013-12-021-2/+2
| |
* | Merge pull request #6052 from owncloud/datetime-doctrineThomas Müller2013-12-012-41/+5
|\ \ | | | | | | Get rid of date strings for DB. Completely use Doctrine and DateTime.
| * | Timestamp test is no longer necessary as we rely on Doctrine and DateTime.Andreas Fischer2013-11-261-38/+0
| | |
| * | Use the Doctrine to convert date string to DateTime object.Andreas Fischer2013-11-261-1/+2
| | |
| * | Use DateTime object instead of fixed format date string.Andreas Fischer2013-11-261-2/+1
| | | | | | | | | | | | | | | Use a DateTime object and have conversion handled by Doctrine instead of using a date string with a fixed format.
| * | Use bindValue() instead of passing parameters in execute().Andreas Fischer2013-11-261-1/+3
| | |
* | | Merge pull request #6132 from owncloud/encryption-version-bumpThomas Müller2013-11-291-8/+1
|\ \ \ | | | | | | | | Adjust files_encryption requirements to the new core requirement (PHP 5.3.8)
| * | | Adjust files_encryption requirements to the new core requirement (PHP 5.3.8).Andreas Fischer2013-11-291-8/+1
|/ / /
* | | Merge pull request #6123 from owncloud/extstorage-deletedirs2Vincent Petry2013-11-294-8/+46
|\ \ \ | | | | | | | | Fixed FTP and SMB to use rmdir() when deleting folders
| * | | Fixed FTP and SMB to use rmdir() when deleting foldersVincent Petry2013-11-294-8/+46
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Some storages need to use different calls for deleting files or folders, usually unlink() and rmdir(). Fixes #4532 (SMB dir deletion) Fixes #5941 (FTP dir deletion) Note that the extra is_dir() should be fast because it's read from the stat cache.
* | | Merge pull request #6128 from owncloud/fix-6126-masterThomas Müller2013-11-291-0/+1
|\ \ \ | | | | | | | | Also merge autoconfig variables into $_REQUEST.
| * | | Also merge autoconfig variables into $_REQUEST.Andreas Fischer2013-11-291-0/+1
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-11-29238-1884/+3048
| | | |
* | | | 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
| | | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-11 20:50:38 +0000