aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* remove App management top bar and move buttons more contextually in the ↵Jan-Christoph Borchardt2013-06-122-6/+17
| | | | interface
* Merge pull request #3681 from owncloud/fix_ajax_removeuser.phpMorris Jobke2013-06-121-0/+1
|\ | | | | Init language object before using it
| * init language object before using itGeorg Ehrke2013-06-121-0/+1
| |
* | Merge pull request #3654 from owncloud/clean_up_exceptionsThomas Müller2013-06-129-179/+291
|\ \ | | | | | | Introduce more robust SQL execution and exception handling
| * | remove duplicate logging from db.php, now happens in entrypointsJörn Friedrich Dreyer2013-06-101-4/+0
| | |
| * | clean up usage of DatabaseSetupException and catch Exceptions in entrypointsJörn Friedrich Dreyer2013-06-107-132/+171
| | |
| * | introduce and use executeAudited in db.phpJörn Friedrich Dreyer2013-06-102-47/+124
| | |
* | | every test now has 15min to executeJörn Friedrich Dreyer2013-06-121-2/+2
| | | | | | | | | we don't want to check performance just yet. we just want to make jenkins end more reliably.
* | | Merge pull request #3682 from owncloud/disable_proxys_on_sslcert_uploadBjörn Schießle2013-06-121-0/+4
|\ \ \ | | | | | | | | disable proxys during ssl root cert upload to avoid encryption
| * | | disable proxys during ssl root cert upload to avoid encryptionBjörn Schießle2013-06-121-0/+4
|/ / /
* | | Merge branch 'master' of github.com:owncloud/coreBjörn Schießle2013-06-12536-1464/+1475
|\ \ \
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-06-12536-1464/+1475
| | | |
* | | | backport of ↵Björn Schießle2013-06-121-8/+11
|/ / / | | | | | | | | | https://github.com/owncloud/core/commit/1fa76e53dc5c515035f19e78f3988205521720f6
* | | Merge pull request #3672 from owncloud/files-contrastJan-Christoph Borchardt2013-06-114-11/+45
|\ \ \ | | | | | | | | Contrast fixes
| * | | feedback for hover/tap on breadcrumbsJan-Christoph Borchardt2013-06-111-0/+10
| | | |
| * | | better contrast and grouping for blocks in personal settings through darker ↵Jan-Christoph Borchardt2013-06-111-2/+15
| | | | | | | | | | | | | | | | background color
| * | | better contrast for controls barJan-Christoph Borchardt2013-06-111-1/+1
| | | |
| * | | 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 longer
| * | | | 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 MDB2
| * | | | fix fetchRow checks to also work with MDB2Jörn Friedrich Dreyer2013-06-102-3/+9
| | | | |
* | | | | Merge pull request #3673 from owncloud/gitignore-apps2Thomas Müller2013-06-111-2/+2
|\ \ \ \ \ | | | | | | | | | | | | gitignore apps2 folder as well
| * | | | | 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 oracle
| * | | | 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 false
| * | | | 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 '' values
| * | | | | 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
|\ \ \ \ \ | |/ / / / |/| | | | add timeouts 3/30/90 to phpunit tests
| * | | | 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 tests
| * | | 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 place
| * | 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 parameter
| * | convert LIMIT to parameterJörn Friedrich Dreyer2013-06-101-1/+1
| |/
* | Merge pull request #3610 from owncloud/encryption_recovery_for_ldapBjörn Schießle2013-06-105-13/+39
|\ \ | |/ |/| recover encryption keys if ownCloud can't change the log-in password
| * use pre_setPassword hook to update the encryption keys if the back-end ↵Björn Schießle2013-06-063-9/+31
| | | | | | | | doesn't support password change; improved output to let the admin know what happened
| * always emit the preSetPassword hook, this should only indicate the ↵Björn Schießle2013-06-061-3/+3
| | | | | | | | intention. Finally the post-hooks indicate if it was successful or not
| * 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
|\ \ | | | | | | Hook improvements
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-13 16:33:11 +0000