]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 6 Dec 2013 03:24:39 +0000 (22:24 -0500)]
[tx-robot] updated from transifex

10 years agoRevert "Merge pull request #6210 from owncloud/fix-5865"
Morris Jobke [Thu, 5 Dec 2013 20:03:17 +0000 (21:03 +0100)]
Revert "Merge pull request #6210 from owncloud/fix-5865"

This reverts commit f12363d90b31e03a9f2e95911dda54af728a2df6, reversing
changes made to eba35d28cd974507f9e81e15430d3d33dbbd9973.

10 years agoRevert "Revert "Fix user's displayName being overwritten by (old) cookie""
Morris Jobke [Thu, 5 Dec 2013 19:53:11 +0000 (20:53 +0100)]
Revert "Revert "Fix user's displayName being overwritten by (old) cookie""

This reverts commit eba35d28cd974507f9e81e15430d3d33dbbd9973.

10 years agoMerge pull request #6210 from owncloud/fix-5865
pdessauw [Thu, 5 Dec 2013 19:19:06 +0000 (11:19 -0800)]
Merge pull request #6210 from owncloud/fix-5865

#5865 Multiselect animation is too slow patch

10 years agoChanged duration of slideDown, slideUp and fadeOut to 200ms
unknown [Thu, 5 Dec 2013 18:15:52 +0000 (13:15 -0500)]
Changed duration of slideDown, slideUp and fadeOut to 200ms

10 years agoRevert "Fix user's displayName being overwritten by (old) cookie"
Morris Jobke [Thu, 5 Dec 2013 15:12:46 +0000 (16:12 +0100)]
Revert "Fix user's displayName being overwritten by (old) cookie"

This reverts commit 2a7380cc21e56ce12b1a0e1460fabc978a83090b.

10 years agoMerge pull request #6199 from nicokaiser/fix-5306-master
Morris Jobke [Thu, 5 Dec 2013 14:32:20 +0000 (06:32 -0800)]
Merge pull request #6199 from nicokaiser/fix-5306-master

Fix user's displayName being overwritten by (old) cookie. #3694

10 years agoMerge pull request #6196 from owncloud/installation-error-css
Morris Jobke [Thu, 5 Dec 2013 14:25:48 +0000 (06:25 -0800)]
Merge pull request #6196 from owncloud/installation-error-css

fix appearance of error message - .errors is outdated

10 years agoFix user's displayName being overwritten by (old) cookie
Nico Kaiser [Thu, 5 Dec 2013 13:18:32 +0000 (14:18 +0100)]
Fix user's displayName being overwritten by (old) cookie

10 years agofix appearance of error message - .errors is outdated
Morris Jobke [Thu, 5 Dec 2013 10:23:30 +0000 (11:23 +0100)]
fix appearance of error message - .errors is outdated

10 years agomaster is ownCloud 7 pre alpha now
Frank Karlitschek [Thu, 5 Dec 2013 09:35:19 +0000 (10:35 +0100)]
master is ownCloud 7 pre alpha now

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 4 Dec 2013 23:14:17 +0000 (18:14 -0500)]
[tx-robot] updated from transifex

10 years agoLDAP Wizard: don't generate filter when not allowed
Arthur Schiwon [Tue, 3 Dec 2013 19:50:46 +0000 (20:50 +0100)]
LDAP Wizard: don't generate filter when not allowed

10 years agosome equals are more equal than other equals
Arthur Schiwon [Tue, 3 Dec 2013 19:45:05 +0000 (20:45 +0100)]
some equals are more equal than other equals

10 years agoLDAP Wizard: return correct var
Arthur Schiwon [Tue, 3 Dec 2013 15:37:11 +0000 (16:37 +0100)]
LDAP Wizard: return correct var

10 years agoLDAP Wizard: make sure auto-detected suggestions are really applied initially. Also...
Arthur Schiwon [Tue, 3 Dec 2013 12:27:45 +0000 (13:27 +0100)]
LDAP Wizard: make sure auto-detected suggestions are really applied initially. Also make initial filter compilation and user counting robust against race conditions.

10 years agoLDAP: on testing configuration, set active property to true, otherwise inactive conne...
Arthur Schiwon [Tue, 3 Dec 2013 12:21:55 +0000 (13:21 +0100)]
LDAP: on testing configuration, set active property to true, otherwise inactive connections cannot be tested properly

10 years agoLDAP: set default value for login filter to empty, otherwise the wizard signals compl...
Arthur Schiwon [Tue, 3 Dec 2013 11:11:43 +0000 (12:11 +0100)]
LDAP: set default value for login filter to empty, otherwise the wizard signals completed configuration too early when it might be not correct, i.e. login won't work

10 years agoLDAP Wizard: don't send ldap_tls change back to the interface as the element was...
Arthur Schiwon [Mon, 2 Dec 2013 20:11:20 +0000 (21:11 +0100)]
LDAP Wizard: don't send ldap_tls change back to the interface as the element was removed, for it is detected fully automatically. Resolves an JS error and thus an ever-spinning spinner

10 years agoLDAP Wizard: avoid a manually deactivated LDAP configuration is enabled by just openi...
Arthur Schiwon [Wed, 4 Dec 2013 13:01:31 +0000 (14:01 +0100)]
LDAP Wizard: avoid a manually deactivated LDAP configuration is enabled by just opening the admin page

10 years agoLDAP: make unsetting checkboxes from Advanced tab work again, fixes #6143
Arthur Schiwon [Wed, 4 Dec 2013 12:14:05 +0000 (13:14 +0100)]
LDAP: make unsetting checkboxes from Advanced tab work again, fixes #6143

10 years agoMerge pull request #6181 from owncloud/auto_expire_trash
Björn Schießle [Wed, 4 Dec 2013 15:44:02 +0000 (07:44 -0800)]
Merge pull request #6181 from owncloud/auto_expire_trash

config switch to disable auto expire for the trash bin

10 years agoconfig switch to disable auto expire for the trash bin
Bjoern Schiessle [Wed, 4 Dec 2013 13:20:29 +0000 (14:20 +0100)]
config switch to disable auto expire for the trash bin

10 years agoRevert "Adjust files_encryption requirements to the new core requirement (PHP 5.3...
Morris Jobke [Wed, 4 Dec 2013 12:27:38 +0000 (13:27 +0100)]
Revert "Adjust files_encryption requirements to the new core requirement (PHP 5.3.8)."

This reverts commit efbf18652c6eef42e2ca2fda3572d74d2be022dd.

10 years agoMerge pull request #6169 from owncloud/php_version_warning
Morris Jobke [Wed, 4 Dec 2013 09:49:54 +0000 (01:49 -0800)]
Merge pull request #6169 from owncloud/php_version_warning

PHP version warning

10 years agolower required php version to 5.3.3
Frank Karlitschek [Tue, 3 Dec 2013 13:30:32 +0000 (14:30 +0100)]
lower required php version to 5.3.3

10 years agoMerge pull request #6168 from owncloud/extstorage-testtestmethod
Frank Karlitschek [Tue, 3 Dec 2013 19:00:49 +0000 (11:00 -0800)]
Merge pull request #6168 from owncloud/extstorage-testtestmethod

Added unit test for the test() method of ext storage

10 years agoMerge pull request #6076 from owncloud/fix-6073-master
Thomas Müller [Tue, 3 Dec 2013 16:21:45 +0000 (08:21 -0800)]
Merge pull request #6076 from owncloud/fix-6073-master

Correct property name. It's just 'tableprefix', without the 'db' prefix.

10 years agoMerge pull request #5946 from owncloud/public-page-details
Vincent Petry [Tue, 3 Dec 2013 15:26:00 +0000 (07:26 -0800)]
Merge pull request #5946 from owncloud/public-page-details

Public page details

10 years agoMerge pull request #5931 from owncloud/fix-time-field-properly
Thomas Müller [Tue, 3 Dec 2013 15:23:04 +0000 (07:23 -0800)]
Merge pull request #5931 from owncloud/fix-time-field-properly

fix time input field properly, details

10 years agoMerge pull request #6153 from owncloud/extstorage-s3
Vincent Petry [Tue, 3 Dec 2013 14:51:25 +0000 (06:51 -0800)]
Merge pull request #6153 from owncloud/extstorage-s3

Fixed Amazon S3 ext storage config UI

10 years agoRevert "[fix] Center Share Dropdown & Versions Dropdown"
zombiehugs [Tue, 3 Dec 2013 14:23:13 +0000 (08:23 -0600)]
Revert "[fix] Center Share Dropdown & Versions Dropdown"

This reverts commit 1dbbfcf3dcd4de7f31344244b9f22217e4bfba72.

10 years ago[fix] Center Share Dropdown & Versions Dropdown
zombiehugs [Tue, 3 Dec 2013 14:09:58 +0000 (08:09 -0600)]
[fix] Center Share Dropdown & Versions Dropdown

Center Share Dropdown & Versions Dropdown

10 years agorequest a bit more data for bug reports
Frank Karlitschek [Tue, 3 Dec 2013 14:06:36 +0000 (15:06 +0100)]
request a bit more data for bug reports

10 years agoAdded unit test for the test() method
Vincent Petry [Tue, 3 Dec 2013 13:35:53 +0000 (14:35 +0100)]
Added unit test for the test() method

This is to make sure that method isn't broken

10 years agofix public page - gallery view issues
Morris Jobke [Tue, 3 Dec 2013 12:46:58 +0000 (13:46 +0100)]
fix public page - gallery view issues

10 years agoFixed test function for S3
Vincent Petry [Mon, 2 Dec 2013 17:32:32 +0000 (18:32 +0100)]
Fixed test function for S3

Fixes #5752

10 years agoFixed Amazon S3 ext storage config UI
Vincent Petry [Mon, 2 Dec 2013 15:55:43 +0000 (16:55 +0100)]
Fixed Amazon S3 ext storage config UI

Optional parameters are now really optional

Fixes #5861

10 years agoFixed placeholder after page reload
Vincent Petry [Mon, 2 Dec 2013 17:49:34 +0000 (18:49 +0100)]
Fixed placeholder after page reload

The placeholder somehow had too many characters stripping from it...

10 years agofix trashbin and pbulic page controls
Morris Jobke [Tue, 3 Dec 2013 09:59:22 +0000 (10:59 +0100)]
fix trashbin and pbulic page controls

10 years agofix and cleanup CSS for public page
Morris Jobke [Wed, 27 Nov 2013 20:21:29 +0000 (21:21 +0100)]
fix and cleanup CSS for public page

10 years agochange different shades of grey for public share page to white
Jan-Christoph Borchardt [Thu, 21 Nov 2013 12:33:04 +0000 (13:33 +0100)]
change different shades of grey for public share page to white

10 years agoremove app specific code
Jan-Christoph Borchardt [Wed, 20 Nov 2013 14:05:08 +0000 (15:05 +0100)]
remove app specific code

10 years agofix details for buttons in header and controls bar
Jan-Christoph Borchardt [Tue, 19 Nov 2013 14:54:27 +0000 (15:54 +0100)]
fix details for buttons in header and controls bar

10 years agoaccount for shift of controls bar due to app navigation, do not shift on public page
Jan-Christoph Borchardt [Tue, 19 Nov 2013 14:53:49 +0000 (15:53 +0100)]
account for shift of controls bar due to app navigation, do not shift on public page

10 years agoMerge pull request #5929 from owncloud/code_check_on
Frank Karlitschek [Tue, 3 Dec 2013 09:14:35 +0000 (01:14 -0800)]
Merge pull request #5929 from owncloud/code_check_on

switch code checker on by default. apps are not allowed to access

10 years agoMerge pull request #6158 from owncloud/rmdir-check
Thomas Müller [Mon, 2 Dec 2013 23:14:41 +0000 (15:14 -0800)]
Merge pull request #6158 from owncloud/rmdir-check

check if a directory exists before we try to remove it

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Mon, 2 Dec 2013 22:28:29 +0000 (17:28 -0500)]
[tx-robot] updated from transifex

10 years agocheck if a directory exists before we try to remove it
Robin Appelman [Mon, 2 Dec 2013 21:43:58 +0000 (22:43 +0100)]
check if a directory exists before we try to remove it

10 years agoMerge pull request #6151 from owncloud/trash_fix_select
Björn Schießle [Mon, 2 Dec 2013 21:22:28 +0000 (13:22 -0800)]
Merge pull request #6151 from owncloud/trash_fix_select

trash, make it possible to select folders

