Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | remove ru_RU - it has bee removed from transifex | Thomas Müller | 2014-01-13 | 5 | -53/+0 |
| | |||||
* | Merge pull request #6422 from ↵ | Vincent Petry | 2014-01-13 | 2 | -16/+32 |
|\ | | | | | | | | | ccerrillo/fixing-6301-external-mount-webdav-blank-files Fixing Issue #6301 on master branch | ||||
| * | Fix ```createCertificateBundle``` and ```getCertificates``` methods | Carlos Cerrillo | 2013-12-17 | 1 | -4/+2 |
| | | | | | | | | | | from ```OC_Mount_config``` to use ```OC_User::getHome``` to get the path | ||||
| * | Fixing tab/space coding style | Carlos Cerrillo | 2013-12-17 | 1 | -17/+21 |
| | | | | | | | | Only set SSL things when ```$this->secure``` is ```true``` | ||||
| * | Fixing Issue #6301 on master branch | Carlos Cerrillo | 2013-12-15 | 1 | -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 apps | Vincent Petry | 2014-01-10 | 8 | -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-fixpartfilehandling | Vincent Petry | 2014-01-09 | 1 | -21/+12 |
|\ \ | | | | | | | Removed special handling of part files in shared storage rename | ||||
| * | | Removed special handling of part files in shared storage rename | Vincent Petry | 2014-01-08 | 1 | -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/userreport | blizzz | 2014-01-08 | 4 | -28/+201 |
|\ \ \ | |/ / |/| | | add command line option to get user number statistics | ||||
| * | | LDAP: add tests for countUsers | Arthur Schiwon | 2014-01-08 | 1 | -0/+54 |
| | | | |||||
| * | | remove unnecessary line | Arthur Schiwon | 2014-01-08 | 1 | -1/+0 |
| | | | |||||
| * | | LDAP: implement userCount action. This required to (finally) clean up and ↵ | Arthur Schiwon | 2014-01-08 | 3 | -28/+148 |
| | | | | | | | | | | | | refactor the search method, which will have a positive performance impact on paged search. | ||||
* | | | Merge pull request #5238 from owncloud/externalstorage-owncloudbackend | Thomas Müller | 2014-01-08 | 6 | -9/+109 |
|\ \ \ | | | | | | | | | Added ownCloud backend for external storage | ||||
| * | | | Added ownCloud backend for external storage | Vincent Petry | 2013-10-09 | 6 | -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 transifex | Jenkins for ownCloud | 2014-01-08 | 2 | -4/+48 |
| | | | | |||||
* | | | | Merge pull request #6290 from owncloud/files-androidcontentdisposition | Thomas Müller | 2014-01-07 | 3 | -63/+2 |
|\ \ \ \ | | | | | | | | | | | Files androidcontentdisposition | ||||
| * | | | | Moved content disposition code+workarounds to OCP\Response | Vincent Petry | 2013-12-10 | 3 | -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 transifex | Jenkins for ownCloud | 2014-01-07 | 6 | -8/+23 |
| |_|/ / |/| | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-01-06 | 4 | -4/+5 |
| | | | | |||||
* | | | | Merge pull request #6580 from monreal/master | Thomas Müller | 2014-01-05 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Silence output of 'which' command used in smbclient detection | ||||
| * | | | | Silence output of 'which' command used in smbclient detection | Michael Monreal | 2013-12-27 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-01-05 | 5 | -4/+18 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-01-04 | 3 | -1/+5 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-01-02 | 9 | -8/+317 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-12-31 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-12-30 | 2 | -0/+13 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-12-29 | 6 | -38/+156 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-12-28 | 3 | -2/+57 |
|/ / / / | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-12-27 | 2 | -19/+26 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-12-25 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #6554 from owncloud/fix_5982 | Thomas Müller | 2013-12-24 | 1 | -1/+3 |
|\ \ \ \ | | | | | | | | | | | fix preview for reshared file | ||||
| * | | | | fix preview for reshared file | Georg Ehrke | 2013-12-22 | 1 | -1/+3 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-12-24 | 6 | -23/+29 |
|/ / / / | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-12-22 | 6 | -1/+37 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-12-21 | 2 | -0/+4 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-12-20 | 8 | -0/+16 |
| | | | | |||||
* | | | | Merge pull request #6507 from owncloud/enc_fix_getUser | Björn Schießle | 2013-12-19 | 3 | -1/+44 |
|\ \ \ \ | | | | | | | | | | | [encryption] fix getUser Helper | ||||
| * | | | | tests added | Bjoern Schiessle | 2013-12-19 | 3 | -1/+44 |
| | | | | | |||||
| * | | | | we can also have a path user/cache/... | Bjoern Schiessle | 2013-12-19 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #6517 from owncloud/fix_6510 | Björn Schießle | 2013-12-19 | 2 | -19/+45 |
|\ \ \ \ \ | | | | | | | | | | | | | [encryption] fix rename of shared files | ||||
| * | | | | | check if the old owner and the old path is available | Bjoern Schiessle | 2013-12-19 | 1 | -3/+10 |
| | | | | | | |||||
| * | | | | | fix rename of shared files | Bjoern Schiessle | 2013-12-19 | 2 | -19/+38 |
| |/ / / / | |||||
* | | | | | Merge pull request #6512 from owncloud/master-failingoracletests | Vincent Petry | 2013-12-19 | 2 | -31/+19 |
|\ \ \ \ \ | | | | | | | | | | | | | Removed numRows usage from encryption app | ||||
| * | | | | | Removed numRows usage from encryption app | Vincent Petry | 2013-12-19 | 2 | -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_fallback | Björn Schießle | 2013-12-19 | 5 | -10/+159 |
|\ \ \ \ \ | |/ / / / |/| | | | | Added fseek fallback to the encryption app | ||||
| * | | | | add test for the stream wrapper to read encrypted files from the system ↵ | Bjoern Schiessle | 2013-12-18 | 1 | -0/+39 |
| | | | | | | | | | | | | | | | | | | | | folder /tmp | ||||
| * | | | | test for isEncryptedPath() | Bjoern Schiessle | 2013-12-18 | 1 | -0/+35 |
| | | | | | |||||
| * | | | | extend the encryption stream wrapper to handle local files and add a fall ↵ | Bjoern Schiessle | 2013-12-18 | 3 | -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 wrapper | Bjoern Schiessle | 2013-12-18 | 1 | -1/+12 |
| | | | | | |||||
| * | | | | fall back to getLocalFile if storage doesn't support fseek | Bjoern Schiessle | 2013-12-17 | 1 | -2/+14 |
| | | | | |