Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-16 | 11 | -0/+54 |
* | Merge pull request #3301 from bastho/fix_filestrashbin_missing-sub-folder | Morris Jobke | 2013-06-15 | 1 | -2/+9 |
|\ | |||||
| * | duplicate verification | Bastien Ho | 2013-05-10 | 1 | -3/+0 |
| * | Fix inexisting trashbin's sub-folders | Bastien Ho | 2013-05-10 | 1 | -2/+12 |
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-15 | 48 | -48/+42 |
* | | Merge pull request #3473 from opensaucesystems/master | Thomas Müller | 2013-06-14 | 2 | -3/+9 |
|\ \ | |||||
| * | | Update settings.php | opensaucesystems | 2013-05-23 | 1 | -1/+1 |
| * | | Remove http:// from label and add placeholder | opensaucesystems | 2013-05-23 | 1 | -1/+1 |
| * | | Enable https authentication | opensaucesystems | 2013-05-23 | 1 | -1/+1 |
| * | | Enable https authentication | opensaucesystems | 2013-05-23 | 1 | -2/+8 |
* | | | 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 | 88 | -167/+71 |
|/ / / | |||||
* | | | Merge pull request #3687 from owncloud/template_updates | Björn Schießle | 2013-06-13 | 1 | -2/+6 |
|\ \ \ | |||||
| * | | | improved footer | Björn Schießle | 2013-06-13 | 1 | -2/+6 |
| * | | | make pub link share footer aware of different owncloud editions | Björn Schießle | 2013-06-12 | 1 | -2/+2 |
* | | | | Merge branch 'master' into files_encryption_check_private_key | Björn Schießle | 2013-06-13 | 12 | -144/+161 |
|\ \ \ \ | |||||
| * \ \ \ | 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 | 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 |
| | |/ / / / / / |