10 years agomake it possible to select folders
Bjoern Schiessle [Mon, 2 Dec 2013 14:27:40 +0000 (15:27 +0100)]
make it possible to select folders

10 years agoMerge pull request #6148 from owncloud/fix_trash_restore
Vincent Petry [Mon, 2 Dec 2013 12:33:37 +0000 (04:33 -0800)]
Merge pull request #6148 from owncloud/fix_trash_restore

Fix restore anbd delete operations in trash bin

10 years agocheck explicitely all possible dir values
Bjoern Schiessle [Mon, 2 Dec 2013 11:13:32 +0000 (12:13 +0100)]
check explicitely all possible dir values

10 years agoset delete all to true if a complete folder was deleted
Bjoern Schiessle [Mon, 2 Dec 2013 10:59:09 +0000 (11:59 +0100)]
set delete all to true if a complete folder was deleted

10 years agofix delete files from trash bin
Bjoern Schiessle [Mon, 2 Dec 2013 10:39:53 +0000 (11:39 +0100)]
fix delete files from trash bin

10 years agofixing PHPDoc and spelling
Thomas Mueller [Mon, 2 Dec 2013 07:42:28 +0000 (08:42 +0100)]
fixing PHPDoc and spelling

10 years agoownCloud 6 RC2 v6.0.0RC2
Frank Karlitschek [Sun, 1 Dec 2013 23:10:28 +0000 (00:10 +0100)]
ownCloud 6 RC2

10 years agoMerge pull request #6052 from owncloud/datetime-doctrine
Thomas Müller [Sun, 1 Dec 2013 09:29:35 +0000 (01:29 -0800)]
Merge pull request #6052 from owncloud/datetime-doctrine

Get rid of date strings for DB. Completely use Doctrine and DateTime.

10 years agoMerge pull request #6132 from owncloud/encryption-version-bump
Thomas Müller [Fri, 29 Nov 2013 23:20:54 +0000 (15:20 -0800)]
Merge pull request #6132 from owncloud/encryption-version-bump

Adjust files_encryption requirements to the new core requirement (PHP 5.3.8)

10 years agoAdjust files_encryption requirements to the new core requirement (PHP 5.3.8).
Andreas Fischer [Fri, 29 Nov 2013 19:34:57 +0000 (20:34 +0100)]
Adjust files_encryption requirements to the new core requirement (PHP 5.3.8).

10 years agoMerge pull request #6123 from owncloud/extstorage-deletedirs2
Vincent Petry [Fri, 29 Nov 2013 19:23:02 +0000 (11:23 -0800)]
Merge pull request #6123 from owncloud/extstorage-deletedirs2

Fixed FTP and SMB to use rmdir() when deleting folders

10 years agoMerge pull request #6128 from owncloud/fix-6126-master
Thomas Müller [Fri, 29 Nov 2013 19:22:44 +0000 (11:22 -0800)]
Merge pull request #6128 from owncloud/fix-6126-master

Also merge autoconfig variables into $_REQUEST.

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 29 Nov 2013 19:10:40 +0000 (14:10 -0500)]
[tx-robot] updated from transifex

10 years agoMerge pull request #6129 from owncloud/chunking-fixtouchafterassemble
Frank Karlitschek [Fri, 29 Nov 2013 17:19:51 +0000 (09:19 -0800)]
Merge pull request #6129 from owncloud/chunking-fixtouchafterassemble

Fixed touch after chunk assembling

10 years agoMerge pull request #6127 from owncloud/minimum_php_version
Morris Jobke [Fri, 29 Nov 2013 16:07:43 +0000 (08:07 -0800)]
Merge pull request #6127 from owncloud/minimum_php_version

make 5.3.8 the minimum supported version.

10 years agofix restore from files in sub-folders
Bjoern Schiessle [Fri, 29 Nov 2013 15:43:50 +0000 (16:43 +0100)]
fix restore from files in sub-folders

10 years agoFixed touch after chunk assembling
Vincent Petry [Fri, 29 Nov 2013 15:28:42 +0000 (16:28 +0100)]
Fixed touch after chunk assembling

Fixed touch after chunk assembling which was using the wrong path,
resulting in the creation of an extra file.

Fixes #6007

10 years agoAlso merge autoconfig variables into $_REQUEST.
Andreas Fischer [Fri, 29 Nov 2013 15:24:48 +0000 (16:24 +0100)]
Also merge autoconfig variables into $_REQUEST.

10 years agomake 5.3.8 the minimum supported version. This fixes several issues with broken PHP...
Frank Karlitschek [Fri, 29 Nov 2013 14:46:10 +0000 (15:46 +0100)]
make 5.3.8 the minimum supported version. This fixes several issues with broken PHP versions like: https://github.com/owncloud/core/issues/5734
Also make the version compare clearer. It was pure luck that floatval on a php version returned the correct value.

10 years agoFixed FTP and SMB to use rmdir() when deleting folders
Vincent Petry [Fri, 29 Nov 2013 11:58:57 +0000 (12:58 +0100)]
Fixed FTP and SMB to use rmdir() when deleting folders

Some storages need to use different calls for deleting files or folders,
usually unlink() and rmdir().

Fixes #4532 (SMB dir deletion)
Fixes #5941 (FTP dir deletion)

Note that the extra is_dir() should be fast because it's read from the
stat cache.

10 years agoMerge pull request #5984 from owncloud/nav-scrollbar
Frank Karlitschek [Fri, 29 Nov 2013 11:27:50 +0000 (03:27 -0800)]
Merge pull request #5984 from owncloud/nav-scrollbar

always show app navigation scrollbar when too many apps in there

10 years agoMerge pull request #6077 from owncloud/fix-api-documentation
Frank Karlitschek [Fri, 29 Nov 2013 11:24:19 +0000 (03:24 -0800)]
Merge pull request #6077 from owncloud/fix-api-documentation

API doc for contacts manager, server container and share

10 years agoMerge pull request #6111 from owncloud/non-floating-trash-button-chrome
Frank Karlitschek [Fri, 29 Nov 2013 10:44:49 +0000 (02:44 -0800)]
Merge pull request #6111 from owncloud/non-floating-trash-button-chrome

Fix resize issue for trash button in chrome and overflowing spinner in ....

10 years agoMerge pull request #6099 from owncloud/fix_source_not_found_warnings
Morris Jobke [Thu, 28 Nov 2013 20:59:24 +0000 (12:59 -0800)]
Merge pull request #6099 from owncloud/fix_source_not_found_warnings

make sure that we don't try to access an already deleted files

11 years agoMerge pull request #6106 from owncloud/fix_preview_creation
Morris Jobke [Thu, 28 Nov 2013 20:48:19 +0000 (12:48 -0800)]
Merge pull request #6106 from owncloud/fix_preview_creation

Fix preview creation

11 years agoFix resize issue for trash button in chrome and overflowing spinner in .update class
Morris Jobke [Thu, 28 Nov 2013 20:36:43 +0000 (21:36 +0100)]
Fix resize issue for trash button in chrome and overflowing spinner in .update class

fixes #6108

11 years agoremove duplicate
Bjoern Schiessle [Thu, 28 Nov 2013 19:58:32 +0000 (20:58 +0100)]
remove duplicate

11 years agouse better coding style
Bjoern Schiessle [Thu, 28 Nov 2013 18:31:35 +0000 (19:31 +0100)]
use better coding style

11 years agocorrectFolder() already resolves the dirname internally
Bjoern Schiessle [Thu, 28 Nov 2013 15:31:01 +0000 (16:31 +0100)]
correctFolder() already resolves the dirname internally

11 years agoadd PHPDoc for setMimetype()
Bjoern Schiessle [Thu, 28 Nov 2013 18:05:43 +0000 (19:05 +0100)]
add PHPDoc for setMimetype()

11 years agodetect mimetype from the original filename, without the versioning timestamp
Bjoern Schiessle [Thu, 28 Nov 2013 17:59:38 +0000 (18:59 +0100)]
detect mimetype from the original filename, without the versioning timestamp

11 years agodetect mimetype from the original filename, without the delete timestamp
Bjoern Schiessle [Thu, 28 Nov 2013 17:59:12 +0000 (18:59 +0100)]
detect mimetype from the original filename, without the delete timestamp

11 years agowe need to be able to set the mimetype manually
Bjoern Schiessle [Thu, 28 Nov 2013 17:52:58 +0000 (18:52 +0100)]
we need to be able to set the mimetype manually

