Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Load a separate config (if present) when running unit tests | Robin Appelman | 2014-01-17 | 4 | -5/+14 |
* | 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 | Vincent Petry | 2014-01-14 | 1 | -1/+4 |
* | | Merge pull request #6786 from wakeup/master | Björn Schießle | 2014-01-16 | 1 | -1/+1 |
|\ \ | |||||
| * | | Fix untranslated text when deleting user | Volkan Gezer | 2014-01-15 | 1 | -1/+1 |
* | | | Merge pull request #6644 from ben-denham/unshare-all-fix | Björn Schießle | 2014-01-16 | 2 | -5/+63 |
|\ \ \ | |||||
| * | | | updated the unit test for OCP\Share::unshareAll() to verify that shares by al... | ben-denham | 2014-01-10 | 1 | -4/+54 |
| * | | | Unshare all will now delete all shares for the item, instead of only for a si... | ben-denham | 2014-01-06 | 1 | -1/+9 |
* | | | | Merge pull request #6223 from owncloud/extstorage-grantaccessasyncfix | Vincent Petry | 2014-01-15 | 3 | -19/+33 |
|\ \ \ \ | |||||
| * | | | | Fixed Dropbox/Google storage async save call | Vincent Petry | 2013-12-06 | 3 | -19/+33 |
* | | | | | Merge pull request #6780 from owncloud/trash_bin_copy_recursively | Björn Schießle | 2014-01-15 | 2 | -5/+5 |
|\ \ \ \ \ | |||||
| * | | | | | 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 ... | Robin Appelman | 2014-01-15 | 2 | -1/+7 |
|/ / / / / / | |||||
* | | | | | | 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, 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 using strengthify | Morris Jobke | 2014-01-15 | 10 | -7/+72 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #6744 from owncloud/fix_ocs_response_messages | Thomas Müller | 2014-01-15 | 2 | -31/+46 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | 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 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | 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 |
* | | | | | | remove unused variables | Arthur Schiwon | 2014-01-14 | 1 | -2/+2 |
* | | | | | | LDAP: fix TLS detection | Arthur Schiwon | 2014-01-14 | 1 | -2/+5 |
* | | | | | | Merge pull request #6704 from owncloud/encryptedfoldersizecalc | Vincent Petry | 2014-01-14 | 2 | -5/+62 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix calculated folder size to use unencrypted size | Vincent Petry | 2014-01-09 | 2 | -5/+62 |
* | | | | | | | Merge pull request #6759 from owncloud/extstorage-smbtimezonefix | Vincent Petry | 2014-01-14 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fixed timezone issue with SMB storage | Vincent Petry | 2014-01-14 | 1 | -1/+1 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | 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 | Bjoern Schiessle | 2014-01-14 | 1 | -1/+1 |
* | | | | | | | Merge pull request #6752 from owncloud/silence-test-listener | Thomas Müller | 2014-01-13 | 1 | -3/+3 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | no warnings within unlinkDir() within the TestCleanupListener | Thomas Müller | 2014-01-13 | 1 | -3/+3 |
* | | | | | | | Merge pull request #6755 from owncloud/remove-ru_RU-master | Andreas Fischer | 2014-01-14 | 19 | -3359/+0 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | remove ru_RU - it has bee removed from transifex | Thomas Müller | 2014-01-13 | 19 | -3359/+0 |
* | | | | | | | | don't unshare on delete | Bjoern Schiessle | 2014-01-13 | 1 | -8/+0 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #6422 from ccerrillo/fixing-6301-external-mount-webdav-bla... | Vincent Petry | 2014-01-13 | 2 | -16/+32 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix ```createCertificateBundle``` and ```getCertificates``` methods | Carlos Cerrillo | 2013-12-17 | 1 | -4/+2 |
| * | | | | | | | Fixing tab/space coding style | Carlos Cerrillo | 2013-12-17 | 1 | -17/+21 |
| * | | | | | | | Fixing Issue #6301 on master branch | Carlos Cerrillo | 2013-12-15 | 1 | -6/+20 |
* | | | | | | | | Merge pull request #6734 from st3so/redirectfix | Frank Karlitschek | 2014-01-13 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | fixing typo in redirection query string | st3so | 2014-01-12 | 1 | -1/+1 |
* | | | | | | | | Merge pull request #6694 from owncloud/fix-email-template-l10n | Thomas Müller | 2014-01-13 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | |