Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | fix grammar | Volkan Gezer | 2014-05-25 | 1 | -2/+2 | |
| | | | ||||||
* | | | Adjust core apps to use "requiremin" instead of "require" | Vincent Petry | 2014-05-27 | 1 | -1/+1 | |
| |/ |/| | | | | | Also added a few missing authors. | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-26 | 1 | -13/+13 | |
|/ | ||||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-25 | 1 | -1/+1 | |
| | ||||||
* | Merge pull request #8637 from owncloud/enc_improved_error_handling | Vincent Petry | 2014-05-21 | 2 | -3/+49 | |
|\ | | | | | [encryption] improved error handling during password change | |||||
| * | only start migration if the encryption was initialized; allow to overwrite ↵ | Bjoern Schiessle | 2014-05-19 | 2 | -3/+49 | |
| | | | | | | | | keys if no files exists | |||||
* | | Remove all occurences of @brief and @returns from PHPDoc | Morris Jobke | 2014-05-19 | 21 | -149/+149 | |
|/ | | | | * test case added to avoid adding them later | |||||
* | Fix whitespace issues | Robin McCorkell | 2014-05-16 | 2 | -2/+2 | |
| | ||||||
* | Fix more missing or broken PHPDoc | Robin McCorkell | 2014-05-16 | 2 | -2/+2 | |
| | ||||||
* | Fix PHPDoc in /apps | Robin McCorkell | 2014-05-16 | 10 | -45/+43 | |
| | ||||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-16 | 2 | -0/+5 | |
| | ||||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-15 | 1 | -1/+1 | |
| | ||||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-14 | 1 | -7/+38 | |
| | ||||||
* | @returns -> @return | Thomas Müller | 2014-05-13 | 2 | -11/+11 | |
| | ||||||
* | Merge pull request #8398 from owncloud/enc_backup_keys | Björn Schießle | 2014-05-13 | 2 | -2/+13 | |
|\ | | | | | backup the encryption key after the encryption was disabled | |||||
| * | backup the encryption key after the encryption was disabled so that the user | Bjoern Schiessle | 2014-05-13 | 2 | -2/+13 | |
| | | | | | | | | can restore them if needed | |||||
* | | remove legacy aka deprecated code: OC_FilesystemView | Thomas Müller | 2014-05-12 | 21 | -80/+80 | |
| | | ||||||
* | | remove legacy aka deprecated code: OC_Filesystem | Thomas Müller | 2014-05-12 | 3 | -5/+5 | |
|/ | ||||||
* | only update the values which really changed | Bjoern Schiessle | 2014-04-30 | 1 | -8/+6 | |
| | ||||||
* | fix shouldEncrypt() method and improved decryptAll() unit tests | Bjoern Schiessle | 2014-04-28 | 2 | -10/+52 | |
| | ||||||
* | merge master into webdav-injection | Robin Appelman | 2014-04-25 | 9 | -257/+64 | |
|\ | ||||||
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-25 | 3 | -0/+6 | |
| | | ||||||
| * | some fixes to make the gallery work, this made it necessary to adjust some ↵ | Bjoern Schiessle | 2014-04-23 | 2 | -207/+21 | |
| | | | | | | | | tests and the encryption code | |||||
| * | fix encryption tests after the removal of the shared folder | Bjoern Schiessle | 2014-04-23 | 5 | -60/+46 | |
| | | ||||||
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-23 | 1 | -0/+1 | |
| | | ||||||
* | | Prevent error if previously cached data doesn't have an etag | Robin Appelman | 2014-04-22 | 1 | -0/+1 | |
| | | ||||||
* | | merge master into webdav-injection | Robin Appelman | 2014-04-15 | 15 | -266/+224 | |
|\| | ||||||
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-14 | 1 | -0/+11 | |
| | | ||||||
| * | Merge pull request #7807 from sarciszewski/patch-1 | Lukas Reschke | 2014-04-11 | 1 | -2/+2 | |
| |\ | | | | | | | Update crypt.php | |||||
| | * | Update crypt.php | Scott Arciszewski | 2014-03-24 | 1 | -2/+2 | |
| | | | | | | | | | Use a 256-bit random value | |||||
| | * | Update crypt.php | Scott Arciszewski | 2014-03-19 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | A 1024 kilobyte key would be obnoxiously slow to operate on. I'm assuming you meant 1024-bit? Also, 183 bytes = 1464 bits. Here's a safe alternative: 2048 bits, with comment-code sanity | |||||
| * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-09 | 1 | -0/+13 | |
| | | | ||||||
| * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-06 | 1 | -0/+2 | |
| | | | ||||||
| * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-03 | 1 | -0/+1 | |
| | | | ||||||
| * | | Merge pull request #7978 from owncloud/enc_cleanup | Vincent Petry | 2014-04-02 | 1 | -45/+0 | |
| |\ \ | | | | | | | | | there is no need to re-calculate the shares after a touch | |||||
| | * | | there is no need to re-calculate the shares after a touch | Bjoern Schiessle | 2014-03-31 | 1 | -45/+0 | |
| | | | | ||||||
| * | | | Merge pull request #7977 from owncloud/fix_enc_if_sharing_is_disabled | Morris Jobke | 2014-04-02 | 2 | -10/+8 | |
| |\ \ \ | | | | | | | | | | | always encrypt files to owner | |||||
| | * | | | always encrypt files to owner | Bjoern Schiessle | 2014-03-31 | 2 | -10/+8 | |
| | |/ / | ||||||
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-02 | 1 | -0/+1 | |
| | | | | ||||||
| * | | | Merge pull request #7997 from owncloud/correct-remember-trashbin-state | Bart Visscher | 2014-04-01 | 1 | -3/+3 | |
| |\ \ \ | | | | | | | | | | | Correct the remembering of the trashbin app state in encryption test | |||||
| | * | | | Remember before change works better | Bart Visscher | 2014-04-01 | 1 | -3/+3 | |
| | |/ / | ||||||
| * | | | Merge pull request #7912 from owncloud/enc_move_checks_to_pre_hook | Björn Schießle | 2014-04-01 | 3 | -87/+66 | |
| |\ \ \ | | | | | | | | | | | move check if a file should be encrypted to the pre hook | |||||
| | * | | | don't call getFileInfo() to avoid to open the same file twice | Bjoern Schiessle | 2014-03-31 | 1 | -12/+16 | |
| | | | | | ||||||
| | * | | | move check if a file should be encrypted to the pre hook | Bjoern Schiessle | 2014-03-31 | 2 | -75/+50 | |
| | | | | | ||||||
| * | | | | Merge pull request #7915 from owncloud/replace-personalblock | Vincent Petry | 2014-04-01 | 2 | -119/+113 | |
| |\ \ \ \ | | | | | | | | | | | | | Replace personalblock with .section | |||||
| | * \ \ \ | external storage: fix merge conflict, indentation | Jan-Christoph Borchardt | 2014-03-31 | 2 | -0/+3 | |
| | |\ \ \ \ | | | | |/ / | | | |/| | | ||||||
| | * | | | | replace personalblock fieldset with section class in files apps | Jan-Christoph Borchardt | 2014-03-27 | 2 | -119/+113 | |
| | | |/ / | | |/| | | ||||||
| * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-01 | 1 | -0/+1 | |
| | |/ / | |/| | | ||||||
| * | | | don't write file if opening a stream to encrypt the data fails | Bjoern Schiessle | 2014-03-28 | 1 | -0/+2 | |
| | | | | ||||||
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-28 | 1 | -0/+1 | |
| |/ / |