summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* updated description of the files encryption appBjoern Schiessle2014-01-171-1/+1
|
* 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
| | | | | |
* | | | | | 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
| * | | | | | it is not an urgent error... a DEBUG message is enough at this pointBjoern Schiessle2014-01-141-1/+1
| | | | | | |
* | | | | | | Merge pull request #6752 from owncloud/silence-test-listenerThomas Müller2014-01-131-3/+3
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | no warnings within unlinkDir() within the TestCleanupListener
| * | | | | | no warnings within unlinkDir() within the TestCleanupListenerThomas Müller2014-01-131-3/+3
| | | | | | |
* | | | | | | Merge pull request #6755 from owncloud/remove-ru_RU-masterAndreas Fischer2014-01-1419-3359/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove ru_RU - it has bee removed from transifex * owncloud/remove-ru_RU-master: remove ru_RU - it has bee removed from transifex
| * | | | | | | remove ru_RU - it has bee removed from transifexThomas Müller2014-01-1319-3359/+0
| | | | | | | |
* | | | | | | | don't unshare on deleteBjoern Schiessle2014-01-131-8/+0
|/ / / / / / /
* | | | | | | Merge pull request #6422 from ↵Vincent Petry2014-01-132-16/+32
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ccerrillo/fixing-6301-external-mount-webdav-blank-files Fixing Issue #6301 on master branch
| * | | | | | | Fix ```createCertificateBundle``` and ```getCertificates``` methodsCarlos Cerrillo2013-12-171-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from ```OC_Mount_config``` to use ```OC_User::getHome``` to get the path
| * | | | | | | Fixing tab/space coding styleCarlos Cerrillo2013-12-171-17/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only set SSL things when ```$this->secure``` is ```true```
| * | | | | | | Fixing Issue #6301 on master branchCarlos Cerrillo2013-12-151-6/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added private var $certPath to store the user root cert Move logic to determine the $certPath path to the constructor and modify to get the path from OC_User::getHome() Add curl options to use the certificate to avoid certificate errors with self-signed certicates in the downdload/upload method so we don't get blank files
* | | | | | | | Merge pull request #6734 from st3so/redirectfixFrank Karlitschek2014-01-131-1/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | fixing typo in redirection query string
| * | | | | | | fixing typo in redirection query stringst3so2014-01-121-1/+1
| | | | | | | |
* | | | | | | | Merge pull request #6694 from owncloud/fix-email-template-l10nThomas Müller2014-01-131-1/+1
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | fix email template l10n, emphasize filename
| * | | | | | | fix email template l10n, emphasize filenameJan-Christoph Borchardt2014-01-091-1/+1
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #6713 from owncloud/files-filenameescapingfixesLukas Reschke2014-01-129-50/+75
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Fixed various file name escaping issues in core apps
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-03 15:30:50 +0000