]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
10 years agoMerge pull request #11460 from owncloud/fix-10880
Morris Jobke [Wed, 8 Oct 2014 12:08:06 +0000 (14:08 +0200)]
Merge pull request #11460 from owncloud/fix-10880

implement case-insensitive search for groups in sharing dialog

10 years agoMerge pull request #11477 from owncloud/improve-heading-whitespace
Morris Jobke [Wed, 8 Oct 2014 11:48:25 +0000 (13:48 +0200)]
Merge pull request #11477 from owncloud/improve-heading-whitespace

increase whitespace below headings in settings

10 years agoincrease whitespace below headings in settings
Jan-Christoph Borchardt [Wed, 8 Oct 2014 10:46:24 +0000 (12:46 +0200)]
increase whitespace below headings in settings

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 8 Oct 2014 05:54:49 +0000 (01:54 -0400)]
[tx-robot] updated from transifex

10 years agofix for issue #10880
michag86 [Tue, 7 Oct 2014 14:07:48 +0000 (16:07 +0200)]
fix for issue #10880

10 years agoRevert "fix for issue #10880"
Vincent Petry [Tue, 7 Oct 2014 13:54:25 +0000 (15:54 +0200)]
Revert "fix for issue #10880"

This reverts commit 0df070a8e4f6718e3cd86aa4d5a5fc62c53f6eee.

10 years agoMerge pull request #11428 from michag86/patch-1
Morris Jobke [Tue, 7 Oct 2014 13:00:31 +0000 (15:00 +0200)]
Merge pull request #11428 from michag86/patch-1

fix for issue #10483

10 years agoMerge pull request #11451 from owncloud/reduce-bottom-padding
Morris Jobke [Tue, 7 Oct 2014 12:45:21 +0000 (14:45 +0200)]
Merge pull request #11451 from owncloud/reduce-bottom-padding

reduce bottom padding in filelist, fix perceived glitching, fix #11213

10 years agofix for issue #10880
michag86 [Tue, 7 Oct 2014 12:30:14 +0000 (14:30 +0200)]
fix for issue #10880

10 years agorestrict $div to local scope
michag86 [Tue, 7 Oct 2014 09:09:07 +0000 (11:09 +0200)]
restrict $div to local scope

10 years agoMerge pull request #11378 from owncloud/sort-indicator-style
Vincent Petry [Tue, 7 Oct 2014 09:06:37 +0000 (11:06 +0200)]
Merge pull request #11378 from owncloud/sort-indicator-style

fix position and style of sort indicator

10 years agovariable for found avatar div
michag86 [Tue, 7 Oct 2014 08:44:36 +0000 (10:44 +0200)]
variable for found avatar div

10 years agoreduce bottom padding in filelist, fix perceived glitching, fix #11213
Jan-Christoph Borchardt [Tue, 7 Oct 2014 08:44:01 +0000 (10:44 +0200)]
reduce bottom padding in filelist, fix perceived glitching, fix #11213

10 years agoMerge pull request #11437 from owncloud/add-import-filter
Morris Jobke [Tue, 7 Oct 2014 06:28:08 +0000 (08:28 +0200)]
Merge pull request #11437 from owncloud/add-import-filter

Add CssImportFilter. More elegant fix for documents#348

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Tue, 7 Oct 2014 05:54:46 +0000 (01:54 -0400)]
[tx-robot] updated from transifex

10 years agoAdd CssImportFilter. More elegant fix for documents#348
Victor Dubiniuk [Mon, 6 Oct 2014 16:39:02 +0000 (19:39 +0300)]
Add CssImportFilter. More elegant fix for documents#348

10 years agoMerge pull request #11390 from Nemesiz/master
Morris Jobke [Mon, 6 Oct 2014 12:25:27 +0000 (14:25 +0200)]
Merge pull request #11390 from Nemesiz/master

Preview large TXT files fix

10 years agoMerge pull request #11392 from owncloud/fix_version_previews
Morris Jobke [Mon, 6 Oct 2014 11:03:48 +0000 (13:03 +0200)]
Merge pull request #11392 from owncloud/fix_version_previews

