cacert-devel.git
5 years agobug 1221: added `deleted` = 0
Benny Baumann [Tue, 19 Nov 2013 22:02:00 +0000 (23:02 +0100)] 
bug 1221: added `deleted` = 0

5 years agobug 1221: added `deleted` = 0 to general.php
Benny Baumann [Tue, 19 Nov 2013 21:56:04 +0000 (22:56 +0100)] 
bug 1221: added `deleted` = 0 to general.php

5 years agobug 1221: fixed typo, added `deleted` = 0 to wot.php
INOPIAE [Mon, 11 Nov 2013 00:11:04 +0000 (01:11 +0100)] 
bug 1221: fixed typo, added `deleted` = 0 to wot.php

5 years agobug 1221: changed delete assurance to update "deleted = NOW()", added `deleted` ...
Benny Baumann [Tue, 19 Nov 2013 21:53:49 +0000 (22:53 +0100)] 
bug 1221: changed delete assurance to update "deleted = NOW()", added `deleted` = 0 to all queries on notary

5 years agoMerge remote-tracking branch 'origin/bug-1219' into release
Michael Tänzer [Wed, 6 Nov 2013 15:22:50 +0000 (16:22 +0100)] 
Merge remote-tracking branch 'origin/bug-1219' into release

5 years agoMerge remote-tracking branch 'origin/bug-1213' into release
Michael Tänzer [Wed, 6 Nov 2013 15:07:34 +0000 (16:07 +0100)] 
Merge remote-tracking branch 'origin/bug-1213' into release

5 years agobug 1219: added equal bug-1219
INOPIAE [Sun, 3 Nov 2013 19:38:52 +0000 (20:38 +0100)] 
bug 1219: added equal

5 years agobug 1219: changed comment sytax to html
INOPIAE [Sun, 3 Nov 2013 19:32:19 +0000 (20:32 +0100)] 
bug 1219: changed comment sytax to html

5 years agobug 1219: fixed calculation for GPG expired, added some comments
INOPIAE [Sun, 3 Nov 2013 07:14:41 +0000 (08:14 +0100)] 
bug 1219: fixed calculation for GPG expired, added some comments

5 years agoMerge branch 'bug-411' into release
Benny Baumann [Wed, 23 Oct 2013 17:48:36 +0000 (19:48 +0200)] 
Merge branch 'bug-411' into release

5 years agobug 411: fixed typo bug-411
INOPIAE [Tue, 22 Oct 2013 21:30:54 +0000 (23:30 +0200)] 
bug 411: fixed typo

5 years agobug 411: added switch all certifcates - hide certificates on top and bottom of client...
INOPIAE [Tue, 22 Oct 2013 21:00:52 +0000 (23:00 +0200)] 
bug 411: added switch all certifcates - hide certificates on top and bottom of client and cert view

5 years agoMerge branch 'bug-1003' into release
Benny Baumann [Mon, 21 Oct 2013 21:29:23 +0000 (23:29 +0200)] 
Merge branch 'bug-1003' into release

5 years agoMerge branch 'tarballs' into release
Michael Tänzer [Sun, 20 Oct 2013 15:16:41 +0000 (17:16 +0200)] 
Merge branch 'tarballs' into release

5 years agoSource code taken from cacert-20131016.tar.bz2
Michael Tänzer [Sun, 20 Oct 2013 15:14:39 +0000 (17:14 +0200)] 
Source code taken from cacert-20131016.tar.bz2

5 years agoMerge branch 'bug-569' into release
Benny Baumann [Wed, 16 Oct 2013 15:36:55 +0000 (17:36 +0200)] 
Merge branch 'bug-569' into release

5 years agobug 1003: Add debug output so we can trace where the mails got lost bug-1003
Michael Tänzer [Tue, 15 Oct 2013 21:33:01 +0000 (23:33 +0200)] 
bug 1003: Add debug output so we can trace where the mails got lost

Signed-off-by: Michael Tänzer <neo@nhng.de>
5 years agobug 1003: Revert the addition of the "level" flag property and use the parsed value
Michael Tänzer [Tue, 15 Oct 2013 20:49:37 +0000 (22:49 +0200)] 
bug 1003: Revert the addition of the "level" flag property and use the parsed value
instead to avoid inconsistencies

