summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 #6869 from ↵Thomas Müller2014-01-218-5/+35
|\ | | | | | | | | owncloud/fix-setupfs-only-for-existing-users-stable6 Fix setupfs only for existing users stable6
| * 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 Conflicts: lib/public/json.php
* | webdav: return SPACE_UNKNOWN if server do not support quotaTigran Mkrtchyan2014-01-211-1/+1
| | | | | | | | Backport of a78dc117327a3109805d2a4cbfe28b9a5ca49a81 to stable6
* | Replaced time() with uniqid() to make sure the file name is uniqueVincent Petry2014-01-217-31/+31
| | | | | | | | | | | | | | | | | | | | | | 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. Backport of f09c19c to stable6
* | Merge pull request #6867 from owncloud/protect-versions-preview-stable6Björn Schießle2014-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 #6456 from owncloud/fix_home_storage_quota_stable6Thomas Müller2014-01-211-0/+10
|\ \ | |/ |/| Fix home storage quota stable6
| * add getOwner impementation to Home StorageJörn Friedrich Dreyer2014-01-211-0/+10
| |
* | Merge pull request #6865 from owncloud/fix_user_ldap_sql_on_oracle_stable6Thomas Müller2014-01-211-4/+11
|\ \ | |/ |/| user workarount to compare CLOB column with CHAR value
| * user workarount to compare CLOB column with CHAR valueJörn Friedrich Dreyer2014-01-211-4/+11
|/
* Merge pull request #6862 from owncloud/neutral_download_zip_default_name_stable6Thomas 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
|/
* 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 Backport of ca57a84 to stable6
* Fixed quota wrapper to not wrap failed fopen streamsVincent Petry2014-01-202-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
* added trigger to redo selection text on a directory changernveach2014-01-201-0/+2
|
* fixed selector string and removed all checkbox if it was selectedrnveach2014-01-201-1/+2
|
* Merge pull request #6828 from owncloud/dont_add_queuedtasks_during_upgradeThomas Müller2014-01-181-2/+4
|\ | | | | add needUpgrade() check to addQueuedTask()
| * add needUpgrade() check to addQueuedTask()Jörn Friedrich Dreyer2014-01-171-2/+4
|/
* Fix array access syntax for older PHPVincent Petry2014-01-171-2/+3
| | | | There was a syntax error when running tests in PHP 5.3.10.
* updated description of the files encryption appBjoern Schiessle2014-01-171-1/+1
|
* Fix to not destroy draggable when no draggable was setVincent Petry2014-01-161-1/+4
| | | | | | | | | | When a dir has no delete permission, the draggable isn't initialized on files. This fix makes sure we don't try to destroy a draggable when it wasn't inited in the first place. Fixes #6254 Backport of 8135828 to stable6
* 6.0.1 RC1v6.0.1RC1Frank Karlitschek2014-01-161-2/+2
|
* Fix untranslated text when deleting userVolkan Gezer2014-01-161-1/+1
| | | | This should fix issue #6728
* updated the unit test for OCP\Share::unshareAll() to verify that shares by ↵ben-denham2014-01-161-4/+54
| | | | all users are removed for an item.
* Unshare all will now delete all shares for the item, instead of only for a ↵ben-denham2014-01-161-1/+9
| | | | single owner.
* Merge pull request #6783 from owncloud/backport-6530-stable6Thomas Müller2014-01-151-1/+1
|\ | | | | Backport 6530 stable6
| * in order to work properly with encryption ocTransferId is added to the file ↵Thomas Müller2014-01-151-1/+1
| | | | | | | | path - questionable usage of magic string
| * Adding a random postfix to the part file.Thomas Müller2014-01-151-1/+1
| |
* | Fixed Dropbox/Google storage async save callVincent Petry2014-01-153-19/+33
|/ | | | | | | | | | | | | When clicking "Grant access", the settings for Dropbox/Google were saved through a call that gets cancelled when redirecting to the grant page (for example in Firefox) This fix makes sure the "save settings" call finished before redirecting to the grant page. Fixes #6176 Backport of e13be94 to stable6
* extended test to also check the status messagesBjoern Schiessle2014-01-151-11/+24
|
* keep response messageBjoern Schiessle2014-01-151-20/+22
|
* call getFileInfo to enforce a file cache entry for the new version, fix #6286Bjoern Schiessle2014-01-151-2/+4
|
* remove old codeBjoern Schiessle2014-01-151-3/+0
|
* don't try to encrypt/decrypt cache chunks or files in the trash binBjoern Schiessle2014-01-151-2/+2
|
* copy files to owner trash recursivelyBjoern Schiessle2014-01-151-3/+6
|
* Merge pull request #6293 from owncloud/stable6-legacy-settings-popupMorris Jobke2014-01-151-3/+11
|\ | | | | Stable6 legacy settings popup
| * fix shadow size and arrow positionJan-Christoph Borchardt2013-12-101-2/+2
| |
| * fix the legacy popup to make calendar settings look nicerJan-Christoph Borchardt2013-12-101-2/+10
| |
* | Use storage_mtime when determining if we can reuse cached data while scanningRobin Appelman2014-01-154-3/+20
| | | | | | | | | | | | | | | | Backport to stable6 of the following commits, in order: - 203d5d0 - 4113042 - 7e4c80f - 16b898d
* | Fix calculated folder size to use unencrypted sizeVincent Petry2014-01-142-5/+62
| | | | | | | | | | | | | | | | The encrypted size was used when calculating folder sizes. This fix now also sums up the unencrypted size and shows that one when available. Backport of 4faba49 to stable6
* | Merge pull request #6612 from owncloud/user-no-change-displayname-stableicewind19912014-01-147-91/+156
|\ \ | | | | | | Backport: Re-add the config options to remove the ability for users to change their displayname
| * | Pass config object in testGetHomeNotSupportedRobin Appelman2014-01-021-1/+4
| | |
| * | Replace static usage of OC_Config and OC_Preferences with the injected ↵Robin Appelman2014-01-021-5/+13
| | | | | | | | | | | | \OC\ConfigAll
| * | fix the config option to remove the ability for users to set their displaynameRobin Appelman2014-01-023-9/+37
| | |
| * | fix fallback overwriting result of getHomeRobin Appelman2014-01-021-1/+2
| | |
| * | cache the home folder of a UserRobin Appelman2014-01-022-67/+73
| | |
| * | Also add default to the \OCP\IConfig interfaceRobin Appelman2014-01-022-5/+18
| | |