we also encrypt/decrypt files in the versions folder

10 years agowe also encrypt/decrypt files in the versions folder for previews and if encryption...
Bjoern Schiessle [Thu, 2 Oct 2014 10:55:46 +0000 (12:55 +0200)]
we also encrypt/decrypt files in the versions folder for previews and if encryption is enabled/disabled

10 years agofix for issue #10483
michag86 [Mon, 6 Oct 2014 06:53:12 +0000 (08:53 +0200)]
fix for issue #10483

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Mon, 6 Oct 2014 05:54:57 +0000 (01:54 -0400)]
[tx-robot] updated from transifex

10 years agoMerge pull request #11424 from owncloud/add-assets-to-gitignore
Morris Jobke [Sun, 5 Oct 2014 20:18:54 +0000 (22:18 +0200)]
Merge pull request #11424 from owncloud/add-assets-to-gitignore

add /assets to gitignore

10 years agoadd /assets to gitignore
Morris Jobke [Sun, 5 Oct 2014 19:19:25 +0000 (21:19 +0200)]
add /assets to gitignore

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 5 Oct 2014 05:54:50 +0000 (01:54 -0400)]
[tx-robot] updated from transifex

10 years agoMerge pull request #11411 from oparoz/imagick-bitmap-previews
Morris Jobke [Sat, 4 Oct 2014 16:26:59 +0000 (18:26 +0200)]
Merge pull request #11411 from oparoz/imagick-bitmap-previews

Bitmap class to handle all Imagick conversions to bitmap

10 years agoNew generic class for Imagemagick conversions
Olivier Paroz [Sat, 4 Oct 2014 15:50:12 +0000 (17:50 +0200)]
New generic class for Imagemagick conversions

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 4 Oct 2014 05:54:35 +0000 (01:54 -0400)]
[tx-robot] updated from transifex

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 3 Oct 2014 05:54:35 +0000 (01:54 -0400)]
[tx-robot] updated from transifex

10 years agoPreview large TXT files fix
Nmz [Thu, 2 Oct 2014 09:47:39 +0000 (12:47 +0300)]
Preview large TXT files fix

Limit the size of the string generating the preview image for TXT files

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 2 Oct 2014 05:54:48 +0000 (01:54 -0400)]
[tx-robot] updated from transifex

10 years agofix position and style of sort indicator
Jan-Christoph Borchardt [Wed, 1 Oct 2014 13:21:28 +0000 (15:21 +0200)]
fix position and style of sort indicator

10 years agoMerge pull request #10104 from owncloud/s3-overwrite
Lukas Reschke [Wed, 1 Oct 2014 11:07:28 +0000 (13:07 +0200)]
Merge pull request #10104 from owncloud/s3-overwrite

Fix S3 copy and rename overwriting target directory

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 1 Oct 2014 10:56:17 +0000 (06:56 -0400)]
[tx-robot] updated from transifex

10 years agoMerge pull request #11356 from owncloud/redirect-only-to-the-same-domain
Lukas Reschke [Wed, 1 Oct 2014 10:47:43 +0000 (12:47 +0200)]
Merge pull request #11356 from owncloud/redirect-only-to-the-same-domain

Redirect only to absolute URL

10 years agoMerge pull request #11368 from owncloud/use-svg-previews
Lukas Reschke [Wed, 1 Oct 2014 09:15:50 +0000 (11:15 +0200)]
Merge pull request #11368 from owncloud/use-svg-previews

Use SVG previews for public sharing

10 years agoMerge pull request #11303 from owncloud/addFilelockToConfig
Lukas Reschke [Wed, 1 Oct 2014 08:43:18 +0000 (10:43 +0200)]
Merge pull request #11303 from owncloud/addFilelockToConfig

Add flock to config

10 years agoMerge pull request #11365 from owncloud/fix-phpdoc
Morris Jobke [Tue, 30 Sep 2014 14:15:37 +0000 (16:15 +0200)]
Merge pull request #11365 from owncloud/fix-phpdoc

Fix PHPDoc

