Skip to content

Use name from theme when downloading/printing twofactor backup codes. - #14829

Merged
rullzer merged 1 commit into
masterfrom
backupcodes-theme-name
Mar 27, 2019
Merged

Use name from theme when downloading/printing twofactor backup codes.#14829
rullzer merged 1 commit into
masterfrom
backupcodes-theme-name

Conversation

@fancycode

Copy link
Copy Markdown
Member

This helps for people that have twofactor backup codes from different portals (with different names).

@ChristophWurstChristophWurst left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool!

Comment threadapps/twofactor_backupcodes/src/views/PersonalSettings.vue Outdated
Signed-off-by: Joachim Bauch <bauch@struktur.de>
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>

@ChristophWurstChristophWurst left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good!

I rebased & squashed

@faily-bot

faily-botBot commented Mar 26, 2019

Copy link
Copy Markdown

🤖 beep boop beep 🤖

Here are the logs for the failed build:

Status of 17323: failure

ENABLE_REDIS=true, TESTS=nodb-codecov

Show full log
There were 2 failures:
1) Test\L10N\FactoryTest::testGetL10nFilesForApp with data set #3 ('settings', 'de', array('/drone/src/github.com/nextclo...e.json'))
Failed asserting that Array &0 (
0 => '/drone/src/github.com/nextcloud/server/core/l10n/de.json'
) is identical to Array &0 (
0 => '/drone/src/github.com/nextcloud/server/settings/l10n/de.json'
).
/drone/src/github.com/nextcloud/server/tests/lib/L10N/FactoryTest.php:459
2) Test\L10N\FactoryTest::testFindL10NDir with data set #3 ('settings', '/drone/src/github.com/nextclo.../l10n/')
Failed asserting that two strings are identical.
--- Expected
+++ Actual
@@ @@
-'/drone/src/github.com/nextcloud/server/settings/l10n/'
+'/drone/src/github.com/nextcloud/server/core/l10n/'
/drone/src/github.com/nextcloud/server/tests/lib/L10N/FactoryTest.php:481

DB=NODB, ENABLE_REDIS=true, PHP=7.1

Show full log
There were 2 failures:
1) Test\L10N\FactoryTest::testGetL10nFilesForApp with data set #3 ('settings', 'de', array('/drone/src/github.com/nextclo...e.json'))
Failed asserting that Array &0 (
0 => '/drone/src/github.com/nextcloud/server/core/l10n/de.json'
) is identical to Array &0 (
0 => '/drone/src/github.com/nextcloud/server/settings/l10n/de.json'
).
/drone/src/github.com/nextcloud/server/tests/lib/L10N/FactoryTest.php:459
2) Test\L10N\FactoryTest::testFindL10NDir with data set #3 ('settings', '/drone/src/github.com/nextclo.../l10n/')
Failed asserting that two strings are identical.
--- Expected
+++ Actual
@@ @@
-'/drone/src/github.com/nextcloud/server/settings/l10n/'
+'/drone/src/github.com/nextcloud/server/core/l10n/'
/drone/src/github.com/nextcloud/server/tests/lib/L10N/FactoryTest.php:481

DB=NODB, ENABLE_REDIS=false, PHP=7.2

Show full log
There were 2 failures:
1) Test\L10N\FactoryTest::testGetL10nFilesForApp with data set #3 ('settings', 'de', array('/drone/src/github.com/nextclo...e.json'))
Failed asserting that Array &0 (
0 => '/drone/src/github.com/nextcloud/server/core/l10n/de.json'
) is identical to Array &0 (
0 => '/drone/src/github.com/nextcloud/server/settings/l10n/de.json'
).
/drone/src/github.com/nextcloud/server/tests/lib/L10N/FactoryTest.php:459
2) Test\L10N\FactoryTest::testFindL10NDir with data set #3 ('settings', '/drone/src/github.com/nextclo.../l10n/')
Failed asserting that two strings are identical.
--- Expected
+++ Actual
@@ @@
-'/drone/src/github.com/nextcloud/server/settings/l10n/'
+'/drone/src/github.com/nextcloud/server/core/l10n/'
/drone/src/github.com/nextcloud/server/tests/lib/L10N/FactoryTest.php:481

DB=NODB, ENABLE_REDIS=false, PHP=7.3

Show full log
There were 2 failures:
1) Test\L10N\FactoryTest::testGetL10nFilesForApp with data set #3 ('settings', 'de', array('/drone/src/github.com/nextclo...e.json'))
Failed asserting that Array &0 (
0 => '/drone/src/github.com/nextcloud/server/core/l10n/de.json'
) is identical to Array &0 (
0 => '/drone/src/github.com/nextcloud/server/settings/l10n/de.json'
).
/drone/src/github.com/nextcloud/server/tests/lib/L10N/FactoryTest.php:459
2) Test\L10N\FactoryTest::testFindL10NDir with data set #3 ('settings', '/drone/src/github.com/nextclo.../l10n/')
Failed asserting that two strings are identical.
--- Expected
+++ Actual
@@ @@
-'/drone/src/github.com/nextcloud/server/settings/l10n/'
+'/drone/src/github.com/nextcloud/server/core/l10n/'
/drone/src/github.com/nextcloud/server/tests/lib/L10N/FactoryTest.php:481

@juliusknorr

Copy link
Copy Markdown
Member

Drone restarted.

@rullzer
rullzer merged commit 87fbaf5 into masterMar 27, 2019
@rullzer
rullzer deleted the backupcodes-theme-name branch March 27, 2019 18:59
@rullzerrullzer mentioned this pull request Mar 27, 2019
9 tasks
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to reviewWaiting for reviewsbug

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@fancycode@juliusknorr@ChristophWurst@rullzer