summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3640 from infoneo/masterThomas Müller2013-06-132-19/+31
|\
| * Update mapper.phpinfoneo2013-06-081-3/+15
| * Update mapper.phpinfoneo2013-06-081-25/+8
| * Fixed problems with a dots in a filenamesinfoneo2013-05-121-6/+12
| * Dots in a filenames fixinfoneo2013-05-121-8/+19
* | Merge pull request #3668 from owncloud/encryption_migrate_only_onceBjörn Schießle2013-06-133-28/+74
|\ \
| * | add comment to explain the helper functionBjörn Schießle2013-06-131-0/+8
| * | fix typo in var nameBjörn Schießle2013-06-131-1/+1
| * | adapt test to the code changesBjörn Schießle2013-06-121-3/+18
| * | use number of manipulated rows as idicator if it was possible to enter the mi...Björn Schießle2013-06-122-69/+24
| * | use constants for different migration statusBjörn Schießle2013-06-111-8/+11
| * | make sure that only one process can enter the migration modeBjörn Schießle2013-06-112-12/+77
* | | Merge pull request #3677 from owncloud/apps-buttonsJan-Christoph Borchardt2013-06-132-6/+17
|\ \ \
| * | | apps management: change misleading + to ...Jan-Christoph Borchardt2013-06-121-1/+1
| * | | remove App management top bar and move buttons more contextually in the inter...Jan-Christoph Borchardt2013-06-122-6/+17
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-06-13156-1673/+4230
* | | | Merge pull request #3679 from owncloud/multiselect-fixesThomas Tanghus2013-06-122-74/+95
|\ \ \ \
| * | | | multiselect: up min-width of group multiselect to 150pxJan-Christoph Borchardt2013-06-111-1/+1
| * | | | multiselect: fixed 'add group' interface a bitJan-Christoph Borchardt2013-06-112-4/+12
| * | | | multiselect: more breathing space for entriesJan-Christoph Borchardt2013-06-111-4/+13
| * | | | multiselect: drop shadow for better focusJan-Christoph Borchardt2013-06-111-0/+3
| * | | | multiselect: do not cut off group namesJan-Christoph Borchardt2013-06-111-0/+1
| * | | | checkstyle: add space after colonJan-Christoph Borchardt2013-06-111-46/+46
| * | | | remove leading spacesJan-Christoph Borchardt2013-06-111-66/+66
* | | | | Revert "FIX: Download of files named "true" or "false" impossible"Roland Hager2013-06-121-2/+1
* | | | | Merge pull request #3676 from owncloud/move-storage-barFrank Karlitschek2013-06-121-6/+9
|\ \ \ \ \
| * | | | | move storage bar below clients showcase to make it more visibleJan-Christoph Borchardt2013-06-111-6/+9
| |/ / / /
* | / / / FIX: Download of files named "true" or "false" impossibleRoland Hager2013-06-121-1/+2
| |/ / / |/| | |
* | | | Merge pull request #3681 from owncloud/fix_ajax_removeuser.phpMorris Jobke2013-06-121-0/+1
|\ \ \ \
| * | | | 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
|\ \ \ \ \
| * | | | | 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
* | | | | | 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 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 https://github.com/owncloud/core/commit/1fa76e53dc5c515035f19e78f...Björn Schießle2013-06-121-8/+11
|/ / / / / /
* | | | | | Merge pull request #3672 from owncloud/files-contrastJan-Christoph Borchardt2013-06-114-11/+45
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | feedback for hover/tap on breadcrumbsJan-Christoph Borchardt2013-06-111-0/+10
| * | | | | better contrast and grouping for blocks in personal settings through darker b...Jan-Christoph Borchardt2013-06-111-2/+15
| * | | | | 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 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