Skip to content

Commit

Permalink
Merge branch 'v2' into enh/add-twofactor-email-at-login
Browse files Browse the repository at this point in the history
  • Loading branch information
nursoda committed Jan 3, 2023
2 parents 190be89 + 03736a9 commit d49a3cf
Show file tree
Hide file tree
Showing 19 changed files with 1,330 additions and 6,399 deletions.
10 changes: 8 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
php: [ '7.4', '8.0', '8.1' ]
php:
- '7.4'
- '8.0'
- '8.1'
name: php${{ matrix.php }}
steps:
- uses: actions/checkout@v2
Expand All @@ -28,7 +31,10 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node: [ '16.x', '17.x', '18.x' ]
node:
- '16.x'
- '18.x'
- '19.x'
name: node${{ matrix.node }}
steps:
- uses: actions/checkout@v2
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/node.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@ jobs:

strategy:
matrix:
node-versions: ['14.x', '16.x', '17.x']
node-versions:
- '16.x'
- '18.x'
- '19.x'

name: node${{ matrix.node-versions }}
steps:
Expand Down
22 changes: 16 additions & 6 deletions .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,28 @@
name: Static analysis

on: [pull_request]
on:
- pull_request

jobs:
static-psalm-analysis:
runs-on: ubuntu-latest
strategy:
matrix: # https://docs.github.com/en/actions/using-jobs/using-a-build-matrix-for-your-jobs
nextcloud: [ 'v22.2.10', 'v23.0.9', 'v24.0.5', 'dev-master' ]
php: [ '7.4', '8.0' ]
ocp:
- 'dev-stable22'
- 'dev-stable23'
- 'dev-stable24'
- 'dev-stable25'
- 'dev-master'
php:
- '7.4'
- '8.0'
include:
- nextcloud: 'dev-master'
- ocp: 'dev-stable25'
php: '8.1'
name: Nextcloud ${{ matrix.nextcloud }} on PHP ${{ matrix.php }}
- ocp: 'dev-master'
php: '8.1'
name: Nextcloud ${{ matrix.ocp }} on PHP ${{ matrix.php }}
steps:
- name: Checkout
uses: actions/checkout@master
Expand All @@ -25,6 +35,6 @@ jobs:
- name: Remove PHP lockfile
run: rm composer.lock
- name: Install dependencies
run: composer require --dev christophwurst/nextcloud:${{ matrix.nextcloud }}
run: composer require --dev nextcloud/ocp:${{ matrix.ocp }}
- name: Run coding standards check
run: composer run -- psalm --php-version=${{ matrix.php }}
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@
# Changelog
Notable changes in [changelog format](https://keepachangelog.com/en/1.0.0/), project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html)

## 2.7.1 (2022-10-16)

### Changed

- Fix Russian translation (Artyom)
- Support for Nextcloud 25 (tested against RC5)

Until further notice, this v2 branch is maintained as legacy.
Volunteers needed for the ongoing v3 re-write based on twofactor_totp.

## 2.7.0 (2022-09-20)

### Added
Expand Down
8 changes: 4 additions & 4 deletions appinfo/info.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<info xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://apps.nextcloud.com/schema/apps/info.xsd">
<id>twofactor_email</id>
<version>2.7.0</version>
<version>2.7.1</version>
<dependencies>
<nextcloud min-version="22" max-version="25" />
<php min-version="7.4" max-version="8.1" />
Expand All @@ -22,9 +22,9 @@
<admin>https://github.com/nursoda/twofactor_email/wiki/Admin-manual</admin>
<developer>https://github.com/nursoda/twofactor_email/wiki/Developer-notes</developer>
</documentation>
<screenshot small-thumbnail="https://raw.githubusercontent.com/nursoda/twofactor_email/main/screenshots/select-auth_thumb.png">https://raw.githubusercontent.com/nursoda/twofactor_email/main/screenshots/challenge.png</screenshot>
<screenshot>https://raw.githubusercontent.com/nursoda/twofactor_email/main/screenshots/settings-before.png</screenshot>
<screenshot>https://raw.githubusercontent.com/nursoda/twofactor_email/main/screenshots/settings-after.png</screenshot>
<screenshot small-thumbnail="https://raw.githubusercontent.com/nursoda/twofactor_email/v2/screenshots/select-auth_thumb.png">https://raw.githubusercontent.com/nursoda/twofactor_email/v2/screenshots/challenge.png</screenshot>
<screenshot>https://raw.githubusercontent.com/nursoda/twofactor_email/v2/screenshots/settings-before.png</screenshot>
<screenshot>https://raw.githubusercontent.com/nursoda/twofactor_email/v2/screenshots/settings-after.png</screenshot>
<name>Two-Factor Email</name>
<summary lang="en">Two-Factor Email Provider</summary>
<summary lang="fr">Service de double authentification par email</summary>
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"psalm": "psalm.phar"
},
"require-dev": {
"christophwurst/nextcloud": "dev-master",
"nextcloud/ocp": "dev-master",
"nextcloud/coding-standard": "dev-master",
"psalm/phar": "dev-master"
},
Expand Down
Loading

0 comments on commit d49a3cf

Please sign in to comment.