summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Also clean up the filecache table when deleting a storage entryRobin Appelman2014-02-031-0/+6
* Revert "Use Cache->clear to cleanup the filecache for removed users"Robin Appelman2014-02-031-10/+5
* Use Cache->clear to cleanup the filecache for removed usersRobin Appelman2014-01-221-5/+10
* Also remove the user's home storage from the storage table when deleting a userRobin Appelman2014-01-212-0/+16
* Merge pull request #6856 from owncloud/fixing-gallery-password-protected-acce...Vincent Petry2014-01-213-5/+84
|\
| * Merge branch 'master' into fixing-gallery-password-protected-access-masterThomas Müller2014-01-2119-118/+336
| |\ | |/ |/|
* | Merge pull request #6863 from owncloud/versioning_expire_function_testsThomas Müller2014-01-213-77/+265
|\ \
| * | add first unit test for the versioning appBjoern Schiessle2014-01-212-0/+189
| * | isolate getExpireList function to make it testableBjoern Schiessle2014-01-211-77/+76
* | | Merge pull request #6868 from owncloud/enc-fixrandomfailunittestVincent Petry2014-01-217-35/+35
|\ \ \
| * | | Replaced time() with uniqid() to make sure the file name is uniqueVincent Petry2014-01-217-35/+35
* | | | Merge pull request #6844 from owncloud/fix-css-loading-masterJörn Friedrich Dreyer2014-01-211-1/+1
|\ \ \ \
| * | | | Revert "use getAppWebPath() in here as well"Thomas Müller2014-01-201-1/+1
* | | | | Merge pull request #6858 from owncloud/fix-setupfs-only-for-existing-users-ma...Thomas Müller2014-01-218-5/+35
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Merge branch 'master' into fix-setupfs-only-for-existing-users-masterThomas Müller2014-01-215-20/+26
| |\ \ \ \ | |/ / / / |/| | | |
| * | | | OC_Util::setupFS($user) will create a data dir for the given string - no matt...Thomas Müller2014-01-218-5/+35
| | |/ / | |/| |
| | | * Merge branch 'master' into fixing-gallery-password-protected-access-masterThomas Müller2014-01-215-20/+26
| | | |\ | |_|_|/ |/| | |
* | | | Merge pull request #6864 from owncloud/protect-versions-preview-masterThomas Müller2014-01-213-15/+14
|\ \ \ \
| * | | | don't use the user id within the versions preview call as it could be used to...Thomas Müller2014-01-213-15/+14
|/ / / /
* | | | Merge pull request #6861 from owncloud/neutral_download_zip_default_nameThomas Müller2014-01-211-1/+1
|\ \ \ \
| * | | | use 'download.zip' as default name for zip downloads instead of 'owncloud.zip'Jörn Friedrich Dreyer2014-01-211-1/+1
| |/ / /
* | | | Merge pull request #6857 from owncloud/fix_user_ldap_sql_on_oracleThomas Müller2014-01-211-4/+11
|\ \ \ \ | |/ / / |/| | |
| * | | user workarount to compare CLOB column with CHAR valueJörn Friedrich Dreyer2014-01-211-4/+11
|/ / /
| | * fixing comment + adding unit test for checkPasswordProtectedShareThomas Müller2014-01-212-1/+49
| | * in case no share is found for the given token we can return right awayThomas Müller2014-01-211-0/+3
| | * adding password protection check to getShareByToken()Thomas Müller2014-01-212-5/+33
| |/ |/|
* | Merge pull request #6820 from owncloud/phpunit-test-configThomas Müller2014-01-204-5/+14
|\ \
| * | Move test config folder to tests/configRobin Appelman2014-01-201-2/+2
| * | Load a separate config (if present) when running unit testsRobin Appelman2014-01-174-5/+14
* | | Merge pull request #6849 from owncloud/checkupdate-reuseicewind19912014-01-203-5/+8
|\ \ \
| * | | Reuse the data retrieved from the cache in checkUpdateRobin Appelman2014-01-203-5/+8
* | | | Merge pull request #6851 from owncloud/files-fixtrashandversionrootsizecalcVincent Petry2014-01-202-2/+2
|\ \ \ \
| * | | | When reading the size of "files" mountpoints need to be excludedVincent Petry2014-01-202-2/+2
* | | | | Merge pull request #6842 from owncloud/fix-quotes-again-masterJörn Friedrich Dreyer2014-01-202-0/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | adding a comment to the database schemaThomas Müller2014-01-201-0/+1
| * | | | Updating 3rdparty once more ....Thomas Müller2014-01-201-0/+0
| | |_|/ | |/| |
* | | | Merge pull request #6838 from owncloud/core-quotawrapperfailedfopenfixVincent Petry2014-01-202-1/+20
|\ \ \ \
| * | | | Fixed quota wrapper to not wrap failed fopen streamsVincent Petry2014-01-192-1/+20
* | | | | Merge pull request #6827 from rnveach/fix_6730Morris Jobke2014-01-202-1/+4
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | added trigger to redo selection text on a directory changernveach2014-01-171-0/+2
| * | | | fixed selector string and removed all checkbox if it was selectedrnveach2014-01-171-1/+2
* | | | | Merge pull request #6676 from aseques/check_internet_proxyThomas Müller2014-01-191-0/+5
|\ \ \ \ \
| * | | | | Disabled internet checking as mentioned when in proxy modeJoan2014-01-101-0/+5
* | | | | | Merge pull request #6819 from owncloud/files-ispreviewenabledwarningfixVincent Petry2014-01-192-2/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Fixed isPreviewAvailable warnings in logVincent Petry2014-01-172-2/+2
| | |_|_|/ | |/| | |
* | | | | Merge pull request #6721 from tsumi/patch-1Morris Jobke2014-01-181-0/+3
|\ \ \ \ \
| * | | | | Useless else removedtsumi2014-01-151-2/+0
| * | | | | Added SVG fallback to apps settings popuptsumi2014-01-101-0/+5
* | | | | | Merge pull request #6784 from owncloud/fix-activation-of-unknown-appsMorris Jobke2014-01-182-12/+15
|\ \ \ \ \ \
| * | | | | | don't enable files_external testsThomas Müller2014-01-171-1/+1