summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | Merge pull request #3622 from owncloud/read-extfx-confg-from-homeThomas Müller2013-06-061-0/+9
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Read configuratons for external filesystem test from a private place.Thomas Mueller2013-06-071-0/+9
| |/ / /
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-06-0637-115/+176
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-06-0562-341/+598
| | |/ | |/|
| * | Merge pull request #3594 from opensaucesystems/patch-1Thomas Müller2013-06-041-3/+4
| |\ \
| | * | Added input[type="url"] to styles.cssopensaucesystems2013-06-041-3/+4
| * | | exclude 3rdparty folder within files_external and files_encryption from code ...Thomas Mueller2013-06-041-0/+2
| |/ /
| * | LDAP: append port when URL is passed in LDAP Host configuration, fixes #2600Arthur Schiwon2013-06-041-0/+4
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-06-04148-632/+636
| * | ignore l10n folder within remaining appsThomas Mueller2013-06-041-0/+8
| * | Cache Test: set datadir to temporary location, otherwise initmountpoints will...Arthur Schiwon2013-06-031-2/+8
| * | Cache: mount user mountpoints to make sure that // exists before accessing it...Arthur Schiwon2013-06-031-0/+1
| * | Merge pull request #3444 from owncloud/share-fixJörn Friedrich Dreyer2013-06-031-1/+1
| |\ \
| | * | Fix undefined index for share mount point retrievalMichael Gapczynski2013-05-211-1/+1
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-31 00:29:03 +0000