Skip to content

Commit b910dc0

Browse files
lastlinklastlink
authored
Merge pull request #113 from funktechno/dev
0.4.1 update
2 parents ade8c0b + 0ca2df3 commit b910dc0

8 files changed

Lines changed: 108 additions & 18 deletions

File tree

‎.github/ISSUE_TEMPLATE/bug_report.md‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
**Describe the bug**
11+
A clear and concise description of what the bug is.
12+
13+
**Notify authors**
14+
* @lastlink, @imfx77
15+
16+
**To Reproduce**
17+
Steps to reproduce the behavior:
18+
1. Go to '...'
19+
2. Click on '....'
20+
3. Scroll down to '....'
21+
4. See error
22+
23+
**Expected behavior**
24+
A clear and concise description of what you expected to happen.
25+
26+
**Screenshots**
27+
If applicable, add screenshots to help explain your problem.
28+
29+
**Desktop (please complete the following information):**
30+
- OS: [e.g. iOS]
31+
- Browser [e.g. chrome, safari]
32+
- Version [e.g. 22]
33+
34+
**Smartphone (please complete the following information):**
35+
- Device: [e.g. iPhone6]
36+
- OS: [e.g. iOS8.1]
37+
- Browser [e.g. stock browser, safari]
38+
- Version [e.g. 22]
39+
40+
**Additional context**
41+
Add any other context about the problem here.

‎.github/ISSUE_TEMPLATE/config.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
blank_issues_enabled: false

‎.github/ISSUE_TEMPLATE/feature_request.md‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
---
2+
name: Feature request
3+
about: Suggest an idea for this project
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
**Notify authors**
11+
* @lastlink, @imfx77
12+
13+
**Is your feature request related to a problem? Please describe.**
14+
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
15+
16+
**Describe the solution you'd like**
17+
A clear and concise description of what you want to happen.
18+
19+
**Describe alternatives you've considered**
20+
A clear and concise description of any alternative solutions or features you've considered.
21+
22+
**Additional context**
23+
Add any other context or screenshots about the feature request here.

‎.github/pull_request_template.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
### All Submissions:
22
* Notify authors: @lastlink
33
* [ ] Have you updated the ChangeLog with your proposed changes?
4-
* [ ] Have you checked to ensure there aren't other open [Pull Requests](../../pulls) for the same update/change?
4+
* [ ] Have you checked to ensure there aren't other open [Pull Requests](https://github.com/funktechno/kanboard-plugin-wiki/pulls) for the same update/change?
55
* pr update to master branch
6-
* [ ] Have you updated the getPluginVersion() in Plugin.php and Makefile version appropriately?
6+
* [ ] Have you updated the getPluginVersion() in Plugin.php?
77
### New Feature Submissions:
88

99
* [ ] Have you added an explanation of what your changes do and why you'd like us to include them?

‎ChangeLog.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# Changelog
22

3+
## Version 0.4.1
4+
* contributors: @imfx77
5+
6+
---
7+
8+
### Bug fixes:
9+
* Branching the preview of images attached to a Wiki page due to a change of core API in KB v1.2.38
10+
311
## Version 0.4.0
412
* contributors: @imfx77
513

‎Makefile‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1-
plugin=Wiki
2-
version=0.4.0
1+
extract = $(shell grep -A2 $(1) Plugin.php | tail -n1 | tr -d " ;'" | sed "s/return//")
2+
3+
plugin = $(call extract, getPluginName)
4+
version = $(call extract, getPluginVersion)
5+
36
all:
4-
@ echo "Build archive for plugin ${plugin} version=${version}"
5-
@ git archive HEAD --prefix=${plugin}/ --format=zip -o ${plugin}-${version}.zip
7+
@echo "Build archive for plugin ${plugin} version=${version}"
8+
@git archive HEAD . :!.github :!.gitignore :!Test :!ChangeLog.md :!README.md :!Makefile --prefix=${plugin}/ --format=zip -9 -o ${plugin}-${version}.zip

‎Plugin.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public function getPluginAuthor()
100100

101101
public function getPluginVersion()
102102
{
103-
return '0.4.0';
103+
return '0.4.1';
104104
}
105105

106106
public function getPluginHomepage()

‎Template/wiki_file/images.php‎

Lines changed: 25 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,38 @@
22
<div class="file-thumbnails">
33
<?php foreach ($images as $file): ?>
44
<div class="file-thumbnail">
5-
<?= $this->app->component('image-slideshow', array(
6-
'images' => $images,
7-
'image' => $file,
8-
'regex' => 'FILE_ID',
9-
'url' => array(
10-
'image' => $this->url->to('WikiFileViewController', 'image', array('plugin' => 'wiki', 'file_id' => 'FILE_ID')),
11-
'thumbnail' => $this->url->to('WikiFileViewController', 'thumbnail', array('plugin' => 'wiki', 'file_id' => 'FILE_ID')),
12-
'download' => $this->url->to('WikiFileViewController', 'download', array('plugin' => 'wiki', 'file_id' => 'FILE_ID')),
13-
)
14-
)) ?>
5+
<?php if (APP_VERSION < '1.2.38'): ?>
6+
<?= $this->app->component('image-slideshow', array(
7+
'images' => $images,
8+
'image' => $file,
9+
'regex' => 'FILE_ID',
10+
'url' => array(
11+
'image' => $this->url->to('WikiFileViewController', 'image', array('plugin' => 'wiki', 'file_id' => 'FILE_ID')),
12+
'thumbnail' => $this->url->to('WikiFileViewController', 'thumbnail', array('plugin' => 'wiki', 'file_id' => 'FILE_ID')),
13+
'download' => $this->url->to('WikiFileViewController', 'download', array('plugin' => 'wiki', 'file_id' => 'FILE_ID')),
14+
)
15+
)) ?>
16+
<?php else: ?>
17+
<?= $this->app->component('image-slideshow', array(
18+
'images' => $images,
19+
'image' => $file,
20+
'regex_file_id' => 'FILE_ID',
21+
'regex_etag' => 'ETAG',
22+
'url' => array(
23+
'image' => $this->url->to('WikiFileViewController', 'image', array('plugin' => 'wiki', 'file_id' => 'FILE_ID')),
24+
'thumbnail' => $this->url->to('WikiFileViewController', 'thumbnail', array('plugin' => 'wiki', 'file_id' => 'FILE_ID')),
25+
'download' => $this->url->to('WikiFileViewController', 'download', array('plugin' => 'wiki', 'file_id' => 'FILE_ID')),
26+
)
27+
)) ?>
28+
<?php endif ?>
1529

1630
<div class="file-thumbnail-content">
1731
<div class="file-thumbnail-title">
1832
<div class="dropdown">
1933
<a href="#" class="dropdown-menu dropdown-menu-link-text" title="<?= $this->text->e($file['name']) ?>"><?= $this->text->e($file['name']) ?> <i class="fa fa-caret-down"></i></a>
2034
<ul>
2135
<li>
22-
<?= $this->url->icon('download', t('Download'), 'WikiFileViewController', 'download', array('plugin' => 'wiki', 'file_id' => $file['id'], 'file_id' => $file['id'])) ?>
36+
<?= $this->url->icon('download', t('Download'), 'WikiFileViewController', 'download', array('plugin' => 'wiki', 'file_id' => $file['id'])) ?>
2337
</li>
2438
<?php if ($this->user->hasProjectAccess('WikiFileController', 'remove', $wiki['project_id'])): ?>
2539
<li>

0 commit comments

Comments
 (0)