Signed-off-by: Michael Tänzer <neo@nhng.de>
5 years agoMerge branch 'bug-918' into release
Benny Baumann [Tue, 15 Oct 2013 20:36:31 +0000 (22:36 +0200)] 
Merge branch 'bug-918' into release

5 years agoMerge branch 'bug-1199' into release
Benny Baumann [Tue, 15 Oct 2013 20:34:53 +0000 (22:34 +0200)] 
Merge branch 'bug-1199' into release

5 years agoMerge branch 'bug-1182' into release
Benny Baumann [Tue, 15 Oct 2013 20:32:00 +0000 (22:32 +0200)] 
Merge branch 'bug-1182' into release

5 years agoMerge branch 'bug-1208' into release
Benny Baumann [Tue, 15 Oct 2013 20:28:23 +0000 (22:28 +0200)] 
Merge branch 'bug-1208' into release

5 years agobug-1208: fix html typo 2nd bug-1208
Martin Gummi [Tue, 8 Oct 2013 23:26:15 +0000 (01:26 +0200)] 
bug-1208: fix html typo 2nd

5 years agobug-1208: fix html typo
Martin Gummi [Tue, 8 Oct 2013 23:20:08 +0000 (01:20 +0200)] 
bug-1208: fix html typo

5 years agobug 1003: Actually send it to the support engineers
Michael Tänzer [Tue, 8 Oct 2013 21:50:36 +0000 (23:50 +0200)] 
bug 1003: Actually send it to the support engineers

Signed-off-by: Michael Tänzer <neo@nhng.de>
5 years agobug 1213: fixed some more typos of certficate to certificate bug-1213
INOPIAE [Tue, 1 Oct 2013 21:57:44 +0000 (23:57 +0200)] 
bug 1213: fixed some more typos of certficate to certificate

5 years agobug-1208: formating lower case
Martin Gummi [Tue, 1 Oct 2013 21:20:58 +0000 (23:20 +0200)] 
bug-1208: formating lower case

5 years agobug 1213: fixed certifictate to certificate
INOPIAE [Tue, 1 Oct 2013 19:20:41 +0000 (21:20 +0200)] 
bug 1213: fixed certifictate to certificate

5 years agobug-1208: formating
Martin Gummi [Tue, 1 Oct 2013 16:24:53 +0000 (18:24 +0200)] 
bug-1208: formating

5 years agobug 1003: change part of TTP admin
INOPIAE [Tue, 24 Sep 2013 21:13:21 +0000 (23:13 +0200)] 
bug 1003: change part of TTP admin

5 years agobug 1199: Escape the keyid if it's put into a shell command and get rid of bug-1199
Michael Tänzer [Tue, 17 Sep 2013 20:52:52 +0000 (22:52 +0200)] 
bug 1199: Escape the keyid if it's put into a shell command and get rid of
variable shadowing/overwriting

Signed-off-by: Michael Tänzer <neo@nhng.de>
5 years agobug-1208: spacing
Martin Gummi [Sat, 14 Sep 2013 14:31:58 +0000 (16:31 +0200)] 
bug-1208: spacing

5 years agobug-1208: Formatting uppercase to lowercase
Martin Gummi [Sat, 14 Sep 2013 14:01:54 +0000 (16:01 +0200)] 
bug-1208: Formatting uppercase to lowercase

5 years agobug-1208: whitespace
Martin Gummi [Sat, 14 Sep 2013 12:16:04 +0000 (14:16 +0200)] 
bug-1208: whitespace

bug-1208: whitespaces

5 years agobug-1208: whitespace
Martin Gummi [Sat, 14 Sep 2013 12:16:04 +0000 (14:16 +0200)] 
bug-1208: whitespace

5 years agobug-1208: define empty CSS classes for accountdetail
Martin Gummi [Sat, 14 Sep 2013 12:15:18 +0000 (14:15 +0200)] 
bug-1208: define empty CSS classes for accountdetail

5 years agobug-1208: CSS remove mname italic
Martin Gummi [Sat, 14 Sep 2013 08:29:03 +0000 (10:29 +0200)] 
bug-1208: CSS remove mname italic

5 years agobug-1208: all names shown on all text lines
Martin Gummi [Tue, 10 Sep 2013 23:38:18 +0000 (01:38 +0200)] 
bug-1208: all names shown on all text lines

