Skip to content

[stable20] Fix mail table columns to match the activity table #511

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nickvergessen merged 2 commits into from
Oct 7, 2020
Merged

[stable20] Fix mail table columns to match the activity table #511

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9188708
Fix mail table columns to match the activity table
nickvergessen Oct 6, 2020
92dd8a4
Shorten app id to fit into 32 chars
nickvergessen Oct 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Shorten app id to fit into 32 chars 
Signed-off-by: Joas Schilling <[email protected]>
  • Loading branch information
@nickvergessen
nickvergessen committed Oct 6, 2020
commit 92dd8a46d51392361c532990e11b42abc24a2800
2 changes: 1 addition & 1 deletion appinfo/info.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
More information is available in the Activity documentation.
</description>

<version>2.13.1</version>
<version>2.13.2</version>
<licence>agpl</licence>
<author>Frank Karlitschek</author>
<author>Joas Schilling</author>
Expand Down
4 changes: 2 additions & 2 deletions tests/MailQueueHandlerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ class MailQueueHandlerTest extends TestCase {
protected function setUp(): void {
parent::setUp();

$app = self::getUniqueID('MailQueueHandlerTest');
$app = self::getUniqueID('MailQueueHandlerTest', 10);
$this->userManager = $this->createMock(IUserManager::class);
$this->lFactory = $this->createMock(IFactory::class);
$this->config = $this->createMock(IConfig::class);
Expand Down Expand Up @@ -219,7 +219,7 @@ public function testGetItemsForUser(): void {
. ' (`amq_appid`, `amq_subject`, `amq_subjectparams`, `amq_affecteduser`, `amq_timestamp`, `amq_type`, `amq_latest_send`) '
. ' VALUES(?, ?, ?, ?, ?, ?, ?)');

$app = self::getUniqueID('MailQueueHandlerTest');
$app = self::getUniqueID('MailQueueHandlerTest', 10);
for ($i = 0; $i < 15; $i++) {
$query->execute(array($app, 'Test data', 'Param1', 'user1', 150, 'phpunit', 160 + $i));
}
Expand Down