aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Moved steps to reproduce to the topVincent Petry2014-01-221-5/+5
| | | | | | This prevents people to put their steps into the "Expected" section. It is better to first read the steps to find out how users reached the issue, then see what was expected and actually happened.
* Merge pull request #6856 from ↵Vincent Petry2014-01-213-5/+84
|\ | | | | | | | | owncloud/fixing-gallery-password-protected-access-master adding password protection check to getShareByToken()
| * 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
|\ \ | | | | | | Versioning expire function tests
| * | 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 unique
| * | | Replaced time() with uniqid() to make sure the file name is uniqueVincent Petry2014-01-217-35/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The cache isn't cleared properly because unlink() doesn't remove the cache entry which caused side-effects when reusing the same file name (which randomly happens when time() returns the same value) This fix first makes sure the unit tests don't fail any more. The unlink() case with the cache will be investigated separately.
* | | | Merge pull request #6844 from owncloud/fix-css-loading-masterJörn Friedrich Dreyer2014-01-211-1/+1
|\ \ \ \ | | | | | | | | | | Revert "use getAppWebPath() in here as well"
| * | | | Revert "use getAppWebPath() in here as well"Thomas Müller2014-01-201-1/+1
| | | | | | | | | | | | | | | | | | | | This reverts commit 6254f0a403e315461f8e20ebccf71cb91e9313a3.
* | | | | Merge pull request #6858 from ↵Thomas Müller2014-01-218-5/+35
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | owncloud/fix-setupfs-only-for-existing-users-master OC_Util::setupFS($user) will create a data dir for the given string - no...
| * | | | 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 ↵Thomas Müller2014-01-218-5/+35
| | |/ / | |/| | | | | | | | | | matter if the user really exists - OCP\JSON::checkUserExists($owner); introduces a ready to use check which will bail out with an JSON error
| | | * 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 us...
| * | | | don't use the user id within the versions preview call as it could be used ↵Thomas Müller2014-01-213-15/+14
|/ / / / | | | | | | | | | | | | to access previews of another user
* | | | 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'
| * | | | 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 workaround to compare CLOB column with CHAR value
| * | | 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
|\ \ | | | | | | Load a separate config (if present) when running unit tests
| * | 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 checkUpdate
| * | | 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 excluded
| * | | | When reading the size of "files" mountpoints need to be excludedVincent Petry2014-01-202-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The versions and trashbin app are now passing "includeMountPoints=false" to "getFileInfo()" to make sure that the calculated total size doesn't include mount points like Shared or external storage. This is because the default call (legacy) used to return the size of mount points as well. Fixes #6731
* | | | | Merge pull request #6842 from owncloud/fix-quotes-again-masterJörn Friedrich Dreyer2014-01-202-0/+1
|\ \ \ \ \ | |_|/ / / |/| | | | Quote column names on adding description
| * | | | 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 streams
| * | | | Fixed quota wrapper to not wrap failed fopen streamsVincent Petry2014-01-192-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When calling fopen() on some storage types, these return false instead of throwing an exception. This fix makes sure that in case the stream wasn't opened (for example when a file doesn't exist any more) the stream isn't wrapped. Also added 'rb' as another case that doesn't need to be wrapped. Fixes #6832
* | | | | Merge pull request #6827 from rnveach/fix_6730Morris Jobke2014-01-202-1/+4
|\ \ \ \ \ | |_|/ / / |/| | | | Fix 6730
| * | | | 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
|\ \ \ \ \ | | | | | | | | | | | | Fix internet detection to use OC_Util::getUrlContent
| * | | | | 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 log
| * | | | | Fixed isPreviewAvailable warnings in logVincent Petry2014-01-172-2/+2
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | isPreviewAvailable wasn't always set as the files formatting code is slightly different than the one from the files app. Fixes #6423
* | | | | Merge pull request #6721 from tsumi/patch-1Morris Jobke2014-01-181-0/+3
|\ \ \ \ \ | | | | | | | | | | | | Added SVG fallback to apps settings popup
| * | | | | Useless else removedtsumi2014-01-151-2/+0
| | | | | | | | | | | | | | | | | | As suggested by @PVince81 : https://github.com/owncloud/core/pull/6721#issuecomment-32289922
| * | | | | Added SVG fallback to apps settings popuptsumi2014-01-101-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | This fix issue of calendar app with IE8, see issue report for details: https://github.com/owncloud/calendar/issues/291
* | | | | | Merge pull request #6784 from owncloud/fix-activation-of-unknown-appsMorris Jobke2014-01-182-12/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix activation of unknown apps
| * | | | | | don't enable files_external testsThomas Müller2014-01-171-1/+1
| | | | | | |
| * | | | | | properly handle app activation for unit testingThomas Müller2014-01-151-12/+12
| | | | | | |
| * | | | | | error handling in case a requested app doesn't existsThomas Müller2014-01-151-0/+3
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #6818 from owncloud/add_documentation_to_appinfoMorris Jobke2014-01-185-4/+49
|\ \ \ \ \ \ | | | | | | | | | | | | | | Allow app developers to add documentation links to the appinfo