Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Merge pull request #9093 from owncloud/remove_unused_code | Morris Jobke | 2014-06-19 | 5 | -11/+6 | |
|\ | ||||||
| * | remove unused code | Bjoern Schiessle | 2014-06-18 | 5 | -11/+6 | |
* | | Merge pull request #9068 from owncloud/trashbin_unittests_master | Björn Schießle | 2014-06-18 | 1 | -1/+1 | |
|\ \ | |/ |/| | ||||||
| * | adjust encryption tests to the trash bin changes | Bjoern Schiessle | 2014-06-18 | 1 | -1/+1 | |
* | | fix rename of encryption keys | Bjoern Schiessle | 2014-06-18 | 2 | -8/+9 | |
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-06-18 | 2 | -0/+2 | |
* | | Merge pull request #8399 from owncloud/server-server-sharing | icewind1991 | 2014-06-17 | 3 | -5/+41 | |
|\ \ | ||||||
| * | | Fix moving movablemount over webdav | Robin Appelman | 2014-06-17 | 1 | -1/+2 | |
| * | | Fix checking for external share in encryption | Robin Appelman | 2014-06-14 | 1 | -1/+4 | |
| * | | if file doesn't exist, check parent folder | Bjoern Schiessle | 2014-06-14 | 1 | -0/+6 | |
| * | | exclude mounted server-to-server shares from encryption | Bjoern Schiessle | 2014-06-14 | 1 | -4/+28 | |
| * | | make sure to enable incognito mode when mounting a public link and update ini... | Bjoern Schiessle | 2014-06-14 | 1 | -0/+2 | |
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-06-17 | 2 | -0/+2 | |
| |/ |/| | ||||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-06-16 | 4 | -1/+4 | |
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-06-15 | 7 | -0/+7 | |
|/ | ||||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-06-14 | 43 | -79/+0 | |
* | fix some minor issues | Volkan Gezer | 2014-06-13 | 2 | -4/+4 | |
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-06-12 | 1 | -1/+2 | |
* | disable failing tests | Bjoern Schiessle | 2014-06-11 | 1 | -0/+6 | |
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-06-11 | 1 | -0/+7 | |
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-06-10 | 1 | -0/+9 | |
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-06-09 | 1 | -0/+1 | |
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-06-08 | 1 | -0/+1 | |
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-06-07 | 1 | -0/+1 | |
* | remove unused variable | Bjoern Schiessle | 2014-06-06 | 1 | -1/+1 | |
* | remove encryption keys if user unshares a file | Bjoern Schiessle | 2014-06-06 | 3 | -3/+60 | |
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-06-06 | 1 | -0/+2 | |
* | adding unit tests for encryption data migration | Thomas Müller | 2014-06-05 | 4 | -14/+224 | |
* | use oc_preferences instead of oc_encryption to store encyption settings | Bjoern Schiessle | 2014-06-05 | 9 | -184/+69 | |
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-06-05 | 1 | -0/+1 | |
* | Upgrade SabreDAV to 1.8.10 | Thomas Müller | 2014-06-04 | 1 | -4/+4 | |
* | Merge pull request #8662 from owncloud/f-lock | Thomas Müller | 2014-06-04 | 4 | -13/+21 | |
|\ | ||||||
| * | workaround to get the unit test going | Thomas Müller | 2014-06-04 | 1 | -4/+6 | |
| * | get the storage from the view | Bjoern Schiessle | 2014-06-04 | 1 | -4/+5 | |
| * | don't ask for fileInfo if we already have one | Bjoern Schiessle | 2014-06-04 | 1 | -5/+4 | |
| * | make sure to close the stream at the end of each test | Bjoern Schiessle | 2014-06-04 | 1 | -0/+6 | |
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-06-04 | 3 | -8/+10 | |
|/ | ||||||
* | Merge pull request #8729 from owncloud/add-phpseclib-master | Thomas Müller | 2014-06-03 | 4 | -16/+9 | |
|\ | ||||||
| * | use phpseclib from 3rdparty | Thomas Müller | 2014-06-03 | 4 | -16/+9 | |
* | | Merge pull request #8676 from owncloud/encryption_improvements | Morris Jobke | 2014-06-02 | 4 | -155/+102 | |
|\ \ | ||||||
| * | | ceanup encryption code, improved return codes | Bjoern Schiessle | 2014-06-02 | 4 | -155/+102 | |
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-06-01 | 1 | -0/+1 | |
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-31 | 4 | -0/+5 | |
| |/ |/| | ||||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-30 | 2 | -0/+2 | |
* | | Merge pull request #8771 from owncloud/enc_get_mount_from_mountmanager | Robin McCorkell | 2014-05-29 | 2 | -18/+9 | |
|\ \ | ||||||
| * | | get mount point from mount manager | Bjoern Schiessle | 2014-05-28 | 2 | -18/+9 | |
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-29 | 10 | -1/+17 | |
|/ / | ||||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-28 | 33 | -33/+0 | |
* | | Merge pull request #8713 from owncloud/typo-files-encr | Thomas Müller | 2014-05-27 | 1 | -2/+2 | |
|\ \ | ||||||
| * | | fix grammar | Volkan Gezer | 2014-05-25 | 1 | -2/+2 |