Skip to content

Commit 15b37ea

Browse files
christianlupuschristianlupus
authored
Merge pull request #629 from nextcloud/release/0.8.2
Create release 0.8.2
2 parents 8e9df26 + 553edca commit 15b37ea

File tree

211 files changed

+4568
-3023
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

211 files changed

+4568
-3023
lines changed

‎.eslintrc.yml‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,12 @@ extends:
99
- "plugin:vue/strongly-recommended"
1010
- "plugin:vue/recommended"
1111
- prettier
12-
#- prettier/babel
13-
- prettier/vue
12+
13+
globals:
14+
OC:
15+
t:
16+
17+
rules:
18+
no-plusplus:
19+
- error
20+
- allowForLoopAfterthoughts: true

‎.github/workflows/build-test-images.yml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,21 @@ jobs:
1717
- "7.3"
1818
- "8"
1919
steps:
20+
- name: Check if secret is known
21+
shell: bash
22+
id: check
23+
run: |
24+
echo "::set-output name=skip::false"
25+
if [ -z "${{ secrets.DOCKER_HUB_TOKEN }}" ]; then
26+
echo "::set-output name=skip::true"
27+
fi
28+
if [ -z "${{ secrets.DOCKER_HUB_USERNAME }}" ]; then
29+
echo "::set-output name=skip::true"
30+
fi
31+
2032
- name: Checkout the app
2133
uses: actions/checkout@v2
34+
if: ${{ steps.check.outputs.skip == 'false' }}
2235

2336
- name: Build and push the image
2437
shell: bash
@@ -31,3 +44,4 @@ jobs:
3144
export COMPOSE_DOCKER_CLI_BUILD=1 &&
3245
PHP_VERSION=${{ matrix.phpVersion }}
3346
./run-locally.sh --pull --create-images --push-images
47+
if: ${{ steps.check.outputs.skip == 'false' }}

‎.github/workflows/tests.yml‎

Lines changed: 63 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -8,30 +8,64 @@ on:
88
jobs:
99

1010
php-lint:
11-
name: Run PHP Linter and Code Style checker
12-
runs-on: ubuntu-latest
13-
steps:
14-
- name: Checkout the project
15-
uses: actions/checkout@v2
16-
- name: Get PHP version
17-
shell: bash
18-
run: php -v
19-
- name: Install Composer
20-
shell: bash
21-
run: >-
22-
wget https://github.com/composer/getcomposer.org/raw/master/web/installer -O - -q |
23-
php -- --quiet
24-
- name: Install packages
25-
shell: bash
26-
run: composer install
27-
- name: Run linter
28-
shell: bash
29-
run: composer lint:lint
30-
- name: Run code style checker
31-
shell: bash
32-
env:
33-
PHP_CS_FIXER_IGNORE_ENV: 1
34-
run: composer cs:check
11+
name: Run PHP Linter and Code Style checker
12+
runs-on: ubuntu-latest
13+
steps:
14+
- name: Checkout the project
15+
uses: actions/checkout@v2
16+
- name: Get PHP version
17+
shell: bash
18+
run: php -v
19+
20+
- name: Install Composer
21+
shell: bash
22+
run: >-
23+
wget https://github.com/composer/getcomposer.org/raw/master/web/installer -O - -q |
24+
php -- --quiet
25+
26+
- name: Install PHP packages
27+
shell: bash
28+
run: composer install
29+
- name: Install Node packages
30+
shell: bash
31+
run: npm -q install
32+
33+
- name: Run PHP linter
34+
shell: bash
35+
run: composer lint:lint
36+
- name: Run PHP code style checker
37+
shell: bash
38+
env:
39+
PHP_CS_FIXER_IGNORE_ENV: 1
40+
run: composer cs:check
41+
42+
- name: Check for formatting issues with vue files (prettier)
43+
shell: bash
44+
run: >-
45+
npm run prettier || {
46+
echo '::error ::The prettier style checker failed.
47+
Please run `npm run prettier-fix` in order to correct this.';
48+
exit 1;
49+
}
50+
51+
- name: Check for issues with vue and js files (eslint)
52+
shell: bash
53+
run: >-
54+
npm run eslint || {
55+
echo '::error ::The eslint style checker failed.
56+
Please run `npm run eslint-fix` in order to correct this.';
57+
exit 1;
58+
}
59+
60+
- name: Check for formatting issues with CSS files (stylelint)
61+
shell: bash
62+
run: >-
63+
npm run stylelint || {
64+
echo '::error ::The stylelint checker failed.
65+
Please run `npm run stylelint-fix` to help solving these issues if possible.';
66+
exit 1;
67+
}
68+
3569