11 years agoMerge pull request #6090 from ganomi/summaryfix
ganomi [Thu, 28 Nov 2013 16:00:41 +0000 (08:00 -0800)]
Merge pull request #6090 from ganomi/summaryfix

Fix filellist/rename/summary problem

11 years agoMerge pull request #6097 from owncloud/extstorage-ftptrailingslash
Morris Jobke [Thu, 28 Nov 2013 12:52:08 +0000 (04:52 -0800)]
Merge pull request #6097 from owncloud/extstorage-ftptrailingslash

Add trailing slash in FTP root path when missing

11 years agoMerge pull request #6098 from owncloud/files-renamediriconfix
Morris Jobke [Thu, 28 Nov 2013 12:50:17 +0000 (04:50 -0800)]
Merge pull request #6098 from owncloud/files-renamediriconfix

Fixed directory icon after rename

11 years agoMerge pull request #6100 from owncloud/fix_loginnameusage
Morris Jobke [Thu, 28 Nov 2013 12:46:54 +0000 (04:46 -0800)]
Merge pull request #6100 from owncloud/fix_loginnameusage

loginname is not necessarily username

11 years agomake sure that we don't try to access an already deleted files, fixes some file sourc...
Bjoern Schiessle [Thu, 28 Nov 2013 12:17:19 +0000 (13:17 +0100)]
make sure that we don't try to access an already deleted files, fixes some file source not found warnings

11 years agologinname is not necessarily username
Arthur Schiwon [Thu, 28 Nov 2013 12:26:31 +0000 (13:26 +0100)]
loginname is not necessarily username

11 years agoFixed directory icon after rename
Vincent Petry [Thu, 28 Nov 2013 12:15:20 +0000 (13:15 +0100)]
Fixed directory icon after rename

11 years agoownCloud 6 RC1 v6.0.0RC1
Frank Karlitschek [Thu, 28 Nov 2013 12:00:02 +0000 (13:00 +0100)]
ownCloud 6 RC1

11 years agoMerge pull request #6089 from owncloud/files-mimetyperefreshafterrename
Frank Karlitschek [Thu, 28 Nov 2013 11:46:42 +0000 (03:46 -0800)]
Merge pull request #6089 from owncloud/files-mimetyperefreshafterrename

Redetect mime type whenever extension is renamed

11 years agoMerge pull request #6096 from owncloud/files-txtextfornewfiles
Vincent Petry [Thu, 28 Nov 2013 11:38:58 +0000 (03:38 -0800)]
Merge pull request #6096 from owncloud/files-txtextfornewfiles

New file box now has default file name + extension

11 years agoUse getLastError() everywhere.
Andreas Fischer [Thu, 28 Nov 2013 11:05:46 +0000 (12:05 +0100)]
Use getLastError() everywhere.

11 years agoAdd getLastError()
Andreas Fischer [Thu, 28 Nov 2013 11:04:28 +0000 (12:04 +0100)]
Add getLastError()

11 years agoAdd trailing slash in FTP root path when missing
Vincent Petry [Thu, 28 Nov 2013 10:45:26 +0000 (11:45 +0100)]
Add trailing slash in FTP root path when missing

Fixes #6093

11 years agoNo function as oci_last_error. It's oci_error.
Andreas Fischer [Thu, 28 Nov 2013 10:37:29 +0000 (11:37 +0100)]
No function as oci_last_error. It's oci_error.

11 years agoThere is no property such as dbusername. It's 'dbuser'.
Andreas Fischer [Thu, 28 Nov 2013 10:29:04 +0000 (11:29 +0100)]
There is no property such as dbusername. It's 'dbuser'.

11 years agoCorrect property name. It's 'dbpassword', with the 'db' prefix.
Andreas Fischer [Thu, 28 Nov 2013 10:27:05 +0000 (11:27 +0100)]
Correct property name. It's 'dbpassword', with the 'db' prefix.

11 years agoCorrect property name. It's just 'tableprefix', without the 'db' prefix.
Andreas Fischer [Tue, 26 Nov 2013 23:08:07 +0000 (00:08 +0100)]
Correct property name. It's just 'tableprefix', without the 'db' prefix.