10 years agoMerge pull request #11366 from owncloud/invalid-doc
Morris Jobke [Tue, 30 Sep 2014 14:12:58 +0000 (16:12 +0200)]
Merge pull request #11366 from owncloud/invalid-doc

Remove invalid PHPDoc

10 years agoAdd flock to config
Lukas Reschke [Thu, 25 Sep 2014 16:43:04 +0000 (18:43 +0200)]
Add flock to config

This adds a file lock to the config in hope that this prevents race conditions as reported in https://github.com/owncloud/core/issues/11070

Testplan:

- [ ] Delete config.php and make it read-only => Error is thrown that it is not writeable
- [ ] Installation still works
- [ ] Changing config settings works (i.e. using the SMTP config switches in the administration menu)
- [ ] Your PC didn't blow up
- [ ] Installing the news app and the "Disable AppCode checker" app did not destroy your installation

Only skip the main config

Otherwise read only additional configs might not be processed

Test on tmpdir

10 years agoUse SVG previews for public sharing
Lukas Reschke [Tue, 30 Sep 2014 13:23:16 +0000 (15:23 +0200)]
Use SVG previews for public sharing

Fixes https://github.com/owncloud/core/pull/11367#issuecomment-57306037 and https://github.com/owncloud/core/issues/9218

10 years agoRemove invalid PHPDoc
Lukas Reschke [Tue, 30 Sep 2014 11:42:08 +0000 (13:42 +0200)]
Remove invalid PHPDoc

Despite the documentation this function does not read values from the cookie

10 years agoFix PHPDoc
Lukas Reschke [Tue, 30 Sep 2014 11:34:50 +0000 (13:34 +0200)]
Fix PHPDoc

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Tue, 30 Sep 2014 05:55:11 +0000 (01:55 -0400)]
[tx-robot] updated from transifex

10 years agoMerge pull request #11337 from danbartram/better_encryption_recovery_labels
Lukas Reschke [Mon, 29 Sep 2014 20:06:00 +0000 (22:06 +0200)]
Merge pull request #11337 from danbartram/better_encryption_recovery_labels

Add clickable labels to encryption recovery radios

10 years agoMerge pull request #11352 from owncloud/close-session-for-previews
Lukas Reschke [Mon, 29 Sep 2014 20:03:33 +0000 (22:03 +0200)]
Merge pull request #11352 from owncloud/close-session-for-previews

Close the session for preview generation

10 years agoMerge pull request #11347 from mark0n/create_empty_config
Lukas Reschke [Mon, 29 Sep 2014 19:42:07 +0000 (21:42 +0200)]
Merge pull request #11347 from mark0n/create_empty_config

Add a CLI command that creates an empty LDAP config

10 years agoMerge pull request #10107 from owncloud/sharing_group_shares
Lukas Reschke [Mon, 29 Sep 2014 18:26:41 +0000 (20:26 +0200)]
Merge pull request #10107 from owncloud/sharing_group_shares

[sharing] group shares

10 years agoMerge pull request #11357 from owncloud/kill-dead-code
Thomas Müller [Mon, 29 Sep 2014 18:25:20 +0000 (20:25 +0200)]
Merge pull request #11357 from owncloud/kill-dead-code

Remove dead code

10 years agoRemove dead code
Lukas Reschke [Mon, 29 Sep 2014 15:20:29 +0000 (17:20 +0200)]
Remove dead code

10 years agoRedirect only to absolute URL
Lukas Reschke [Mon, 29 Sep 2014 15:07:43 +0000 (17:07 +0200)]
Redirect only to absolute URL

We do not want to redirect to other domains using the "?redirect_url=" feature. Please notice, that the ownCloud project does not consider open redirectors as security issue.

10 years agoMerge pull request #11321 from owncloud/ldap-fix-memberof-detection
Lukas Reschke [Mon, 29 Sep 2014 12:46:10 +0000 (14:46 +0200)]
Merge pull request #11321 from owncloud/ldap-fix-memberof-detection

dn needs to be fetched to be able to detect memberOf support

10 years agoClose the session for preview generation
Lukas Reschke [Mon, 29 Sep 2014 12:27:44 +0000 (14:27 +0200)]
Close the session for preview generation

Without closing the session every preview image generation is locking the session which makes the webinterface unresponsive.

10 years agoMerge pull request #11324 from owncloud/tryToCreateDatadirectory
Lukas Reschke [Mon, 29 Sep 2014 10:22:20 +0000 (12:22 +0200)]
Merge pull request #11324 from owncloud/tryToCreateDatadirectory

Try to create datadirectory to test whether the .htaccess works

10 years agosome small fixed, suggested by scrutinizer
Bjoern Schiessle [Mon, 29 Sep 2014 09:23:18 +0000 (11:23 +0200)]
some small fixed, suggested by scrutinizer

10 years agothrow a exception if we can't handle the provided path
Bjoern Schiessle [Mon, 29 Sep 2014 09:13:01 +0000 (11:13 +0200)]
throw a exception if we can't handle the provided path

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Mon, 29 Sep 2014 05:54:33 +0000 (01:54 -0400)]
[tx-robot] updated from transifex

10 years agoAdd a CLI command that creates an empty LDAP config
Martin Konrad [Mon, 29 Sep 2014 03:17:53 +0000 (23:17 -0400)]
Add a CLI command that creates an empty LDAP config

This is needed to configure the user_ldap app without using the
wizard (e.g. using tools like Puppet).

10 years agoMerge pull request #11322 from owncloud/adding-unittest-helper
Thomas Müller [Sun, 28 Sep 2014 22:15:14 +0000 (00:15 +0200)]
Merge pull request #11322 from owncloud/adding-unittest-helper

Adding test helper to test private methods

10 years agoMerge pull request #11335 from danbartram/imp_logrotate_conf_example
Morris Jobke [Sun, 28 Sep 2014 21:32:47 +0000 (23:32 +0200)]
Merge pull request #11335 from danbartram/imp_logrotate_conf_example

Clear up confusion of log_rotate_size config value

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 28 Sep 2014 05:55:09 +0000 (01:55 -0400)]
[tx-robot] updated from transifex

10 years agoAdd clickable labels to encryption recovery radios
Dan Bartram [Sat, 27 Sep 2014 15:20:06 +0000 (16:20 +0100)]
Add clickable labels to encryption recovery radios

Add clickable radio button labels to the encryption recovery settings
pages:
* settings-admin
* settings-personal

Pressing on the radio button text now toggles the state of the radio
button.

10 years agoClear up confusion of log_rotate_size config value
Dan Bartram [Sat, 27 Sep 2014 12:27:42 +0000 (13:27 +0100)]
Clear up confusion of log_rotate_size config value

Remove the second comment which could be confused with suggesting an invalid value: `// 100 MiB`.

To keep the easily readable example value, it has been moved into the comment header for the config item.

10 years agoMerge pull request #11304 from owncloud/share-spinner
Morris Jobke [Sat, 27 Sep 2014 08:41:25 +0000 (10:41 +0200)]
Merge pull request #11304 from owncloud/share-spinner

Added spinners in share dropdown

10 years agoMerge pull request #11319 from owncloud/header-owncloud-name
Morris Jobke [Sat, 27 Sep 2014 08:28:53 +0000 (10:28 +0200)]
Merge pull request #11319 from owncloud/header-owncloud-name

for whitelabeled edition, show branding name (e.g. 'ownCloud') instead of appname in header bar

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 27 Sep 2014 05:54:48 +0000 (01:54 -0400)]
[tx-robot] updated from transifex

10 years agoTry to create datadirectory to test whether the .htaccess works
Lukas Reschke [Fri, 26 Sep 2014 15:25:28 +0000 (17:25 +0200)]
Try to create datadirectory to test whether the .htaccess works

Fixes https://github.com/owncloud/core/pull/11299#issuecomment-56968588 and also https://github.com/owncloud/core/issues/10628 together with https://github.com/owncloud/core/pull/11299#issuecomment-56968588 when backported.

10 years agoPrevent monkey clicking on labels
Vincent Petry [Fri, 26 Sep 2014 15:06:16 +0000 (17:06 +0200)]
Prevent monkey clicking on labels

