summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | better contrast for files list, darker greys for selection and hoverJan-Christoph Borchardt2013-06-111-5/+16
| * | | | | | | | | | darker low threshold color for file size and age fading, better contrastJan-Christoph Borchardt2013-06-112-3/+3
* | | | | | | | | | | Merge pull request #3675 from owncloud/allow_autotest_to_run_10xThomas Müller2013-06-111-3/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | allow autotest to run 10x times longerJörn Friedrich Dreyer2013-06-111-3/+3
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #3652 from owncloud/fix_fetchrow_usage_for_mdb2Jörn Friedrich Dreyer2013-06-112-3/+9
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | fix fetchRow checks to also work with MDB2Jörn Friedrich Dreyer2013-06-102-3/+9
| | | | | | | * | | | | cleanup unused method legacyKeyRecryptKeyfileFlorin Peter2013-05-312-41/+0
| | | | | | | * | | | | Merge branch 'master' into files_encryption_upgrade_fixFlorin Peter2013-05-313-4/+21
| | | | | | | |\ \ \ \ \
| | | | | | | * \ \ \ \ \ Merge branch 'master' into files_encryption_upgrade_fixFlorin Peter2013-05-31560-1279/+1317
| | | | | | | |\ \ \ \ \ \
| | | | | | | * | | | | | | normalize path to prevent following split to failFlorin Peter2013-05-311-0/+2
| | | | | | | * | | | | | | fix legacy key in until testFlorin Peter2013-05-311-1/+1
| | | | | | | * | | | | | | fix re-encrypt legacy filesFlorin Peter2013-05-311-27/+15
| | | | | | | * | | | | | | use legacyDecrypt to decrypt key file like the previous files_encryptionFlorin Peter2013-05-312-2/+2
| | | | | | | * | | | | | | fix for autoloader while user logged in and system is in maintenanceFlorin Peter2013-05-311-23/+28
| | | | | | | | | | * | | | Merge branch 'master' into files_encryption_check_private_keyBjörn Schießle2013-06-11568-2386/+3057
| | | | | | | | | | |\ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #3673 from owncloud/gitignore-apps2Thomas Müller2013-06-111-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | gitignore apps2 folder as wellJan-Christoph Borchardt2013-06-111-2/+2
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #3650 from owncloud/use_to_char_for_oracle_clob_comparisonsJörn Friedrich Dreyer2013-06-112-5/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | use to_char to allow comparing string to CLOB cloumns in oracleJörn Friedrich Dreyer2013-06-102-5/+20
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #3671 from owncloud/fix_user_creationicewind19912013-06-111-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | createUser() needs to return something; the user object or falseBjörn Schießle2013-06-111-1/+1
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #3666 from owncloud/allow_null_in_text_columnsMorris Jobke2013-06-111-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | db structure, allow null in columns for '' valuesJörn Friedrich Dreyer2013-06-111-3/+3
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #3646 from owncloud/introduce_phpunit_timeoutsThomas Müller2013-06-1112-1/+169
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | allow 30 sec for testDeleteFileJörn Friedrich Dreyer2013-06-101-0/+1
| * | | | | | | | | | | | raise failed tests from first commit to size @mediumJörn Friedrich Dreyer2013-06-104-0/+13
| * | | | | | | | | | | | add timeouts 3/30/90 to phpunit testsJörn Friedrich Dreyer2013-06-109-1/+155
| |/ / / / / / / / / / /
* | / / / / / / / / / / [tx-robot] updated from transifexJenkins for ownCloud2013-06-11544-2340/+2827
| |/ / / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge pull request #3653 from owncloud/shorten_identifiers_in_testsThomas Müller2013-06-104-7/+7
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | shorten table identifiers in testsJörn Friedrich Dreyer2013-06-104-7/+7
| |/ / / / / / / / / /
* | | | | | | | | | | Merge pull request #3647 from owncloud/missing_backticksMorris Jobke2013-06-105-26/+26
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | add missing backticks all over the placeJörn Friedrich Dreyer2013-06-105-26/+26
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #3648 from owncloud/sql_limit_as_paramJörn Friedrich Dreyer2013-06-101-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | convert LIMIT to parameterJörn Friedrich Dreyer2013-06-101-1/+1
| |/ / / / / / / / /
| | | | | | * | | | update submoduleBjörn Schießle2013-06-111-0/+0
| | | | | | * | | | Merge branch 'master' into files_encryption_check_private_keyBjörn Schießle2013-06-10697-2972/+5921
| | | | | | |\ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #3610 from owncloud/encryption_recovery_for_ldapBjörn Schießle2013-06-105-13/+39
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | use pre_setPassword hook to update the encryption keys if the back-end doesn'...Björn Schießle2013-06-063-9/+31
| * | | | | | | | | always emit the preSetPassword hook, this should only indicate the intention....Björn Schießle2013-06-061-3/+3
| * | | | | | | | | add hint about what the recovery password field is forBjörn Schießle2013-06-061-1/+5
* | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-06-10529-1045/+1045
* | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-06-09521-1040/+1040
* | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-06-08557-1151/+1184
* | | | | | | | | | Merge pull request #2919 from owncloud/hook-improvementsMichael Gapczynski2013-06-071-6/+8
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into hook-improvementsMichael Gapczynski2013-06-041691-65985/+65795
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Don't unlink old renamed file if stream copy failedMichael Gapczynski2013-04-131-1/+3
| * | | | | | | | | | | Check if operation worked before sending post hooks, fixes #2484Michael Gapczynski2013-04-131-4/+4
* | | | | | | | | | | | Merge pull request #3628 from owncloud/update_3rdparty_submoduleMorris Jobke2013-06-071-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | update 3rdparty submoduleGeorg Ehrke2013-06-071-0/+0
|/ / / / / / / / / / / /
* | | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-06-0753-222/+372