summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add isReadable, isUpdateable, isDeletable, isShareableRobin Appelman2014-01-242-1/+65
|
* undo 3rdparty changeRobin Appelman2014-01-201-0/+0
|
* undo 3rdparty changeRobin Appelman2014-01-201-0/+0
|
* Merge branch 'master' into fileinfoRobin Appelman2014-01-1733-85/+269
|\ | | | | | | | | Conflicts: tests/lib/files/cache/cache.php
| * Merge pull request #6812 from owncloud/tests-fixcachesyntaxforoldphpThomas Müller2014-01-171-2/+3
| |\ | | | | | | Fix array access syntax for older PHP
| | * 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.
| * | Merge pull request #6810 from kofemann/for-upstreamVincent Petry2014-01-171-1/+1
| |\ \ | | | | | | | | webdav: return SPACE_UNKNOWN if server do not support quota
| | * | webdav: return SPACE_UNKNOWN if server do not support quotaTigran Mkrtchyan2014-01-171-1/+1
| | |/ | | | | | | | | | Signed-off-by: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de>
| * | Merge pull request #6807 from owncloud/enc_updated_descriptionVincent Petry2014-01-171-1/+1
| |\ \ | | |/ | |/| updated description of the files encryption app
| | * updated description of the files encryption appBjoern Schiessle2014-01-171-1/+1
| | |
| * | Merge pull request #6264 from owncloud/files-draggabledestroyMorris Jobke2014-01-161-1/+4
| |\ \ | | |/ | |/| Fix to not destroy draggable when no draggable was set
| | * Fix to not destroy draggable when no draggable was setVincent Petry2014-01-141-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
| * | Merge pull request #6786 from wakeup/masterBjörn Schießle2014-01-161-1/+1
| |\ \ | | | | | | | | Fix untranslated text when deleting user
| | * | Fix untranslated text when deleting userVolkan Gezer2014-01-151-1/+1
| | | | | | | | | | | | | | | | This should fix issue #6728
| * | | Merge pull request #6644 from ben-denham/unshare-all-fixBjörn Schießle2014-01-162-5/+63
| |\ \ \ | | | | | | | | | | \OCP\Share::unshareAll() fix
| | * | | updated the unit test for OCP\Share::unshareAll() to verify that shares by ↵ben-denham2014-01-101-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-061-1/+9
| | | | | | | | | | | | | | | | | | | | single owner.
| * | | | Merge pull request #6223 from owncloud/extstorage-grantaccessasyncfixVincent Petry2014-01-153-19/+33
| |\ \ \ \ | | | | | | | | | | | | Fixed Dropbox/Google storage async save call
| | * | | | Fixed Dropbox/Google storage async save callVincent Petry2013-12-063-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
| * | | | | Merge pull request #6780 from owncloud/trash_bin_copy_recursivelyBjörn Schießle2014-01-152-5/+5
| |\ \ \ \ \ | | | | | | | | | | | | | | copy files to owners trash recursively
| | * | | | | 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 #6779 from owncloud/sharing-breadcrumb-folder-nameJan-Christoph Borchardt2014-01-152-1/+7
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Show the name of the shared folder in the breadcrumb when viewing a publicly shared folder
| | * | | | | | Show the name of the shared folder in the breadcrumb when viewing a publicly ↵Robin Appelman2014-01-152-1/+7
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | shared folder
| * | | | | | Merge pull request #6774 from owncloud/versions_update_cacheicewind19912014-01-151-2/+4
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | call getFileInfo to enforce a file cache entry for the new version
| | * | | | | | call getFileInfo to enforce a file cache entry for the new version, fix #6286Bjoern Schiessle2014-01-151-2/+4
| | |/ / / / /
| * | | | | | Merge pull request #3234 from owncloud/mjob-password-strengthThomas Müller2014-01-1510-7/+72
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Indicate password strength
| | * | | | | | Indicate password strength using strengthifyMorris Jobke2014-01-1510-7/+72
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * uses zxcvbn * outsourced to separate jquery plugin * async loading * hide strength meter if input is empty * feedback if user enters weakest password * fade in and out * show tipsy with strength * Opera 12, IE8-10, FF 23, Chromium 29
| * | | | | | Merge pull request #6744 from owncloud/fix_ocs_response_messagesThomas Müller2014-01-152-31/+46
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | keep response message
| | * | | | | extended test to also check the status messagesBjoern Schiessle2014-01-141-11/+24
| | | | | | |
| | * | | | | keep response messageBjoern Schiessle2014-01-131-20/+22
| | | | | | |
| * | | | | | Merge pull request #6768 from owncloud/scanner-use-storage-mtimeVincent Petry2014-01-154-3/+20
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | Use storage_mtime when determining if we can reuse cached data while scanning
| | * | | | | update another testRobin Appelman2014-01-141-1/+1
| | | | | | |
| | * | | | | use different value for mtime and storage_mtime in testRobin Appelman2014-01-141-1/+1
| | | | | | |
| | * | | | | remove duplicate test classRobin Appelman2014-01-142-23/+17
| | | | | | |
| | * | | | | Use storage_mtime when determining if we can reuse cached data while scanningRobin Appelman2014-01-143-2/+25
| | | | | | |
| * | | | | | typo, grammarArthur Schiwon2014-01-141-1/+1
| | | | | | |
| * | | | | | LDAP: only read config from database, if configID is given. Not what we want ↵Arthur Schiwon2014-01-141-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | to do when on-the-fly-testing settings from the admin page
| * | | | | | remove unused variablesArthur Schiwon2014-01-141-2/+2
| | | | | | |
| * | | | | | LDAP: fix TLS detectionArthur Schiwon2014-01-141-2/+5
| | | | | | |
* | | | | | | remove more is_array from encryptionRobin Appelman2014-01-173-13/+13
| | | | | | |
* | | | | | | Dont use php5.4 only featuresRobin Appelman2014-01-171-2/+3
| | | | | | |
* | | | | | | Don't use is_array on FileInfoRobin Appelman2014-01-172-3/+3
| | | | | | |
* | | | | | | Merge branch 'master' into fileinfoRobin Appelman2014-01-1429-3395/+101
|\| | | | | |
| * | | | | | Merge pull request #6704 from owncloud/encryptedfoldersizecalcVincent Petry2014-01-142-5/+62
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix calculated folder size to use unencrypted size
| | * | | | | | Fix calculated folder size to use unencrypted sizeVincent Petry2014-01-092-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.
| * | | | | | | Merge pull request #6759 from owncloud/extstorage-smbtimezonefixVincent Petry2014-01-141-1/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fixed timezone issue with SMB storage
| | * | | | | | | Fixed timezone issue with SMB storageVincent Petry2014-01-141-1/+1
| | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | Now forcing smbclient to also run on UTC
| * | | | | | | Merge pull request #6767 from owncloud/sharing_error_messagesBjörn Schießle2014-01-141-1/+1
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | it is not an urgent error... a DEBUG message is enough at this point