aboutsummaryrefslogtreecommitdiffstats
path: root/lib/files
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into master-sqlserverThomas Mueller2013-02-221-9/+18
|\ | | | | | | | | Conflicts: core/templates/installation.php
| * Merge pull request #1859 from owncloud/blacklist-fixBernhard Posselt2013-02-221-7/+15
| |\ | | | | | | Add OC\Files\Filesystem::isFileBlacklisted
| | * Add OC\Files\Filesystem::isFileBlacklistedRobin Appelman2013-02-221-7/+15
| | |
| * | fix order of mount commandsGeorg Ehrke2013-02-221-2/+3
| |/
* | Merge branch 'master' into master-sqlserverThomas Mueller2013-02-204-13/+43
|\| | | | | | | | | Conflicts: lib/files/cache/cache.php
| * Merge pull request #1731 from owncloud/unknown-freespaceFrank Karlitschek2013-02-192-0/+11
| |\ | | | | | | Give storage backends the option to define having no known free space
| | * Give storage backends the option to define having no known free spaceRobin Appelman2013-02-162-0/+11
| | | | | | | | | | | | When this is the case only the configured max upload size is taking into account for uploading
| * | Merge pull request #1728 from owncloud/mountconfigThomas Müller2013-02-181-9/+19
| |\ \ | | | | | | | | Use json for new mount configuration files
| | * \ merge master into mountconfigRobin Appelman2013-02-182-15/+15
| | |\ \
| | * | | Create new mountconfig files in jsonRobin Appelman2013-02-161-4/+12
| | | | |
| | * | | Use a parser to read custom mount configuration instead of including the php ↵Robin Appelman2013-02-161-7/+9
| | | |/ | | |/| | | | | | | | | files
| * | | Merge pull request #1724 from owncloud/long-storage-idFrank Karlitschek2013-02-182-4/+13
| |\ \ \ | | |_|/ | |/| | Cache: hash long storage ids to ensure they fit in the database
| | * | Cache: hash long storage ids to ensure they fit in the databaseRobin Appelman2013-02-152-4/+13
| | |/
* | | Merge branch 'master' into master-sqlserverThomas Mueller2013-02-182-15/+15
|\| |
| * | class Mapper no respects an unchanged physical root which will be excluded ↵Thomas Mueller2013-02-151-12/+12
| | | | | | | | | | | | from slugifying the path
| * | fix error in recursive searchThomas Mueller2013-02-151-3/+3
| |/
* | Merge branch 'master' into master-sqlserverThomas Mueller2013-02-1411-76/+124
|\| | | | | | | | | | | | | | | Conflicts: lib/db.php lib/files/cache/cache.php lib/files/cache/legacy.php lib/setup.php
| * Style-fix: Breakup long linesBart Visscher2013-02-148-18/+40
| |
| * Fix NoSpaceAfterComma and SpaceBeforeCommaBart Visscher2013-02-144-34/+34
| |
| * Fix indentation styleBart Visscher2013-02-141-1/+1
| |
| * Fix SpaceBeforeOpenBrace errorsBart Visscher2013-02-142-6/+6
| |
| * Merge pull request #1618 from owncloud/mapped-storage-unit-testing-linux-masterv5.0.0alpha1Lukas Reschke2013-02-123-3/+22
| |\ | | | | | | Mapped storage unit testing linux master
| | * fixing mappedlocal storage to work on non-windows as wellThomas Mueller2013-02-112-1/+18
| | | | | | | | | | | | this allows us to run unit tests on linux - necessary to enable easy regression testing
| | * Merge branch 'master' into mapped-storage-unit-testing-linux-masterThomas Mueller2013-02-113-7/+46
| | |\
| | * | make MappedLocal available and testable within Linux as wellThomas Müller2013-02-092-2/+4
| | | |
| * | | $this->numericId should be determined based on table storages not filecacheThomas Mueller2013-02-121-1/+1
| | | |
| * | | Merge pull request #1616 from owncloud/cache_fixes_rebaseThomas Müller2013-02-121-12/+19
| |\ \ \ | | | | | | | | | | Cache: reuse known folder sizes when doing a shallow scan - rebase
| | * | | Cache: fix scanner trying to use existing data when file isn't in cacheRobin Appelman2013-02-121-2/+1
| | | | |
| | * | | fixing syntax errorThomas Mueller2013-02-121-1/+1
| | | | |
| | * | | Cache: also preserve etags for filesRobin Appelman2013-02-121-2/+5
| | | | |
| | * | | Cache: don't create a new etag when the mtime hasn't changedRobin Appelman2013-02-111-0/+3
| | | | |
| | * | | Cache: actually use parameterRobin Appelman2013-02-111-1/+1
| | | | |
| | * | | Cache: reuse known folder sizes when doing a shallow scanRobin Appelman2013-02-111-3/+7
| | | | |
| | * | | Cache: simplify scanner logic a bit when handeling with unknown folder sizesRobin Appelman2013-02-111-9/+7
| | | |/ | | |/|
| * | | Update lib/files/cache/legacy.phpirgsmirx2013-02-111-0/+6
| | | | | | | | | | | | | | | | | | | | Fixing a bug that occurs when trying to update a non-existent 'fscache' table in the database - if unfixed upgrading does not succeed. Unfortunately I could not get a call to PEAR::isError working. That is why I check for the existence of a property present in class MDB2_Error.
* | | | final adoptions for mssql connectivityThomas Mueller2013-02-141-3/+3
| | | |
* | | | Merge branch 'master' into master-sqlserverThomas Mueller2013-02-128-9/+603
|\| | |
| * | | Merge pull request #1608 from owncloud/fix-shared-linksLukas Reschke2013-02-111-2/+2
| |\ \ \ | | | | | | | | | | Fix shared links
| | * | | Merge branch 'master' into fix-shared-linksMichael Gapczynski2013-02-103-7/+46
| | |\| |
| | * | | Proper fix for shared linksMichael Gapczynski2013-02-101-2/+2
| | | |/ | | |/|
| * | | Merge pull request #1573 from owncloud/fixing-ctor-local-storage-masterBernhard Posselt2013-02-112-0/+3
| |\ \ \ | | |_|/ | |/| | adding dtor to Local and revert call to it within Temporary
| | * | adding ctor to Local and revert call to it within TemporaryThomas Müller2013-02-092-0/+3
| | | |
| * | | Merge pull request #1581 from owncloud/mapper_md5Frank Karlitschek2013-02-101-6/+6
| |\ \ \ | | | | | | | | | | Mapper: use md5 hashes for database indexes
| | * | | Mapper: use md5 hashes for database indexesRobin Appelman2013-02-101-6/+6
| | | |/ | | |/| | | | | | | | | indexing the full path exeeds the maximum index length for MySQL
| * | | Merge pull request #1590 from owncloud/fix_470Lukas Reschke2013-02-101-1/+17
| |\ \ \ | | | | | | | | | | append .part to put files
| | * | | append .part to put filesJörn Friedrich Dreyer2013-02-101-1/+17
| | |/ /
| * | | Merge pull request #1030 from hkjolhede/masterLukas Reschke2013-02-101-0/+23
| |\ \ \ | | |/ / | |/| | SFTP support in files_external app
| | * | Merge branch 'master' of https://github.com/hkjolhede/owncloud_coreHenrik Kjölhede2013-02-091-2/+1
| | | |
| | * | Merge branch 'master' of https://github.com/owncloud/coreHenrik Kjölhede2013-02-091-0/+24
| | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_external/appinfo/app.php
| * | | Merge pull request #1566 from owncloud/fixing-1505-masterThomas Müller2013-02-091-5/+1
| |\ \ \ | | | | | | | | | | fixes zip download for folders containing a dot .....