| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-18 | 2 | -0/+22 |
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-17 | 2 | -0/+6 |
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-16 | 5 | -0/+48 |
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-15 | 4 | -0/+38 |
| * | Merge pull request #3715 from owncloud/fixes_for_3641_3620 | Björn Schießle | 2013-06-14 | 2 | -9/+8 |
| |\ | |||||
| | * | fix for path_hash not unique as reported at #3641 | Florin Peter | 2013-06-13 | 1 | -2/+2 |
| | * | fix memory problems as reported at #3620 | Florin Peter | 2013-06-13 | 2 | -7/+6 |
| * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-14 | 22 | -41/+5 |
| |/ | |||||
| * | Merge branch 'master' into files_encryption_check_private_key | Björn Schießle | 2013-06-13 | 7 | -128/+127 |
| |\ | |||||
| | * | Merge branch 'master' into files_encryption_upgrade_fix | Björn Schießle | 2013-06-13 | 3 | -28/+74 |
| | |\ | |||||
| | | * | Merge pull request #3668 from owncloud/encryption_migrate_only_once | Björn Schießle | 2013-06-13 | 3 | -28/+74 |
| | | |\ | |||||
| | | | * | add comment to explain the helper function | Björn Schießle | 2013-06-13 | 1 | -0/+8 |
| | | | * | fix typo in var name | Björn Schießle | 2013-06-13 | 1 | -1/+1 |
| | | | * | adapt test to the code changes | Björn Schießle | 2013-06-12 | 1 | -3/+18 |
| | | | * | use number of manipulated rows as idicator if it was possible to enter the mi... | Björn Schießle | 2013-06-12 | 2 | -69/+24 |
| | | | * | use constants for different migration status | Björn Schießle | 2013-06-11 | 1 | -8/+11 |
| | | | * | make sure that only one process can enter the migration mode | Björn Schießle | 2013-06-11 | 2 | -12/+77 |
| | * | | | LegacyKeyRecryptKeyfileEncrypt() no longer exists, so test can be removed | Björn Schießle | 2013-06-13 | 1 | -18/+0 |
| | * | | | Merge branch 'master' into files_encryption_upgrade_fix | Björn Schießle | 2013-06-12 | 25 | -18/+375 |
| | |\| | | |||||
| | * | | | cleanup unused method legacyKeyRecryptKeyfile | Florin Peter | 2013-05-31 | 2 | -41/+0 |
| | * | | | Merge branch 'master' into files_encryption_upgrade_fix | Florin Peter | 2013-05-31 | 2 | -1/+12 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'master' into files_encryption_upgrade_fix | Florin Peter | 2013-05-31 | 9 | -141/+139 |
| | |\ \ \ \ | |||||
| | * | | | | | normalize path to prevent following split to fail | Florin Peter | 2013-05-31 | 1 | -0/+2 |
| | * | | | | | fix legacy key in until test | Florin Peter | 2013-05-31 | 1 | -1/+1 |
| | * | | | | | fix re-encrypt legacy files | Florin Peter | 2013-05-31 | 1 | -27/+15 |
| | * | | | | | use legacyDecrypt to decrypt key file like the previous files_encryption | Florin Peter | 2013-05-31 | 2 | -2/+2 |
| | * | | | | | fix for autoloader while user logged in and system is in maintenance | Florin Peter | 2013-05-31 | 1 | -23/+28 |
| * | | | | | | Merge branch 'master' into files_encryption_check_private_key | Björn Schießle | 2013-06-11 | 9 | -6/+151 |
| |\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| | * | | | | | Merge pull request #3646 from owncloud/introduce_phpunit_timeouts | Thomas Müller | 2013-06-11 | 6 | -0/+123 |
| | |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| | | * | | | | allow 30 sec for testDeleteFile | Jörn Friedrich Dreyer | 2013-06-10 | 1 | -0/+1 |
| | | * | | | | raise failed tests from first commit to size @medium | Jörn Friedrich Dreyer | 2013-06-10 | 1 | -0/+3 |
| | | * | | | | add timeouts 3/30/90 to phpunit tests | Jörn Friedrich Dreyer | 2013-06-10 | 5 | -0/+119 |
| | * | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-11 | 2 | -2/+23 |
| | * | | | | | Merge pull request #3647 from owncloud/missing_backticks | Morris Jobke | 2013-06-10 | 1 | -4/+4 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | add missing backticks all over the place | Jörn Friedrich Dreyer | 2013-06-10 | 1 | -4/+4 |
| | | |/ / / / | |||||
| * | | | | | | Merge branch 'master' into files_encryption_check_private_key | Björn Schießle | 2013-06-10 | 18 | -12/+219 |
| |\| | | | | | |||||
| | * | | | | | Merge pull request #3610 from owncloud/encryption_recovery_for_ldap | Björn Schießle | 2013-06-10 | 2 | -0/+10 |
| | |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | | * | | | | use pre_setPassword hook to update the encryption keys if the back-end doesn'... | Björn Schießle | 2013-06-06 | 2 | -0/+10 |
| | * | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-08 | 1 | -10/+10 |
| | * | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-07 | 1 | -1/+19 |
| | |/ / / / | |||||
| | * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-06 | 3 | -2/+27 |
| | * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-05 | 6 | -6/+109 |
| | * | | | | Merge pull request #3561 from owncloud/user | icewind1991 | 2013-06-03 | 1 | -1/+1 |
| | |\ \ \ \ | |||||
| | | * | | | | fix broken tests | Florin Peter | 2013-05-31 | 1 | -1/+1 |
| | | | |/ / | | |/| | | |||||
| | * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-02 | 1 | -1/+19 |
| | * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-01 | 4 | -1/+23 |
| | | |_|/ | |/| | | |||||
| | * | | | also fix login errors while filesystem is not loaded in app.php | Florin Peter | 2013-05-31 | 1 | -0/+6 |
| | * | | | Merge branch 'master' into files_encryption_fs_loaded_fix | Florin Peter | 2013-05-31 | 6 | -142/+128 |
| | |\| | | |||||
| | * | | | fix login errors while filesystem is not loaded | Florin Peter | 2013-05-31 | 1 | -0/+5 |
| * | | | | add a hint that the admin can recover your files; Don't let the user change t... | Björn Schießle | 2013-06-05 | 1 | -3/+9 |
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |