Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-06-04 | 2 | -0/+6 |
| | |||||
* | Merge pull request #8729 from owncloud/add-phpseclib-master | Thomas Müller | 2014-06-03 | 31 | -31191/+0 |
|\ | | | | | use phpseclib from 3rdparty | ||||
| * | use phpseclib from 3rdparty | Thomas Müller | 2014-06-03 | 31 | -31191/+0 |
| | | | | | | | | rename class Crypt_Blowfish to Legacy_Crypt_Blowfish | ||||
* | | fix success status symbol to a circle | Morris Jobke | 2014-06-02 | 1 | -0/+5 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-31 | 2 | -0/+44 |
|/ | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-30 | 1 | -0/+19 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-29 | 1 | -0/+6 |
| | |||||
* | Adjust core apps to use "requiremin" instead of "require" | Vincent Petry | 2014-05-27 | 1 | -2/+2 |
| | | | | Also added a few missing authors. | ||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-27 | 1 | -0/+1 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-26 | 2 | -0/+37 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-25 | 1 | -0/+4 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-24 | 5 | -0/+39 |
| | |||||
* | Merge pull request #8658 from realriot/master | Thomas Müller | 2014-05-23 | 1 | -1/+1 |
|\ | | | | | Changed access mode for Dropbox to 'auto' | ||||
| * | Changed access mode for Dropbox to 'auto' | Sascha Schmidt | 2014-05-21 | 1 | -1/+1 |
| | | |||||
* | | Use default priority of 100 if backend default is not set | Robin McCorkell | 2014-05-21 | 1 | -2/+7 |
| | | |||||
* | | Add priority overriding comments | Robin McCorkell | 2014-05-21 | 1 | -0/+4 |
| | | |||||
* | | Fix priority merging logic and add unit test | Robin McCorkell | 2014-05-21 | 2 | -0/+55 |
| | | |||||
* | | Add unit tests | Robin McCorkell | 2014-05-21 | 2 | -8/+130 |
| | | |||||
* | | Use constants for priority type and add comments | Robin McCorkell | 2014-05-21 | 1 | -13/+16 |
| | | |||||
* | | Use more strict type comparisons | Robin McCorkell | 2014-05-21 | 1 | -4/+4 |
| | | |||||
* | | Preserve priority if already set | Robin McCorkell | 2014-05-21 | 1 | -0/+5 |
| | | |||||
* | | Treat 'all users' as 'global' | Robin McCorkell | 2014-05-21 | 1 | -1/+21 |
| | | | | | | | | A mount applicable to all users is as good a definition of global as can be | ||||
* | | Add storage priority support | Robin McCorkell | 2014-05-21 | 2 | -4/+60 |
|/ | | | | | | | | | | | | | | | | | | | Each storage backend has a default priority, assigned to any system mounts created in ownCloud. mount.json can be manually modified to change these priorities. The priority order is as follows: * Personal * User * Group * Global Within each mount type, the mount with the highest priority is active. The storage backend defaults were chosen to be the following: * Local - 150 * Remote storage - 100 * SMB / CIFS with OC login - 90 | ||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-20 | 1 | -2/+2 |
| | |||||
* | Remove all occurences of @brief and @returns from PHPDoc | Morris Jobke | 2014-05-19 | 1 | -1/+1 |
| | | | | * test case added to avoid adding them later | ||||
* | Merge pull request #8585 from owncloud/phpdoc-improvements-apps | Andreas Fischer | 2014-05-19 | 6 | -32/+32 |
|\ | | | | | | | | | | | | | | | | | | | | | | | PHPDoc improvements /apps * owncloud/phpdoc-improvements-apps: Fix whitespace issues Reduce double-space with single-space. Remove spaces around | operator in doc block. Fix more missing or broken PHPDoc PHPDoc fixes for user_ldap Fix PHPDoc in /apps | ||||
| * | Fix whitespace issues | Robin McCorkell | 2014-05-16 | 2 | -17/+17 |
| | | |||||
| * | Fix more missing or broken PHPDoc | Robin McCorkell | 2014-05-16 | 3 | -8/+8 |
| | | |||||
| * | Fix PHPDoc in /apps | Robin McCorkell | 2014-05-16 | 2 | -7/+7 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-19 | 1 | -0/+7 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-18 | 1 | -0/+2 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-17 | 57 | -1/+59 |
|/ | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-16 | 63 | -62/+92 |
| | |||||
* | Merge pull request #8589 from fibsifan/files_external_sftp_port | Robin McCorkell | 2014-05-15 | 1 | -4/+4 |
|\ | | | | | rename URL-fields to Host for SFTP/FTP and SMB external Storage backends | ||||
| * | changing label "URL" to "Host" | fibsifan | 2014-05-15 | 1 | -4/+4 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-15 | 2 | -0/+15 |
|/ | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-14 | 1 | -1/+53 |
| | |||||
* | Extract mount point merging logic into separate function | Robin McCorkell | 2014-05-13 | 1 | -11/+25 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-12 | 1 | -0/+1 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-10 | 3 | -0/+43 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-09 | 1 | -0/+20 |
| | |||||
* | Merge pull request #8293 from owncloud/files_external_fix_readData | Vincent Petry | 2014-05-08 | 1 | -19/+18 |
|\ | | | | | Fix issue with personal mount points and sharing | ||||
| * | Permit personal mount points to be used for sharing | Robin McCorkell | 2014-04-21 | 1 | -19/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | An issue existed where `readData` used `OCP\User::getUser()` to get the user for personal mount points, which worked in all situations apart from when a personal mount point was used for sharing, so the return from `getUser()` is not the user that owns the share. As such, any personal mount points would not work correctly when shared. `readData` and `writeData` have been changed from using a `$isPersonal` boolean to using a `$user` string|null. `$isPersonal = false` can now be written as `$user = NULL` (or left out in the case of `readData`), and `$isPersonal = true` can be written as `$user = OCP\User::getUser()`. | ||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-07 | 3 | -0/+27 |
| | | |||||
* | | Added ext storage app in autotest unit test run | Vincent Petry | 2014-05-05 | 3 | -5/+1 |
| | | | | | | | | | | | | To make sure that the dynamic mount config and config classes from external storages are tested, these are now added into the autotest.sh test run by enabling the app. | ||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-05 | 4 | -0/+22 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-04 | 2 | -0/+47 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-03 | 1 | -0/+23 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-02 | 2 | -5/+32 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-01 | 7 | -0/+88 |
| | |