Clicking on labels while the spinner is there will not trigger the
hidden checkbox any more.

10 years agoon unshare only unshare childrens if there is no other parent available
Bjoern Schiessle [Fri, 26 Sep 2014 14:58:47 +0000 (16:58 +0200)]
on unshare only unshare childrens if there is no other parent available

10 years agoAdding test helper to test private methods
Clark Tomlinson [Fri, 26 Sep 2014 14:14:59 +0000 (10:14 -0400)]
Adding test helper to test private methods

10 years agofor whitelabeled edition, show branding name (e.g. 'ownCloud') instead of appname...
Jan-Christoph Borchardt [Fri, 26 Sep 2014 13:38:35 +0000 (15:38 +0200)]
for whitelabeled edition, show branding name (e.g. 'ownCloud') instead of appname in header bar

10 years agodn needs to be fetched to be able to detect memberOf support
Arthur Schiwon [Fri, 26 Sep 2014 13:36:49 +0000 (15:36 +0200)]
dn needs to be fetched to be able to detect memberOf support

10 years agoMerge pull request #11311 from owncloud/fixing-unhandled-exception-cleanTmp-master
Lukas Reschke [Fri, 26 Sep 2014 12:31:31 +0000 (14:31 +0200)]
Merge pull request #11311 from owncloud/fixing-unhandled-exception-cleanTmp-master

catch and log exception in OC_Helper::cleanTmp()

10 years agoAdd ID to markup to have the checkboxes in the right position
Lukas Reschke [Fri, 26 Sep 2014 11:42:47 +0000 (13:42 +0200)]
Add ID to markup to have the checkboxes in the right position

10 years agoAdded spinners in share dropdown
Vincent Petry [Thu, 25 Sep 2014 17:46:30 +0000 (19:46 +0200)]
Added spinners in share dropdown

Added spinners for the following actions:
- adding user
- removing user
- changing password
- toggling allowing upload
- setting a password

10 years agoonly create a new share entry, if the user needs a different target name than the...
Bjoern Schiessle [Fri, 26 Sep 2014 11:19:15 +0000 (13:19 +0200)]
only create a new share entry, if the user needs a different target name than the group share

10 years agofor group shares we don't need a extra db entry of groupTarget equals itemTarget
Bjoern Schiessle [Fri, 26 Sep 2014 11:10:31 +0000 (13:10 +0200)]
for group shares we don't need a extra db entry of groupTarget equals itemTarget

10 years agofor group shares only the parent has the up-to-date permission. Make sure that we...
Bjoern Schiessle [Fri, 26 Sep 2014 11:01:54 +0000 (13:01 +0200)]
for group shares only the parent has the up-to-date permission. Make sure that we always use this permission, except if the user permission is '0' because in this case the user unshared the group share from self

10 years agocatch and log exception in OC_Helper::cleanTmp()
Thomas Müller [Fri, 26 Sep 2014 07:17:47 +0000 (09:17 +0200)]
catch and log exception in OC_Helper::cleanTmp()

10 years agoMerge pull request #11285 from owncloud/dav-permissions-create
Thomas Müller [Fri, 26 Sep 2014 07:21:32 +0000 (09:21 +0200)]
Merge pull request #11285 from owncloud/dav-permissions-create

Fix dav permissions for folders

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 26 Sep 2014 05:54:59 +0000 (01:54 -0400)]
[tx-robot] updated from transifex

10 years agoMerge pull request #11282 from owncloud/scanner-memory-stable7
Robin Appelman [Thu, 25 Sep 2014 13:53:33 +0000 (15:53 +0200)]
Merge pull request #11282 from owncloud/scanner-memory-stable7

Don't keep the full info of all children in memory

10 years agoMerge pull request #10934 from owncloud/datadir-write-setup
Vincent Petry [Thu, 25 Sep 2014 12:32:32 +0000 (14:32 +0200)]
Merge pull request #10934 from owncloud/datadir-write-setup

Don't complain about non-writable datadirs before we're installed