5 years agobug-1208: CSS Formatting
Martin Gummi [Tue, 10 Sep 2013 23:18:13 +0000 (01:18 +0200)] 
bug-1208: CSS Formatting

5 years agobug 1208: Only one attribute per line for CSS styles
Benny Baumann [Tue, 10 Sep 2013 22:36:25 +0000 (00:36 +0200)] 
bug 1208: Only one attribute per line for CSS styles

5 years agobug 1208: Last Resort has no space in name when installed locally
Benny Baumann [Tue, 10 Sep 2013 22:21:12 +0000 (00:21 +0200)] 
bug 1208: Last Resort has no space in name when installed locally

5 years agobug 1208: Formatting and spacing
Benny Baumann [Tue, 10 Sep 2013 22:20:18 +0000 (00:20 +0200)] 
bug 1208: Formatting and spacing

5 years agobug-1208: add Last Resort
Martin Gummi [Tue, 10 Sep 2013 22:14:18 +0000 (00:14 +0200)] 
bug-1208: add Last Resort

5 years agobug-1208: chg accountdetail.suffix
Martin Gummi [Tue, 10 Sep 2013 22:09:12 +0000 (00:09 +0200)] 
bug-1208: chg accountdetail.suffix

5 years agobug-1208: remove colon in notary.inc.php
Martin Gummi [Tue, 10 Sep 2013 21:50:02 +0000 (23:50 +0200)] 
bug-1208: remove colon in notary.inc.php

5 years agobug-1208: add CSS accountdetail
Martin Gummi [Tue, 10 Sep 2013 21:29:29 +0000 (23:29 +0200)] 
bug-1208: add CSS accountdetail

5 years agoMerge branch 'bug-1190' into release
Benny Baumann [Mon, 9 Sep 2013 19:02:59 +0000 (21:02 +0200)] 
Merge branch 'bug-1190' into release

5 years agobug 1208: Fix missing closing brackets
Benny Baumann [Mon, 9 Sep 2013 00:43:33 +0000 (02:43 +0200)] 
bug 1208: Fix missing closing brackets

5 years agobug 1208: Only use up to 3 parts of the date
Benny Baumann [Mon, 9 Sep 2013 00:25:00 +0000 (02:25 +0200)] 
bug 1208: Only use up to 3 parts of the date

5 years agobug 1208: Better show where $name is used
Benny Baumann [Mon, 9 Sep 2013 00:24:29 +0000 (02:24 +0200)] 
bug 1208: Better show where $name is used

5 years ago1208: Split long lines for better readability
Benny Baumann [Mon, 9 Sep 2013 00:20:57 +0000 (02:20 +0200)] 
1208: Split long lines for better readability

5 years agobug 1208: declare constants away from normal source
Benny Baumann [Mon, 9 Sep 2013 00:20:09 +0000 (02:20 +0200)] 
bug 1208: declare constants away from normal source

5 years agobug-1208: prepare Name and DoB for highlighting
Martin Gummi [Sun, 8 Sep 2013 23:58:46 +0000 (01:58 +0200)] 
bug-1208: prepare Name and DoB for highlighting

5 years agoMerge branch 'tarballs' into release
Michael Tänzer [Sun, 8 Sep 2013 20:01:16 +0000 (22:01 +0200)] 
Merge branch 'tarballs' into release

Conflicts:
includes/account.php

Signed-off-by: Michael Tänzer <neo@nhng.de>
5 years agoSource code taken from cacert-20130906.tar.bz2
Michael Tänzer [Sun, 8 Sep 2013 19:35:14 +0000 (21:35 +0200)] 
Source code taken from cacert-20130906.tar.bz2

5 years agoRelease: Remove left-over merge markers
Michael Tänzer [Sun, 8 Sep 2013 19:22:35 +0000 (21:22 +0200)] 
Release: Remove left-over merge markers

Signed-off-by: Michael Tänzer <neo@nhng.de>
5 years agoMerge branch 'merge-bug-1177-893-1136-1123-1137' into release
Benny Baumann [Fri, 6 Sep 2013 03:40:36 +0000 (05:40 +0200)] 
Merge branch 'merge-bug-1177-893-1136-1123-1137' into release

Conflicts:
www/gpg.php

