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 #220

Open
wants to merge 2 commits 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
21 changes: 3 additions & 18 deletions Module.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@

class Module extends ContentContainerModule
{

public $resourcesPath = 'resources';

/**
* @var string sort name as 'name', 'size', 'updated_at'
* @see FileSystemItemRow::ORDER_MAPPING
Expand All @@ -33,18 +30,6 @@ class Module extends ContentContainerModule
public $defaultPostedFilesSort = FileSystemItemRow::ORDER_TYPE_UPDATED_AT;
public $defaultPostedFilesOrder = 'ASC';

/**
* @var string default order of file entries e.g.: 'file.updated_at ASC' or 'title ASC'
*/
public $defaultFolderOrder = 'title ASC';

const ORDER_NAME = 'name';
const ORDER_UPDATED_AT = 'updated_at';
const ORDER_SIZE = 'size';

const UPLOAD_BEHAVIOUR_INDEX = 0;
const UPLOAD_BEHAVIOUR_REPLACE = 1;

/**
* @inheritdoc
*/
Expand All @@ -64,8 +49,8 @@ public function init()
public function getContentContainerTypes()
{
return [
Space::className(),
User::className()
Space::class,
User::class,
];
}

Expand Down Expand Up @@ -156,7 +141,7 @@ public function getConfigUrl()
/**
* Determines ZIP Support is enabled or not
*
* @return boolean is ZIP support enabled
* @return bool is ZIP support enabled
*/
public function isZipSupportEnabled(): bool
{
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
=========

0.17.0 - Unreleased
-------------------------
- Fix #220: Update module resources path

0.16.7 - Unreleased
-------------------------
- Fix #216: Fix image space rending on wall entry
Expand Down
20 changes: 10 additions & 10 deletions module.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
"organisation",
"sharing"
],
"version": "0.16.7",
"version": "0.17.0",
"humhub": {
"minVersion": "1.14"
"minVersion": "1.17"
},
"homepage": "https://github.com/humhub/cfiles",
"authors": [
Expand All @@ -27,13 +27,13 @@

],
"screenshots": [
"assets/screenshot1.png",
"assets/screenshot2.png",
"assets/screenshot3.png",
"assets/screenshot4.png",
"assets/screenshot5.png",
"assets/screenshot6.png",
"assets/screenshot7.png",
"assets/screenshot8.png"
"resources/screenshot1.png",
"resources/screenshot2.png",
"resources/screenshot3.png",
"resources/screenshot4.png",
"resources/screenshot5.png",
"resources/screenshot6.png",
"resources/screenshot7.png",
"resources/screenshot8.png"
]
}
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
Loading