3670
unit-tests:
3771
name: Run the unittests
@@ -47,7 +81,7 @@ jobs:
4781
- pgsql
4882
- sqlite
4983
coreVersion:
50-
- stable20
84+
- stable21
5185
phpVersion:
5286
- "7"
5387
httpServer:
@@ -57,26 +91,26 @@ jobs:
5791
include:
5892
# Test different core versions additionally
5993
- database: mysql
60-
coreVersion: stable18
94+
coreVersion: stable19
6195
phpVersion: "7"
6296
httpServer: "apache"
6397
mayFail: false
6498
- database: mysql
65-
coreVersion: stable19
99+
coreVersion: stable20
66100
phpVersion: "7"
67101
httpServer: "apache"
68102
mayFail: false
69103

70104
# Test different PHP versions additionally
71105
- database: mysql
72-
coreVersion: stable20
106+
coreVersion: stable21
73107
phpVersion: "7.3"
74108
httpServer: "apache"
75109
mayFail: false
76110

77111
# Test different HTTP server
78112
- database: mysql
79-
coreVersion: stable20
113+
coreVersion: stable21
80114
phpVersion: "7"
81115
httpServer: "nginx"
82116
mayFail: false

‎.php_cs.dist‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ $config = new Config();
1010
$config
1111
->getFinder()
1212
->ignoreVCSIgnored(true)
13-
->notPath('build')
14-
->notPath('l10n')
13+
->exclude('build')
14+
->exclude('l10n')
1515
// ->notPath('lib/Vendor')
16-
->notPath('src')
17-
->notPath('node_modules')
18-
->notPath('vendor')
19-
->notPath('.github')
16+
->exclude('src')
17+
->exclude('node_modules')
18+
->exclude('vendor')
19+
->exclude('.github')
2020
->in(__DIR__);
2121
return $config;
2222

‎.stylelintrc.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ rules:
1010
- attribute
1111
"selector-max-id": 1
1212
"max-nesting-depth": 2
13+
"selector-max-compound-selectors": 4
1314

1415
extends:
1516
- stylelint-config-standard

‎CHANGELOG.md‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,33 @@
11
## [Unreleased]
22

