Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | 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 | |
* | | | | | | | | | | | Merge pull request #3675 from owncloud/allow_autotest_to_run_10x | Thomas Müller | 2013-06-11 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | allow autotest to run 10x times longer | Jörn Friedrich Dreyer | 2013-06-11 | 1 | -3/+3 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge pull request #3652 from owncloud/fix_fetchrow_usage_for_mdb2 | Jörn Friedrich Dreyer | 2013-06-11 | 2 | -3/+9 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | fix fetchRow checks to also work with MDB2 | Jörn Friedrich Dreyer | 2013-06-10 | 2 | -3/+9 | |
| | | | | | | * | | | | | 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 | 560 | -1279/+1317 | |
| | | | | | | |\ \ \ \ \ \ | ||||||
| | | | | | | * | | | | | | | 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 | 568 | -2386/+3057 | |
| | | | | | | | | | |\ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge pull request #3673 from owncloud/gitignore-apps2 | Thomas Müller | 2013-06-11 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | gitignore apps2 folder as well | Jan-Christoph Borchardt | 2013-06-11 | 1 | -2/+2 | |
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge pull request #3650 from owncloud/use_to_char_for_oracle_clob_comparisons | Jörn Friedrich Dreyer | 2013-06-11 | 2 | -5/+20 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | use to_char to allow comparing string to CLOB cloumns in oracle | Jörn Friedrich Dreyer | 2013-06-10 | 2 | -5/+20 | |
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge pull request #3671 from owncloud/fix_user_creation | icewind1991 | 2013-06-11 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | createUser() needs to return something; the user object or false | Björn Schießle | 2013-06-11 | 1 | -1/+1 | |
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge pull request #3666 from owncloud/allow_null_in_text_columns | Morris Jobke | 2013-06-11 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | db structure, allow null in columns for '' values | Jörn Friedrich Dreyer | 2013-06-11 | 1 | -3/+3 | |
|/ / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | Merge pull request #3646 from owncloud/introduce_phpunit_timeouts | Thomas Müller | 2013-06-11 | 12 | -1/+169 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | 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 | 4 | -0/+13 | |
| * | | | | | | | | | | | | add timeouts 3/30/90 to phpunit tests | Jörn Friedrich Dreyer | 2013-06-10 | 9 | -1/+155 | |
| |/ / / / / / / / / / / | ||||||
* | / / / / / / / / / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-11 | 544 | -2340/+2827 | |
| |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | Merge pull request #3653 from owncloud/shorten_identifiers_in_tests | Thomas Müller | 2013-06-10 | 4 | -7/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | shorten table identifiers in tests | Jörn Friedrich Dreyer | 2013-06-10 | 4 | -7/+7 | |
| |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge pull request #3647 from owncloud/missing_backticks | Morris Jobke | 2013-06-10 | 5 | -26/+26 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | add missing backticks all over the place | Jörn Friedrich Dreyer | 2013-06-10 | 5 | -26/+26 | |
| |/ / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #3648 from owncloud/sql_limit_as_param | Jörn Friedrich Dreyer | 2013-06-10 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | convert LIMIT to parameter | Jörn Friedrich Dreyer | 2013-06-10 | 1 | -1/+1 | |
| |/ / / / / / / / / | ||||||
| | | | | | * | | | | update submodule | Björn Schießle | 2013-06-11 | 1 | -0/+0 | |
| | | | | | * | | | | Merge branch 'master' into files_encryption_check_private_key | Björn Schießle | 2013-06-10 | 697 | -2972/+5921 | |
| | | | | | |\ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #3610 from owncloud/encryption_recovery_for_ldap | Björn Schießle | 2013-06-10 | 5 | -13/+39 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | use pre_setPassword hook to update the encryption keys if the back-end doesn'... | Björn Schießle | 2013-06-06 | 3 | -9/+31 | |
| * | | | | | | | | | always emit the preSetPassword hook, this should only indicate the intention.... | Björn Schießle | 2013-06-06 | 1 | -3/+3 | |
| * | | | | | | | | | add hint about what the recovery password field is for | Björn Schießle | 2013-06-06 | 1 | -1/+5 | |
* | | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-10 | 529 | -1045/+1045 | |
* | | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-09 | 521 | -1040/+1040 | |
* | | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-08 | 557 | -1151/+1184 | |
* | | | | | | | | | | Merge pull request #2919 from owncloud/hook-improvements | Michael Gapczynski | 2013-06-07 | 1 | -6/+8 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'master' into hook-improvements | Michael Gapczynski | 2013-06-04 | 1691 | -65985/+65795 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Don't unlink old renamed file if stream copy failed | Michael Gapczynski | 2013-04-13 | 1 | -1/+3 | |
| * | | | | | | | | | | | Check if operation worked before sending post hooks, fixes #2484 | Michael Gapczynski | 2013-04-13 | 1 | -4/+4 | |
* | | | | | | | | | | | | Merge pull request #3628 from owncloud/update_3rdparty_submodule | Morris Jobke | 2013-06-07 | 1 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | update 3rdparty submodule | Georg Ehrke | 2013-06-07 | 1 | -0/+0 | |
|/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-07 | 53 | -222/+372 |