aboutsummaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #7476 from owncloud/type-hintingThomas Müller2014-04-032-3/+6
|\ | | | | Type hinting
| * Merge branch 'master' into type-hintingBart Visscher2014-03-3119-39/+624
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/private/image.php lib/private/l10n.php lib/private/request.php lib/private/share/mailnotifications.php lib/private/template/base.php
| * | More PHPDoc fixes, using scrutinizer patches as hintsBart Visscher2014-02-282-3/+6
| | |
* | | Merge pull request #7970 from owncloud/webdav-upload-hashThomas Müller2014-04-031-1/+20
|\ \ \ | | | | | | | | Fix uploading files containing a # in the path for webdav
| * | | Fix uploading files containing a # in the path for webdavRobin Appelman2014-03-311-1/+20
| | |/ | |/|
* | | Merge pull request #7979 from owncloud/core-fixfilegetcontentsloopVincent Petry2014-04-022-2/+42
|\ \ \ | | | | | | | | Correctly read the full stream in file_get_contents
| * | | Correctly read the full stream in file_get_contentsVincent Petry2014-04-012-2/+42
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using user-defined stream wrappers, PHP will return a maximum of 8192 bytes even if more was requested. This fix uses stream_get_contents to make sure the full stream is read and not only the first 8 KB. Added unit test with a bigger test file to cover this case.
* | | Merge pull request #7884 from owncloud/use-idn_to_ascii-if-availableThomas Müller2014-04-011-0/+9
|\ \ \ | |/ / |/| | idn_to_ascii is only used if available
| * | idn_to_ascii is only used if availableThomas Müller2014-03-261-0/+9
| | |
* | | Merge pull request #7824 from owncloud/hash-parameter-orderThomas Müller2014-03-281-15/+32
|\ \ \ | | | | | | | | Fix parameter order for Storage\Local::hash
| * | | Fix parameter order for Storage\Local::hashRobin Appelman2014-03-201-15/+32
| | | |
* | | | Merge pull request #7879 from owncloud/sharing_cleanup_public_apiVincent Petry2014-03-281-6/+6
|\ \ \ \ | | | | | | | | | | sharing api cleanup, first step
| * | | | always return an arrayBjoern Schiessle2014-03-251-6/+6
| | | | |
* | | | | Merge pull request #7613 from owncloud/fix_urlGenerator2Vincent Petry2014-03-281-3/+27
|\ \ \ \ \ | | | | | | | | | | | | Add \OC::$WEBROOT to URLGenerator::getAbsoluteURL()
| * | | | | Fix unit testsThomas Tanghus2014-03-071-3/+27
| | |_|_|/ | |/| | |
* | | | | Merge pull request #7829 from owncloud/cachefolderlocationVincent Petry2014-03-281-0/+51
|\ \ \ \ \ | | | | | | | | | | | | Cache folder is now configurable
| * | | | | Added unit tests for external cache folderVincent Petry2014-03-241-0/+51
| | | | | |
* | | | | | Merge pull request #7678 from owncloud/test-bootstrap-fileproxy-cleanupVincent Petry2014-03-281-0/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Cleanup the fileproxy proxies on test bootstrap
| * | | | | Cleanup the fileproxy proxies on test bootstrapBart Visscher2014-03-111-0/+1
| | | | | |
* | | | | | Merge pull request #7420 from owncloud/cachehooks-firstThomas Müller2014-03-251-5/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Manually triger the filecache update hooks before any other hook
| * | | | | | Merge branch 'master' into cachehooks-firstRobin Appelman2014-03-1310-32/+385
| |\| | | | |
| * | | | | | Manually triger the filecache update hooks before any other hookRobin Appelman2014-02-261-5/+0
| | | | | | |
* | | | | | | Merge pull request #7477 from owncloud/foldersize-reuseThomas Müller2014-03-251-1/+0
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | Allow re-using already known fileinfo when calculating folder sizes
| * | | | | | Merge branch 'master' into foldersize-reuseRobin Appelman2014-03-113-0/+266
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | Conflicts: lib/private/files/cache/homecache.php
| * | | | | | Remove assert since the root size of the home storage is no longer calculatedRobin Appelman2014-03-031-1/+0
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #7861 from owncloud/idn-domains-support-on-emails-masterThomas Müller2014-03-251-0/+30
|\ \ \ \ \ \ | | | | | | | | | | | | | | idn have to be converted before being used
| * | | | | | idn have to be converted before being usedThomas Müller2014-03-241-0/+30
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #7714 from owncloud/phpunit-configicewind19912014-03-241-2/+7
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Allow setting the config dir to use as enviroment variable for phpunit
| * | | | | Allow setting the config dir to use as enviroment variable for phpunitRobin Appelman2014-03-131-2/+7
| | |/ / / | |/| | |
* | | | | Merge pull request #7808 from owncloud/quota-usequotaevenwhenfreespaceunknownVincent Petry2014-03-201-0/+18
|\ \ \ \ \ | |_|_|_|/ |/| | | | Still return quota value when free space is unknown
| * | | | Still return quota value when free space is unknownVincent Petry2014-03-191-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed the quota storage wrapper to correctly return the quota value when the free space is not known (which usually happens when the disk_free_space function is disabled)
* | | | | Merge pull request #7732 from owncloud/datafolderexistenceVincent Petry2014-03-202-0/+109
|\ \ \ \ \ | | | | | | | | | | | | Added .ocdata file to check for data folder validity
| * | | | | Added .ocdata file to check for data folder validityVincent Petry2014-03-142-0/+109
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In environments where the data folder is mount from another partition, it is important to check that the data folder we see is actually the real one. If the mount failed for some reasons, this fix will make ownCloud temporarily unavailable instead of causing unpredictable behavior.
* | | | | Merge branch 'master' into close-session-faster-masterThomas Müller2014-03-174-7/+142
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #7649 from owncloud/routing-publicThomas Müller2014-03-171-4/+4
| |\ \ \ \ | | | | | | | | | | | | Move routing classes to an interface and expose it in the public api
| | * | | | Move the router classes to a namespace and expose it with a public interfaceRobin Appelman2014-03-101-4/+4
| | | | | |
| * | | | | Merge pull request #7760 from owncloud/core-roundbytesicewind19912014-03-171-1/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | Correctly round bytes when converted from human readable format
| | * | | | | Correctly round bytes when converted from human readable formatVincent Petry2014-03-171-1/+3
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | Instead of leave two decimal places which is confusing, round the byte values correctly to the closest byte.
| * / | | | unit tests for specific image type output addedThomas Müller2014-03-171-2/+22
| |/ / / /
| * | | | Merge pull request #7650 from owncloud/quota-totalspaceVincent Petry2014-03-111-0/+113
| |\ \ \ \ | | |/ / / | |/| | | Fixed total space display when data size exceeds quota
| | * | | Fixed total space display when data size exceeds quotaVincent Petry2014-03-101-0/+113
| | | | | | | | | | | | | | | | | | | | | | | | | The total space display in the personal page now shows the quota value instead of used space when used space exceeds the quota (soft quota).
* | | | | introduce reopen() method to be used for unit test execution only - right ↵Thomas Müller2014-03-171-5/+6
| | | | | | | | | | | | | | | | | | | | after a unit test has been executed the session will be reopened
* | | | | move session reset to endTest() - necessary because we need a valid session ↵Thomas Müller2014-03-141-4/+2
| | | | | | | | | | | | | | | | | | | | in the next unit tests setUp() call
* | | | | adding StartSessionListener which initializes the session before each test ↵Thomas Müller2014-03-133-0/+49
|/ / / / | | | | | | | | | | | | case execution
* | | | Merge pull request #7624 from owncloud/enc-encryptedusedspacefixVincent Petry2014-03-101-0/+16
|\ \ \ \ | |/ / / |/| | | [master] Fixed used space to be based on unencrypted size
| * | | Return unencrypted_size of folder when queriedVincent Petry2014-03-071-0/+16
| |/ / | | | | | | | | | | | | | | | This fixes the "used space" to be based on the unencrypted size, not encrypted size, to be consistent with how quota/space is handled when encryption is enabled
* / / Added unit tests for serverHost and other related functionsVincent Petry2014-03-061-0/+137
|/ /
* | Merge pull request #7439 from owncloud/unit-test-for-7430Thomas Müller2014-02-272-0/+30
|\ \ | | | | | | adding test for migrations on columns using keywords
| * | let's name the column 'select' because this is a keyword on all platformsThomas Müller2014-02-262-2/+2
| | |
| * | adding test for migrations on columns using keywordsThomas Müller2014-02-262-0/+30
| |/