summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* remove ru_RU - it has bee removed from transifexThomas Müller2014-01-135-53/+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
* | Fixed various file name escaping issues in core appsVincent Petry2014-01-108-47/+68
| | | | | | | | | | | | | | - 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
* | Merge pull request #6687 from owncloud/sharing-fixpartfilehandlingVincent Petry2014-01-091-21/+12
|\ \ | | | | | | Removed special handling of part files in shared storage rename
| * | Removed special handling of part files in shared storage renameVincent Petry2014-01-081-21/+12
| | | | | | | | | | | | | | | | | | This fixes the issue introduced by the transfer id which itself wasn't taken into account by the shortcut code for part file in the shared storage class.
* | | Merge pull request #6681 from owncloud/userreportblizzz2014-01-084-28/+201
|\ \ \ | |/ / |/| | add command line option to get user number statistics
| * | LDAP: add tests for countUsersArthur Schiwon2014-01-081-0/+54
| | |
| * | remove unnecessary lineArthur Schiwon2014-01-081-1/+0
| | |
| * | LDAP: implement userCount action. This required to (finally) clean up and ↵Arthur Schiwon2014-01-083-28/+148
| | | | | | | | | | | | refactor the search method, which will have a positive performance impact on paged search.
* | | Merge pull request #5238 from owncloud/externalstorage-owncloudbackendThomas Müller2014-01-086-9/+109
|\ \ \ | | | | | | | | Added ownCloud backend for external storage
| * | | Added ownCloud backend for external storageVincent Petry2013-10-096-9/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To make it possible to use the short ownCloud URL (without specifying webdav.php or remote.php), a new backend is available for ownCloud. The user must specify the host + context path in the "Url" field (which is mapped to the "host" parameter) and the subdir to mount in the "Root" field. This is to prevent confusion because some users forget to append webdav.php or remote.php to the WebDAV URL. Fixes #4923
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-01-082-4/+48
| | | |
* | | | Merge pull request #6290 from owncloud/files-androidcontentdispositionThomas Müller2014-01-073-63/+2
|\ \ \ \ | | | | | | | | | | Files androidcontentdisposition
| * | | | Moved content disposition code+workarounds to OCP\ResponseVincent Petry2013-12-103-63/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added new OC\Response API called setContentDispositionHeader() that contains the needed workarounds for UTF8 and IE. Refactored download code to use the new API. Removed unused trashbin download file.
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-01-076-8/+23
| |_|/ / |/| | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-01-064-4/+5
| | | |
* | | | Merge pull request #6580 from monreal/masterThomas Müller2014-01-051-1/+1
|\ \ \ \ | | | | | | | | | | Silence output of 'which' command used in smbclient detection
| * | | | Silence output of 'which' command used in smbclient detectionMichael Monreal2013-12-271-1/+1
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-01-055-4/+18
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-01-043-1/+5
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-01-029-8/+317
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-311-0/+1
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-302-0/+13
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-296-38/+156
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-283-2/+57
|/ / / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-272-19/+26
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-251-1/+1
| | | |
* | | | Merge pull request #6554 from owncloud/fix_5982Thomas Müller2013-12-241-1/+3
|\ \ \ \ | | | | | | | | | | fix preview for reshared file
| * | | | fix preview for reshared fileGeorg Ehrke2013-12-221-1/+3
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-246-23/+29
|/ / / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-226-1/+37
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-212-0/+4
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-208-0/+16
| | | |
* | | | Merge pull request #6507 from owncloud/enc_fix_getUserBjörn Schießle2013-12-193-1/+44
|\ \ \ \ | | | | | | | | | | [encryption] fix getUser Helper
| * | | | tests addedBjoern Schiessle2013-12-193-1/+44
| | | | |
| * | | | we can also have a path user/cache/...Bjoern Schiessle2013-12-191-1/+1
| | | | |
* | | | | Merge pull request #6517 from owncloud/fix_6510Björn Schießle2013-12-192-19/+45
|\ \ \ \ \ | | | | | | | | | | | | [encryption] fix rename of shared files
| * | | | | check if the old owner and the old path is availableBjoern Schiessle2013-12-191-3/+10
| | | | | |
| * | | | | fix rename of shared filesBjoern Schiessle2013-12-192-19/+38
| |/ / / /
* | | | | Merge pull request #6512 from owncloud/master-failingoracletestsVincent Petry2013-12-192-31/+19
|\ \ \ \ \ | | | | | | | | | | | | Removed numRows usage from encryption app
| * | | | | Removed numRows usage from encryption appVincent Petry2013-12-192-31/+19
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | numRows on Oracle always seem to return 0. This fix removes numRows usage from the encryption and sharing app. This fixes unit tests and potentially the encryption app itself (migration status) when running on Oracle
* | | | | Merge pull request #6495 from owncloud/enc_fseek_fallbackBjörn Schießle2013-12-195-10/+159
|\ \ \ \ \ | |/ / / / |/| | | | Added fseek fallback to the encryption app
| * | | | add test for the stream wrapper to read encrypted files from the system ↵Bjoern Schiessle2013-12-181-0/+39
| | | | | | | | | | | | | | | | | | | | folder /tmp
| * | | | test for isEncryptedPath()Bjoern Schiessle2013-12-181-0/+35
| | | | |
| * | | | extend the encryption stream wrapper to handle local files and add a fall ↵Bjoern Schiessle2013-12-183-8/+60
| | | | | | | | | | | | | | | | | | | | back for file size calculation if the storage doesn't support fseek
| * | | | implement ftell stream wrapper and fix return value from fseek stream wrapperBjoern Schiessle2013-12-181-1/+12
| | | | |
| * | | | fall back to getLocalFile if storage doesn't support fseekBjoern Schiessle2013-12-171-2/+14
| | | | |