5 years agobug 1137: Revert patch from Ted, because of inconsistencies. Also fix a typo in the... merge-bug-1177-893-1136-1123-1137
Benny Baumann [Tue, 3 Sep 2013 21:31:02 +0000 (23:31 +0200)] 
bug 1137: Revert patch from Ted, because of inconsistencies. Also fix a typo in the comment above

5 years agobug 1177: Remove unused function
Michael Tänzer [Tue, 3 Sep 2013 21:12:56 +0000 (23:12 +0200)] 
bug 1177: Remove unused function

Signed-off-by: Michael Tänzer <neo@nhng.de>
5 years agoReplaced "Trusted 3rd Parties" by "Trusted Third Parties", "Trusted 3rd Parties"...
Bernhard Fröhlich [Sun, 1 Sep 2013 15:29:41 +0000 (17:29 +0200)] 
Replaced "Trusted 3rd Parties" by "Trusted Third Parties", "Trusted 3rd Parties" is not documented

5 years agoChange proposed during review
Bernhard Fröhlich [Sun, 1 Sep 2013 15:28:33 +0000 (17:28 +0200)] 
Change proposed during review

5 years agobug 569: Fix wording bug-569
Michael Tänzer [Tue, 27 Aug 2013 22:47:38 +0000 (00:47 +0200)] 
bug 569: Fix wording

Signed-off-by: Michael Tänzer <neo@nhng.de>
5 years agoMerge remote-tracking branch 'origin/bug-663' into release
Michael Tänzer [Sun, 25 Aug 2013 19:07:02 +0000 (21:07 +0200)] 
Merge remote-tracking branch 'origin/bug-663' into release

5 years agoMerge branch 'bug-1198' into release
Michael Tänzer [Sun, 25 Aug 2013 18:56:36 +0000 (20:56 +0200)] 
Merge branch 'bug-1198' into release

5 years agoMerge branch 'bug-1200' into release
Michael Tänzer [Sun, 25 Aug 2013 18:51:39 +0000 (20:51 +0200)] 
Merge branch 'bug-1200' into release

5 years agoMerge branch 'release' into bug-1017 bug-1017
Michael Tänzer [Sun, 25 Aug 2013 18:22:30 +0000 (20:22 +0200)] 
Merge branch 'release' into bug-1017

Conflicts:
pages/account/6.php

Signed-off-by: Michael Tänzer <neo@nhng.de>
5 years agoMerge branch 'bug-1123' into merge-bug-1177-893-1136-1123-1137
Michael Tänzer [Sat, 24 Aug 2013 22:53:20 +0000 (00:53 +0200)] 
Merge branch 'bug-1123' into merge-bug-1177-893-1136-1123-1137

Conflicts:
pages/account/10.php

Signed-off-by: Michael Tänzer <neo@nhng.de>
5 years agoMerge branch 'release' into bug-1123 bug-1123
Michael Tänzer [Sat, 24 Aug 2013 22:46:28 +0000 (00:46 +0200)] 
Merge branch 'release' into bug-1123

Conflicts:
includes/account.php
pages/account/10.php
pages/account/3.php
pages/gpg/0.php
www/gpg.php

Signed-off-by: Michael Tänzer <neo@nhng.de>
5 years agoRevert "bug 1123: fixed merge conflicts on testserver"
Michael Tänzer [Sat, 24 Aug 2013 22:27:52 +0000 (00:27 +0200)] 
Revert "bug 1123: fixed merge conflicts on testserver"

This reverts commit 75693292de2d907bf2a4b0f12abd7cd68781f95a.

5 years agoMerge branch 'bug-1137' into merge-bug-1177-893-1136-1123-1137
Michael Tänzer [Sat, 24 Aug 2013 15:04:44 +0000 (17:04 +0200)] 
Merge branch 'bug-1137' into merge-bug-1177-893-1136-1123-1137

5 years agobug 1137: get rid of the board flag, which has already been removed in the release
Michael Tänzer [Sat, 24 Aug 2013 13:59:31 +0000 (15:59 +0200)] 
bug 1137: get rid of the board flag, which has already been removed in the release
branch but somehow this change got lost in this branch (during merge conflict resolution)

Signed-off-by: Michael Tänzer <neo@nhng.de>
5 years agobug 1137: setting the "certify" check box should depend on the method selected not on
Michael Tänzer [Sat, 24 Aug 2013 13:41:19 +0000 (15:41 +0200)] 
bug 1137: setting the "certify" check box should depend on the method selected not on
whether one is TTP Assurer

