Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | | * | | | | 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 | 65 | -63/+599 | |
| |\| | | | | | ||||||
| | * | | | | | Revert "FIX: Download of files named "true" or "false" impossible" | Roland Hager | 2013-06-12 | 1 | -2/+1 | |
| | * | | | | | FIX: Download of files named "true" or "false" impossible | Roland Hager | 2013-06-12 | 1 | -1/+2 | |
| | | |/ / / | | |/| | | | ||||||
| | * | | | | disable proxys during ssl root cert upload to avoid encryption | Björn Schießle | 2013-06-12 | 1 | -0/+4 | |
| | * | | | | backport of https://github.com/owncloud/core/commit/1fa76e53dc5c515035f19e78f... | Björn Schießle | 2013-06-12 | 1 | -8/+11 | |
| | * | | | | better contrast for files list, darker greys for selection and hover | Jan-Christoph Borchardt | 2013-06-11 | 1 | -5/+16 | |
| | * | | | | darker low threshold color for file size and age fading, better contrast | Jan-Christoph Borchardt | 2013-06-11 | 2 | -3/+3 | |
| * | | | | | 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 | 3 | -4/+21 | |
| |\ \ \ \ \ | ||||||
| * \ \ \ \ \ | Merge branch 'master' into files_encryption_upgrade_fix | Florin Peter | 2013-05-31 | 13 | -141/+163 | |
| |\ \ \ \ \ \ | ||||||
| * | | | | | | | 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 | 10 | -6/+160 | |
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | ||||||
| * | | | | | | | 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 | 3 | -2/+32 | |
| * | | | | | | | 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 | 52 | -44/+409 | |
|\| | | | | | | | ||||||
| * | | | | | | | 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 | 6 | -14/+27 | |
| * | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-07 | 9 | -11/+54 | |
| * | | | | | | | Read configuratons for external filesystem test from a private place. | Thomas Mueller | 2013-06-07 | 1 | -0/+9 | |
| |/ / / / / / | ||||||
| * | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-06 | 7 | -2/+46 | |
| * | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-05 | 15 | -8/+167 | |
| * | | | | | | LDAP: append port when URL is passed in LDAP Host configuration, fixes #2600 | Arthur Schiwon | 2013-06-04 | 1 | -0/+4 | |
| * | | | | | | 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 | |
| | | |/ / / / | | |/| | | | | ||||||
| * | | | | | | Merge pull request #3051 from owncloud/backgroundjob | icewind1991 | 2013-06-02 | 3 | -12/+11 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | Files: use public api to register backgroundjob | Robin Appelman | 2013-06-02 | 1 | -1/+1 | |
| | * | | | | | | merge master into backgroundjob | Robin Appelman | 2013-06-02 | 376 | -3989/+10324 | |
| | |\ \ \ \ \ \ | ||||||
| | * | | | | | | | Rework background job system | Robin Appelman | 2013-04-20 | 2 | -11/+10 | |
| * | | | | | | | | Merge pull request #3567 from owncloud/fixing-3466 | Frank Karlitschek | 2013-06-02 | 1 | -2/+12 | |
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | ||||||
| | * | | | | | | | In cases where smb4php returns false of an empty array stat/( has to return f... | Thomas Mueller | 2013-06-01 | 1 | -2/+12 | |
| | | |_|_|_|/ / | | |/| | | | | | ||||||
| * | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-02 | 2 | -1/+25 | |
| * | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-01 | 6 | -1/+28 | |
| * | | | | | | | Merge pull request #3565 from owncloud/fix_ldap_sqlite_n_js | blizzz | 2013-05-31 | 2 | -2/+8 | |
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | ||||||
| | * | | | | | | LDAP: sqlite compatibility for emptyiing tables | Arthur Schiwon | 2013-05-31 | 1 | -1/+7 |