Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into master-sqlserver | Thomas Mueller | 2013-02-22 | 1 | -9/+18 |
|\ | | | | | | | | | Conflicts: core/templates/installation.php | ||||
| * | Merge pull request #1859 from owncloud/blacklist-fix | Bernhard Posselt | 2013-02-22 | 1 | -7/+15 |
| |\ | | | | | | | Add OC\Files\Filesystem::isFileBlacklisted | ||||
| | * | Add OC\Files\Filesystem::isFileBlacklisted | Robin Appelman | 2013-02-22 | 1 | -7/+15 |
| | | | |||||
| * | | fix order of mount commands | Georg Ehrke | 2013-02-22 | 1 | -2/+3 |
| |/ | |||||
* | | Merge branch 'master' into master-sqlserver | Thomas Mueller | 2013-02-20 | 4 | -13/+43 |
|\| | | | | | | | | | Conflicts: lib/files/cache/cache.php | ||||
| * | Merge pull request #1731 from owncloud/unknown-freespace | Frank Karlitschek | 2013-02-19 | 2 | -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 space | Robin Appelman | 2013-02-16 | 2 | -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/mountconfig | Thomas Müller | 2013-02-18 | 1 | -9/+19 |
| |\ \ | | | | | | | | | Use json for new mount configuration files | ||||
| | * \ | merge master into mountconfig | Robin Appelman | 2013-02-18 | 2 | -15/+15 |
| | |\ \ | |||||
| | * | | | Create new mountconfig files in json | Robin Appelman | 2013-02-16 | 1 | -4/+12 |
| | | | | | |||||
| | * | | | Use a parser to read custom mount configuration instead of including the php ↵ | Robin Appelman | 2013-02-16 | 1 | -7/+9 |
| | | |/ | | |/| | | | | | | | | | files | ||||
| * | | | Merge pull request #1724 from owncloud/long-storage-id | Frank Karlitschek | 2013-02-18 | 2 | -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 database | Robin Appelman | 2013-02-15 | 2 | -4/+13 |
| | |/ | |||||
* | | | Merge branch 'master' into master-sqlserver | Thomas Mueller | 2013-02-18 | 2 | -15/+15 |
|\| | | |||||
| * | | class Mapper no respects an unchanged physical root which will be excluded ↵ | Thomas Mueller | 2013-02-15 | 1 | -12/+12 |
| | | | | | | | | | | | | from slugifying the path | ||||
| * | | fix error in recursive search | Thomas Mueller | 2013-02-15 | 1 | -3/+3 |
| |/ | |||||
* | | Merge branch 'master' into master-sqlserver | Thomas Mueller | 2013-02-14 | 11 | -76/+124 |
|\| | | | | | | | | | | | | | | | Conflicts: lib/db.php lib/files/cache/cache.php lib/files/cache/legacy.php lib/setup.php | ||||
| * | Style-fix: Breakup long lines | Bart Visscher | 2013-02-14 | 8 | -18/+40 |
| | | |||||
| * | Fix NoSpaceAfterComma and SpaceBeforeComma | Bart Visscher | 2013-02-14 | 4 | -34/+34 |
| | | |||||
| * | Fix indentation style | Bart Visscher | 2013-02-14 | 1 | -1/+1 |
| | | |||||
| * | Fix SpaceBeforeOpenBrace errors | Bart Visscher | 2013-02-14 | 2 | -6/+6 |
| | | |||||
| * | Merge pull request #1618 from owncloud/mapped-storage-unit-testing-linux-masterv5.0.0alpha1 | Lukas Reschke | 2013-02-12 | 3 | -3/+22 |
| |\ | | | | | | | Mapped storage unit testing linux master | ||||
| | * | fixing mappedlocal storage to work on non-windows as well | Thomas Mueller | 2013-02-11 | 2 | -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-master | Thomas Mueller | 2013-02-11 | 3 | -7/+46 |
| | |\ | |||||
| | * | | make MappedLocal available and testable within Linux as well | Thomas Müller | 2013-02-09 | 2 | -2/+4 |
| | | | | |||||
| * | | | $this->numericId should be determined based on table storages not filecache | Thomas Mueller | 2013-02-12 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge pull request #1616 from owncloud/cache_fixes_rebase | Thomas Müller | 2013-02-12 | 1 | -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 cache | Robin Appelman | 2013-02-12 | 1 | -2/+1 |
| | | | | | |||||
| | * | | | fixing syntax error | Thomas Mueller | 2013-02-12 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Cache: also preserve etags for files | Robin Appelman | 2013-02-12 | 1 | -2/+5 |
| | | | | | |||||
| | * | | | Cache: don't create a new etag when the mtime hasn't changed | Robin Appelman | 2013-02-11 | 1 | -0/+3 |
| | | | | | |||||
| | * | | | Cache: actually use parameter | Robin Appelman | 2013-02-11 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Cache: reuse known folder sizes when doing a shallow scan | Robin Appelman | 2013-02-11 | 1 | -3/+7 |
| | | | | | |||||
| | * | | | Cache: simplify scanner logic a bit when handeling with unknown folder sizes | Robin Appelman | 2013-02-11 | 1 | -9/+7 |
| | | |/ | | |/| | |||||
| * | | | Update lib/files/cache/legacy.php | irgsmirx | 2013-02-11 | 1 | -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 connectivity | Thomas Mueller | 2013-02-14 | 1 | -3/+3 |
| | | | | |||||
* | | | | Merge branch 'master' into master-sqlserver | Thomas Mueller | 2013-02-12 | 8 | -9/+603 |
|\| | | | |||||
| * | | | Merge pull request #1608 from owncloud/fix-shared-links | Lukas Reschke | 2013-02-11 | 1 | -2/+2 |
| |\ \ \ | | | | | | | | | | | Fix shared links | ||||
| | * | | | Merge branch 'master' into fix-shared-links | Michael Gapczynski | 2013-02-10 | 3 | -7/+46 |
| | |\| | | |||||
| | * | | | Proper fix for shared links | Michael Gapczynski | 2013-02-10 | 1 | -2/+2 |
| | | |/ | | |/| | |||||
| * | | | Merge pull request #1573 from owncloud/fixing-ctor-local-storage-master | Bernhard Posselt | 2013-02-11 | 2 | -0/+3 |
| |\ \ \ | | |_|/ | |/| | | adding dtor to Local and revert call to it within Temporary | ||||
| | * | | adding ctor to Local and revert call to it within Temporary | Thomas Müller | 2013-02-09 | 2 | -0/+3 |
| | | | | |||||
| * | | | Merge pull request #1581 from owncloud/mapper_md5 | Frank Karlitschek | 2013-02-10 | 1 | -6/+6 |
| |\ \ \ | | | | | | | | | | | Mapper: use md5 hashes for database indexes | ||||
| | * | | | Mapper: use md5 hashes for database indexes | Robin Appelman | 2013-02-10 | 1 | -6/+6 |
| | | |/ | | |/| | | | | | | | | | indexing the full path exeeds the maximum index length for MySQL | ||||
| * | | | Merge pull request #1590 from owncloud/fix_470 | Lukas Reschke | 2013-02-10 | 1 | -1/+17 |
| |\ \ \ | | | | | | | | | | | append .part to put files | ||||
| | * | | | append .part to put files | Jörn Friedrich Dreyer | 2013-02-10 | 1 | -1/+17 |
| | |/ / | |||||
| * | | | Merge pull request #1030 from hkjolhede/master | Lukas Reschke | 2013-02-10 | 1 | -0/+23 |
| |\ \ \ | | |/ / | |/| | | SFTP support in files_external app | ||||
| | * | | Merge branch 'master' of https://github.com/hkjolhede/owncloud_core | Henrik Kjölhede | 2013-02-09 | 1 | -2/+1 |
| | | | | |||||
| | * | | Merge branch 'master' of https://github.com/owncloud/core | Henrik Kjölhede | 2013-02-09 | 1 | -0/+24 |
| | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_external/appinfo/app.php | ||||
| * | | | Merge pull request #1566 from owncloud/fixing-1505-master | Thomas Müller | 2013-02-09 | 1 | -5/+1 |
| |\ \ \ | | | | | | | | | | | fixes zip download for folders containing a dot ..... |