Signed-off-by: Michael Tänzer <neo@nhng.de>
5 years agobug 1137: mysql_real_escape() fields in user_agreements although they usually are not
Michael Tänzer [Sat, 24 Aug 2013 13:30:48 +0000 (15:30 +0200)] 
bug 1137: mysql_real_escape() fields in user_agreements although they usually are not
user provided, just to be sure

Signed-off-by: Michael Tänzer <neo@nhng.de>
6 years agobug 1190: force linebreaks to be visible on the frontpage bug-1190
Benny Baumann [Tue, 20 Aug 2013 19:43:48 +0000 (21:43 +0200)] 
bug 1190: force linebreaks to be visible on the frontpage

6 years agobug-1190: improve links for mobile devices
Benny Baumann [Tue, 20 Aug 2013 19:41:55 +0000 (21:41 +0200)] 
bug-1190: improve links for mobile devices

6 years agobug 1190: RSS may contain HTML markup => decode it and then encode it again
Michael Tänzer [Wed, 14 Aug 2013 20:45:32 +0000 (22:45 +0200)] 
bug 1190: RSS may contain HTML markup => decode it and then encode it again

Signed-off-by: Michael Tänzer <neo@nhng.de>
6 years agoMerge branch 'bug-893' into merge-bug-1177-893-1136-1123-1137
Michael Tänzer [Wed, 14 Aug 2013 19:41:51 +0000 (21:41 +0200)] 
Merge branch 'bug-893' into merge-bug-1177-893-1136-1123-1137

6 years agobug 893: domaincerts has no column memid, it has to be referenced via domains bug-893
Michael Tänzer [Wed, 14 Aug 2013 19:37:38 +0000 (21:37 +0200)] 
bug 893: domaincerts has no column memid, it has to be referenced via domains

Signed-off-by: Michael Tänzer <neo@nhng.de>
6 years agoMerge branch 'bug-1123' into merge-bug-1177-893-1136-1123-1137
Benny Baumann [Tue, 13 Aug 2013 19:25:28 +0000 (21:25 +0200)] 
Merge branch 'bug-1123' into merge-bug-1177-893-1136-1123-1137

Conflicts:
includes/account.php
pages/account/10.php
pages/account/3.php
pages/gpg/0.php
www/gpg.php

6 years agoMerge branch 'bug-1137' into merge-bug-1177-893-1136-1123-1137
Benny Baumann [Tue, 13 Aug 2013 19:14:27 +0000 (21:14 +0200)] 
Merge branch 'bug-1137' into merge-bug-1177-893-1136-1123-1137

Conflicts:
includes/notary.inc.php

6 years agobug 1200: Fix missing dollar sign before error handling bug-1200
Benny Baumann [Thu, 8 Aug 2013 05:45:02 +0000 (07:45 +0200)] 
bug 1200: Fix missing dollar sign before error handling

6 years agobug 1200: Doh, STDOUT is the *third* parameter of runCommand()
Michael Tänzer [Wed, 7 Aug 2013 01:05:31 +0000 (03:05 +0200)] 
bug 1200: Doh, STDOUT is the *third* parameter of runCommand()

Signed-off-by: Michael Tänzer <neo@nhng.de>
6 years agobug 1200: Use a freshly created temporary directory as gpg homedir
Michael Tänzer [Wed, 7 Aug 2013 00:43:02 +0000 (02:43 +0200)] 
bug 1200: Use a freshly created temporary directory as gpg homedir

Signed-off-by: Michael Tänzer <neo@nhng.de>
6 years agobug 1200: Use runCommand() to execute gpg to avoid using an unneeded tempfile
Michael Tänzer [Tue, 6 Aug 2013 23:45:09 +0000 (01:45 +0200)] 
bug 1200: Use runCommand() to execute gpg to avoid using an unneeded tempfile

Signed-off-by: Michael Tänzer <neo@nhng.de>
6 years agobug 1199: Remove left over debugging code
Michael Tänzer [Tue, 6 Aug 2013 22:39:46 +0000 (00:39 +0200)] 
bug 1199: Remove left over debugging code

