Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add isReadable, isUpdateable, isDeletable, isShareable | Robin Appelman | 2014-01-24 | 2 | -1/+65 |
| | |||||
* | undo 3rdparty change | Robin Appelman | 2014-01-20 | 1 | -0/+0 |
| | |||||
* | undo 3rdparty change | Robin Appelman | 2014-01-20 | 1 | -0/+0 |
| | |||||
* | Merge branch 'master' into fileinfo | Robin Appelman | 2014-01-17 | 33 | -85/+269 |
|\ | | | | | | | | | Conflicts: tests/lib/files/cache/cache.php | ||||
| * | Merge pull request #6812 from owncloud/tests-fixcachesyntaxforoldphp | Thomas Müller | 2014-01-17 | 1 | -2/+3 |
| |\ | | | | | | | Fix array access syntax for older PHP | ||||
| | * | Fix array access syntax for older PHP | Vincent Petry | 2014-01-17 | 1 | -2/+3 |
| | | | | | | | | | | | | There was a syntax error when running tests in PHP 5.3.10. | ||||
| * | | Merge pull request #6810 from kofemann/for-upstream | Vincent Petry | 2014-01-17 | 1 | -1/+1 |
| |\ \ | | | | | | | | | webdav: return SPACE_UNKNOWN if server do not support quota | ||||
| | * | | webdav: return SPACE_UNKNOWN if server do not support quota | Tigran Mkrtchyan | 2014-01-17 | 1 | -1/+1 |
| | |/ | | | | | | | | | | Signed-off-by: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de> | ||||
| * | | Merge pull request #6807 from owncloud/enc_updated_description | Vincent Petry | 2014-01-17 | 1 | -1/+1 |
| |\ \ | | |/ | |/| | updated description of the files encryption app | ||||
| | * | updated description of the files encryption app | Bjoern Schiessle | 2014-01-17 | 1 | -1/+1 |
| | | | |||||
| * | | Merge pull request #6264 from owncloud/files-draggabledestroy | Morris Jobke | 2014-01-16 | 1 | -1/+4 |
| |\ \ | | |/ | |/| | Fix to not destroy draggable when no draggable was set | ||||
| | * | Fix to not destroy draggable when no draggable was set | Vincent Petry | 2014-01-14 | 1 | -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/master | Björn Schießle | 2014-01-16 | 1 | -1/+1 |
| |\ \ | | | | | | | | | Fix untranslated text when deleting user | ||||
| | * | | Fix untranslated text when deleting user | Volkan Gezer | 2014-01-15 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | This should fix issue #6728 | ||||
| * | | | Merge pull request #6644 from ben-denham/unshare-all-fix | Björn Schießle | 2014-01-16 | 2 | -5/+63 |
| |\ \ \ | | | | | | | | | | | \OCP\Share::unshareAll() fix | ||||
| | * | | | updated the unit test for OCP\Share::unshareAll() to verify that shares by ↵ | ben-denham | 2014-01-10 | 1 | -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-denham | 2014-01-06 | 1 | -1/+9 |
| | | | | | | | | | | | | | | | | | | | | single owner. | ||||
| * | | | | Merge pull request #6223 from owncloud/extstorage-grantaccessasyncfix | Vincent Petry | 2014-01-15 | 3 | -19/+33 |
| |\ \ \ \ | | | | | | | | | | | | | Fixed Dropbox/Google storage async save call | ||||
| | * | | | | Fixed Dropbox/Google storage async save call | Vincent Petry | 2013-12-06 | 3 | -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_recursively | Björn Schießle | 2014-01-15 | 2 | -5/+5 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | copy files to owners trash recursively | ||||
| | * | | | | | remove old code | Bjoern Schiessle | 2014-01-15 | 1 | -3/+0 |
| | | | | | | | |||||
| | * | | | | | don't try to encrypt/decrypt cache chunks or files in the trash bin | Bjoern Schiessle | 2014-01-15 | 1 | -2/+2 |
| | | | | | | | |||||
| | * | | | | | copy files to owner trash recursively | Bjoern Schiessle | 2014-01-15 | 1 | -3/+6 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #6779 from owncloud/sharing-breadcrumb-folder-name | Jan-Christoph Borchardt | 2014-01-15 | 2 | -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 Appelman | 2014-01-15 | 2 | -1/+7 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | shared folder | ||||
| * | | | | | | Merge pull request #6774 from owncloud/versions_update_cache | icewind1991 | 2014-01-15 | 1 | -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 #6286 | Bjoern Schiessle | 2014-01-15 | 1 | -2/+4 |
| | |/ / / / / | |||||
| * | | | | | | Merge pull request #3234 from owncloud/mjob-password-strength | Thomas Müller | 2014-01-15 | 10 | -7/+72 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Indicate password strength | ||||
| | * | | | | | | Indicate password strength using strengthify | Morris Jobke | 2014-01-15 | 10 | -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_messages | Thomas Müller | 2014-01-15 | 2 | -31/+46 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | keep response message | ||||
| | * | | | | | extended test to also check the status messages | Bjoern Schiessle | 2014-01-14 | 1 | -11/+24 |
| | | | | | | | |||||
| | * | | | | | keep response message | Bjoern Schiessle | 2014-01-13 | 1 | -20/+22 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #6768 from owncloud/scanner-use-storage-mtime | Vincent Petry | 2014-01-15 | 4 | -3/+20 |
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | Use storage_mtime when determining if we can reuse cached data while scanning | ||||
| | * | | | | | update another test | Robin Appelman | 2014-01-14 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | use different value for mtime and storage_mtime in test | Robin Appelman | 2014-01-14 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | remove duplicate test class | Robin Appelman | 2014-01-14 | 2 | -23/+17 |
| | | | | | | | |||||
| | * | | | | | Use storage_mtime when determining if we can reuse cached data while scanning | Robin Appelman | 2014-01-14 | 3 | -2/+25 |
| | | | | | | | |||||
| * | | | | | | typo, grammar | Arthur Schiwon | 2014-01-14 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | LDAP: only read config from database, if configID is given. Not what we want ↵ | Arthur Schiwon | 2014-01-14 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | to do when on-the-fly-testing settings from the admin page | ||||
| * | | | | | | remove unused variables | Arthur Schiwon | 2014-01-14 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | LDAP: fix TLS detection | Arthur Schiwon | 2014-01-14 | 1 | -2/+5 |
| | | | | | | | |||||
* | | | | | | | remove more is_array from encryption | Robin Appelman | 2014-01-17 | 3 | -13/+13 |
| | | | | | | | |||||
* | | | | | | | Dont use php5.4 only features | Robin Appelman | 2014-01-17 | 1 | -2/+3 |
| | | | | | | | |||||
* | | | | | | | Don't use is_array on FileInfo | Robin Appelman | 2014-01-17 | 2 | -3/+3 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'master' into fileinfo | Robin Appelman | 2014-01-14 | 29 | -3395/+101 |
|\| | | | | | | |||||
| * | | | | | | Merge pull request #6704 from owncloud/encryptedfoldersizecalc | Vincent Petry | 2014-01-14 | 2 | -5/+62 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fix calculated folder size to use unencrypted size | ||||
| | * | | | | | | Fix calculated folder size to use unencrypted size | Vincent Petry | 2014-01-09 | 2 | -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-smbtimezonefix | Vincent Petry | 2014-01-14 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fixed timezone issue with SMB storage | ||||
| | * | | | | | | | Fixed timezone issue with SMB storage | Vincent Petry | 2014-01-14 | 1 | -1/+1 |
| | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | Now forcing smbclient to also run on UTC | ||||
| * | | | | | | | Merge pull request #6767 from owncloud/sharing_error_messages | Björn Schießle | 2014-01-14 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | it is not an urgent error... a DEBUG message is enough at this point |