10 years agocall \OCP\Share::getItemsSharedWithUser() to get exclude list, this way all checks...
Bjoern Schiessle [Thu, 25 Sep 2014 11:45:23 +0000 (13:45 +0200)]
call \OCP\Share::getItemsSharedWithUser() to get exclude list, this way all checks are executed, e.g. to check if the share is really visible

10 years agoFix dav permissions for folders without create permissions
Robin Appelman [Wed, 24 Sep 2014 15:50:33 +0000 (17:50 +0200)]
Fix dav permissions for folders without create permissions

10 years agoExpose creatable permissions trough fileinfo
Robin Appelman [Wed, 24 Sep 2014 15:49:52 +0000 (17:49 +0200)]
Expose creatable permissions trough fileinfo

10 years agoalways select permissions, used in getItems()
Bjoern Schiessle [Thu, 25 Sep 2014 10:35:11 +0000 (12:35 +0200)]
always select permissions, used in getItems()

10 years agosome small fixes
Bjoern Schiessle [Thu, 25 Sep 2014 09:29:57 +0000 (11:29 +0200)]
some small fixes

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 25 Sep 2014 05:55:32 +0000 (01:55 -0400)]
[tx-robot] updated from transifex

10 years agoMerge pull request #11286 from owncloud/clarify-possible-formats
Morris Jobke [Wed, 24 Sep 2014 21:55:21 +0000 (23:55 +0200)]
Merge pull request #11286 from owncloud/clarify-possible-formats

Clarify possible preview providers for type Office

10 years agoMerge pull request #11287 from owncloud/kill-with
Morris Jobke [Wed, 24 Sep 2014 21:54:06 +0000 (23:54 +0200)]
Merge pull request #11287 from owncloud/kill-with

Disable external code coverage

10 years agoDisable external code coverage
Lukas Reschke [Wed, 24 Sep 2014 20:35:30 +0000 (22:35 +0200)]
Disable external code coverage

10 years agoClarify possible preview providers for type Office
Lukas Reschke [Wed, 24 Sep 2014 19:16:14 +0000 (21:16 +0200)]
Clarify possible preview providers for type Office

a

10 years agoMerge pull request #11281 from owncloud/scanner-unkown-user
Clark Tomlinson [Wed, 24 Sep 2014 19:11:11 +0000 (15:11 -0400)]
Merge pull request #11281 from owncloud/scanner-unkown-user

Show a proper error message when trying to scan the filesystem for a non...

10 years agoMerge pull request #11225 from owncloud/showLoginAgainInsteadOfJSON
Thomas Müller [Wed, 24 Sep 2014 15:51:12 +0000 (17:51 +0200)]
Merge pull request #11225 from owncloud/showLoginAgainInsteadOfJSON

Show login again instead of JSON if CSRF check fails

10 years agoShow a proper error message when trying to scan the filesystem for a non existing...
Robin Appelman [Wed, 24 Sep 2014 13:48:54 +0000 (15:48 +0200)]
Show a proper error message when trying to scan the filesystem for a non existing user

10 years agoDon't keep the full info of all children in memory
Robin Appelman [Wed, 24 Sep 2014 13:44:56 +0000 (15:44 +0200)]
Don't keep the full info of all children in memory

10 years agoMerge pull request #11229 from kofemann/for-upstream
Lukas Reschke [Wed, 24 Sep 2014 13:19:11 +0000 (15:19 +0200)]
Merge pull request #11229 from kofemann/for-upstream

user/backed: use pow of two for backed action constants

10 years agoMerge pull request #11275 from owncloud/drop-if-e
Morris Jobke [Wed, 24 Sep 2014 12:44:46 +0000 (14:44 +0200)]
Merge pull request #11275 from owncloud/drop-if-e

Drop only if exists

10 years agoclear share table after each test run
Bjoern Schiessle [Mon, 22 Sep 2014 16:13:40 +0000 (18:13 +0200)]
clear share table after each test run

10 years agoonly add a new row if it isn't a unique share, otherwise update the existing row
Bjoern Schiessle [Thu, 18 Sep 2014 12:46:11 +0000 (14:46 +0200)]
only add a new row if it isn't a unique share, otherwise update the existing row