3+
## 0.8.2 - 2021-03-03
4+
5+
### Fixed
6+
- Added translation for nutritient-value label placeholder
7+
[#596](https://github.com/nextcloud/cookbook/pull/596) @seyfeb
8+
- Updated dependency of eslint-config-prettier
9+
[#603](https://github.com/nextcloud/cookbook/pull/603) @christianlupus
10+
- Enforce basic code styling using prettier in vue files
11+
[#607](https://github.com/nextcloud/cookbook/pull/607) @christianlupus
12+
- Enforce CSS styling using stylelint
13+
[#608](https://github.com/nextcloud/cookbook/pull/608) @christianlupus
14+
- More code styling, cleanup & minor bugfixes
15+
[#615](https://github.com/nextcloud/cookbook/pull/615) @seyfeb
16+
- Avoid daily issues in personal forks due to missing secrets
17+
[#620](https://github.com/nextcloud/cookbook/pull/620) @christianlupus
18+
- Avoid descending of CS_fixer into non-code folders
19+
[#621](https://github.com/nextcloud/cookbook/pull/621) @christianlupus
20+
- Fixed compatiblity with Nextcloud 21
21+
[#605](https://github.com/nextcloud/cookbook/pull/605) @icewind1991
22+
23+
## Deprecated
24+
- Obsolete routes to old user interface, see `appinfo/routes.php`
25+
[#580](https://github.com/nextcloud/cookbook/pull/580) @christianlupus
26+
27+
## Removed
28+
- Dropped support for NC core version <= 18
29+
[#630](https://github.com/nextcloud/cookbook/pull/630) @christianlupus
30+
331
## 0.8.1 - 2021-02-15
432

533
### Added

‎appinfo/info.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<screenshot small-thumbnail="https://raw.githubusercontent.com/nextcloud/cookbook/stable/img/screenshot-small.jpg">https://raw.githubusercontent.com/nextcloud/cookbook/stable/img/screenshot-small.jpg</screenshot>
1717
<dependencies>
1818
<php min-version="7.2"/>
19-
<nextcloud min-version="17" max-version="20"/>
19+
<nextcloud min-version="19" max-version="21"/>
2020
</dependencies>
2121
<navigations>
2222
<navigation>

‎appinfo/routes.php‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,9 @@
1616
*/
1717
['name' => 'main#getApiVersion', 'url' => '/api/version', 'verb' => 'GET'],
1818
['name' => 'main#index', 'url' => '/', 'verb' => 'GET'],
19-
['name' => 'main#home', 'url' => '/home', 'verb' => 'GET'],
2019
['name' => 'main#keywords', 'url' => '/keywords', 'verb' => 'GET'],
2120
['name' => 'main#categories', 'url' => '/categories', 'verb' => 'GET'],
22-
['name' => 'main#error', 'url' => '/error', 'verb' => 'GET'],
23-
['name' => 'main#create', 'url' => '/recipes/create', 'verb' => 'GET'],
24-
['name' => 'main#new', 'url' => '/recipes/create', 'verb' => 'POST'],
2521
['name' => 'main#import', 'url' => '/import', 'verb' => 'POST'],
26-
['name' => 'main#edit', 'url' => '/recipes/{id}/edit', 'verb' => 'GET', 'requirements' => ['id' => '\d+']],
27-
['name' => 'main#update', 'url' => '/recipes/{id}/edit', 'verb' => 'PUT', 'requirements' => ['id' => '\d+']],
28-
['name' => 'main#recipe', 'url' => '/recipes/{id}', 'verb' => 'GET', 'requirements' => ['id' => '\d+']],
2922
['name' => 'recipe#image', 'url' => '/recipes/{id}/image', 'verb' => 'GET', 'requirements' => ['id' => '\d+']],
3023
['name' => 'config#reindex', 'url' => '/reindex', 'verb' => 'POST'],
3124
['name' => 'config#list', 'url' => '/config', 'verb' => 'GET'],
@@ -35,6 +28,15 @@
3528
['name' => 'main#categoryUpdate', 'url' => '/api/category/{category}', 'verb' => 'PUT'],
3629
['name' => 'main#tags', 'url' => '/api/tags/{keywords}', 'verb' => 'GET'],
3730
['name' => 'main#search', 'url' => '/api/search/{query}', 'verb' => 'GET'],
31+
/* Unknown usage */
32+
/* Deprecated routes */
33+
['name' => 'main#new', 'url' => '/recipes/create', 'verb' => 'POST'],
34+
['name' => 'main#update', 'url' => '/recipes/{id}/edit', 'verb' => 'PUT', 'requirements' => ['id' => '\d+']],
35+
['name' => 'main#home', 'url' => '/home', 'verb' => 'GET'],
36+
['name' => 'main#error', 'url' => '/error', 'verb' => 'GET'],
37+
['name' => 'main#create', 'url' => '/recipes/create', 'verb' => 'GET'],
38+
['name' => 'main#edit', 'url' => '/recipes/{id}/edit', 'verb' => 'GET', 'requirements' => ['id' => '\d+']],
39+
['name' => 'main#recipe', 'url' => '/recipes/{id}', 'verb' => 'GET', 'requirements' => ['id' => '\d+']],
3840
],
3941

4042
/* API resources */

‎l10n/af.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ OC.L10N.register(
22
"cookbook",
33
{
44
"Home" : "Tuis",
5-
"Filter" : "Filter",
6-
"Search" : "Soek",
75
"Save changes" : "Bewaar veranderinge",
86
"Loading…" : "Laai…",
97
"Page not found" : "Blad nie gevind nie",
8+
"Filter" : "Filter",
9+
"Search" : "Soek",
1010
"Category" : "Kategorie",
1111
"Add" : "Voeg by",
1212
"Name" : "Naam",

‎l10n/af.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{ "translations": {
22
"Home" : "Tuis",
3-
"Filter" : "Filter",
4-
"Search" : "Soek",
53
"Save changes" : "Bewaar veranderinge",
64
"Loading…" : "Laai…",
75
"Page not found" : "Blad nie gevind nie",
6+
"Filter" : "Filter",
7+
"Search" : "Soek",
88
"Category" : "Kategorie",
99
"Add" : "Voeg by",
1010
"Name" : "Naam",

0 commit comments

Comments
 (0)