Skip to content
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.

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

[v1.17] Update module resources path #393

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 5 additions & 11 deletions Module.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,6 @@
*/
class Module extends \humhub\components\Module
{

/**
* @inheritdoc
*/
public $resourcesPath = 'resources';

/**
* @var int Defines the initial page size of conversation overview inbox sidebar in messenger view. Should be > 6
*/
Expand Down Expand Up @@ -82,11 +76,11 @@ public function getPermissions($contentContainer = null)
{
if (!$contentContainer) {
return [
new StartConversation()
new StartConversation(),
];
} else if ($contentContainer instanceof User) {
} elseif ($contentContainer instanceof User) {
return [
new SendMail()
new SendMail(),
];
}

Expand All @@ -97,14 +91,14 @@ public function getNotifications()
{
return [
MailNotification::class,
ConversationNotification::class
ConversationNotification::class,
];
}

/**
* Determines showInTopNav is enabled or not
*
* @return boolean is showInTopNav enabled
* @return bool is showInTopNav enabled
*/
public function hideInTopNav()
{
Expand Down
4 changes: 4 additions & 0 deletions docs/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
Changelog
=========

3.3.0 (Unreleased)
----------------------
- Fix #393: Update module resources path

3.2.2 (Unreleased)
----------------------
- Enh #382: Implement provider for meta searching
Expand Down
4 changes: 2 additions & 2 deletions module.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
"messenger",
"communication"
],
"version": "3.2.2",
"version": "3.3.0",
"humhub": {
"minVersion": "1.16"
"minVersion": "1.17"
},
"homepage": "https://github.com/humhub/mail",
"authors": [
Expand Down
Loading