summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | |
| * | add default parameter for AllConfig->get*Value()Robin Appelman2014-01-021-6/+12
| | |
* | | it is not an urgent error... a DEBUG message is enough at this pointBjoern Schiessle2014-01-141-1/+1
| | |
* | | Fixed timezone issue with SMB storageVincent Petry2014-01-141-1/+1
| | | | | | | | | | | | | | | | | | Now forcing smbclient to also run on UTC Backport of 1eb5ebd to stable6
* | | Merge pull request #6408 from owncloud/ldap_fix_tls_detectionThomas Müller2014-01-142-5/+9
|\ \ \ | | | | | | | | LDAP fix TLS detection
| * | | typo, grammarArthur Schiwon2014-01-081-1/+1
| | | |
| * | | LDAP: only read config from database, if configID is given. Not what we want ↵Arthur Schiwon2013-12-131-1/+2
| | | | | | | | | | | | | | | | to do when on-the-fly-testing settings from the admin page
| * | | remove unused variablesArthur Schiwon2013-12-131-2/+2
| | | |
| * | | LDAP: fix TLS detectionArthur Schiwon2013-12-131-2/+5
| | | |
* | | | Merge pull request #6756 from owncloud/remove-ru_RU-stable6Andreas Fischer2014-01-1419-3336/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove ru_RU - it's almost untranslated * owncloud/remove-ru_RU-stable6: remove ru_RU - it's almost untranslated
| * | | | remove ru_RU - it's almost untranslatedThomas Müller2014-01-1319-3336/+0
| | | | |
* | | | | Merge pull request #6753 from owncloud/no_unshare_on_deleteBjörn Schießle2014-01-131-8/+0
|\ \ \ \ \ | |/ / / / |/| | | | don't unshare on delete
| * | | | don't unshare on deleteBjoern Schiessle2014-01-131-8/+0
| | | | |
* | | | | Fixing Issue #6301 on master branchCarlos Cerrillo2014-01-132-16/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Only set SSL things when ```$this->secure``` is ```true``` Fix ```createCertificateBundle``` and ```getCertificates``` methods from ```OC_Mount_config``` to use ```OC_User::getHome``` to get the path Backport of 7c264c88fe06c61ef602fa8a241428c99f220061, b245e2e3d86299092448e3223b0d658d88206873 and c06844c374c145b2f05ae0800678f68acc9ae2e3 to stable6 (squashed)
* | | | | fixing typo in redirection query stringst3so2014-01-131-1/+1
|/ / / / | | | | | | | | | | | | Backport of a2cae551f30a0166439af9d467134d4bd802e940 to stable6
* | | | Fixed various file name escaping issues in core appsVincent Petry2014-01-129-50/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Refactored file tr lookup into FileList.findFileEl that uses filterAttr to avoid escaping issues in jQuery selectors - Fixed versions and sharing app to properly escape file names in attributes Backport to stable6 of 1042733
* | | | fix preview for reshared fileGeorg Ehrke2014-01-111-1/+3
| | | |
* | | | Prevent deleting storage rootVincent Petry2014-01-102-0/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Storage mount points are not deletable, so make sure that the unlink operation and its hooks aren't run in such cases. Note that some storages might recursively delete their contents when calling unlink on their root. This fix prevents that as well. Backport of f642ad3 to stable6
* | | | Infowarning about 32bitArthur Schiwon2014-01-091-0/+1
| | | |
* | | | add tests for user countingArthur Schiwon2014-01-092-0/+81
| | | |
* | | | if backends have the same class name, sum their users up instead of overwritingArthur Schiwon2014-01-091-1/+5
| | | |
* | | | LDAP: add tests for countUsersArthur Schiwon2014-01-091-0/+54
| | | |
* | | | remove unnecessary lineArthur Schiwon2014-01-091-1/+0
| | | |
* | | | LDAP: implement userCount action. This required to (finally) clean up and ↵Arthur Schiwon2014-01-093-28/+148
| | | | | | | | | | | | | | | | refactor the search method, which will have a positive performance impact on paged search.
* | | | Add command line tool to show numbers of users and user directoriesArthur Schiwon2014-01-092-0/+62
| | | |