Signed-off-by: Michael Tänzer <neo@nhng.de>
6 years agobug 1136: Fix things that got lost in a merge some time ago bug-1136
Michael Tänzer [Tue, 6 Aug 2013 21:37:47 +0000 (23:37 +0200)] 
bug 1136: Fix things that got lost in a merge some time ago

Signed-off-by: Michael Tänzer <neo@nhng.de>
6 years agobug 1136: Use optimised SQL query from bug #922
Michael Tänzer [Tue, 6 Aug 2013 21:37:06 +0000 (23:37 +0200)] 
bug 1136: Use optimised SQL query from bug #922

Signed-off-by: Michael Tänzer <neo@nhng.de>
6 years agoMerge branch 'bug-893' into bug-1136
Michael Tänzer [Tue, 6 Aug 2013 21:09:32 +0000 (23:09 +0200)] 
Merge branch 'bug-893' into bug-1136

Conflicts:
        includes/notary.inc.php

Signed-off-by: Michael Tänzer <neo@nhng.de>
6 years agobug 893: Doh, forgot to adjust variable after copy & paste
Michael Tänzer [Wed, 31 Jul 2013 20:19:29 +0000 (22:19 +0200)] 
bug 893: Doh, forgot to adjust variable after copy & paste

Signed-off-by: Michael Tänzer <neo@nhng.de>
6 years agobug 893: A bit more efficiency in account_delete()
Michael Tänzer [Wed, 31 Jul 2013 19:41:14 +0000 (21:41 +0200)] 
bug 893: A bit more efficiency in account_delete()

Signed-off-by: Michael Tänzer <neo@nhng.de>
6 years agobug 893: Always trim() arbitration number
Michael Tänzer [Wed, 31 Jul 2013 19:40:01 +0000 (21:40 +0200)] 
bug 893: Always trim() arbitration number

Signed-off-by: Michael Tänzer <neo@nhng.de>
6 years agobug 893: Also add the check for the revocation date to the non-CCA version
Michael Tänzer [Wed, 31 Jul 2013 19:25:45 +0000 (21:25 +0200)] 
bug 893: Also add the check for the revocation date to the non-CCA version
of check_*_cert_running()

Signed-off-by: Michael Tänzer <neo@nhng.de>
6 years agobug 893: Use optimised SQL query from bug #922
Michael Tänzer [Wed, 31 Jul 2013 17:26:51 +0000 (19:26 +0200)] 
bug 893: Use optimised SQL query from bug #922

Signed-off-by: Michael Tänzer <neo@nhng.de>
6 years agobug-1198: Non-functional clean-ups (wording, markup) bug-1198
Michael Tänzer [Tue, 30 Jul 2013 22:24:55 +0000 (00:24 +0200)] 
bug-1198: Non-functional clean-ups (wording, markup)

Signed-off-by: Michael Tänzer <neo@nhng.de>
6 years agobug-1198: crop the payment icon to the same size as the subscribe icon
Michael Tänzer [Tue, 30 Jul 2013 22:07:06 +0000 (00:07 +0200)] 
bug-1198: crop the payment icon to the same size as the subscribe icon

Signed-off-by: Michael Tänzer <neo@nhng.de>
6 years agobug-1198: Use EUR because the Euro sign was not properly displayed
Michael Tänzer [Tue, 30 Jul 2013 22:06:30 +0000 (00:06 +0200)] 
bug-1198: Use EUR because the Euro sign was not properly displayed

6 years agobug-1198: Update the membership fee buttons
Michael Tänzer [Tue, 30 Jul 2013 21:49:30 +0000 (23:49 +0200)] 
bug-1198: Update the membership fee buttons

Signed-off-by: Michael Tänzer <neo@nhng.de>
6 years agoMerge branch 'bug-1177' into bug-1137
Benny Baumann [Tue, 23 Jul 2013 21:39:34 +0000 (23:39 +0200)] 
Merge branch 'bug-1177' into bug-1137

6 years agoMerge branch 'bug-893' into bug-1136
Benny Baumann [Tue, 23 Jul 2013 21:39:06 +0000 (23:39 +0200)] 
Merge branch 'bug-893' into bug-1136

6 years agoMerge branch 'bug-1177' into bug-893
Benny Baumann [Tue, 23 Jul 2013 21:38:31 +0000 (23:38 +0200)] 
Merge branch 'bug-1177' into bug-893