Skip to content

Commit

Permalink
Merge branch 'dev' into feature/quiz-resume
Browse files Browse the repository at this point in the history
# Conflicts:
#	assets/js/builder/Models/Quiz.js
#	assets/js/builder/Schemas/Quiz.js
#	includes/abstracts/abstract.llms.admin.table.php
#	includes/class.llms.l10n.js.php
#	includes/class.llms.quiz.data.php
#	includes/models/model.llms.quiz.php
#	templates/content-single-question.php
#	templates/quiz/questions/content-choice.php
#	templates/quiz/questions/content-picture_choice.php
#	templates/quiz/results-attempt-questions-list.php
#	templates/quiz/results-attempt.php
#	templates/quiz/results.php
#	templates/quiz/start-button.php
  • Loading branch information
brianhogg committed Aug 19, 2024
2 parents 9dcbc25 + 7cc0130 commit 09da400
Show file tree
Hide file tree
Showing 592 changed files with 9,002 additions and 103,487 deletions.
5 changes: 0 additions & 5 deletions .changelogs/add-gateway-can-process-access-plan-logic-1.yml

This file was deleted.

4 changes: 0 additions & 4 deletions .changelogs/add-gateway-can-process-access-plan-logic-2.yml

This file was deleted.

5 changes: 0 additions & 5 deletions .changelogs/add-gateway-can-process-access-plan-logic.yml

This file was deleted.

4 changes: 0 additions & 4 deletions .changelogs/blocks-2.5.2.yml

This file was deleted.

6 changes: 0 additions & 6 deletions .changelogs/dev.yml

This file was deleted.

6 changes: 0 additions & 6 deletions .changelogs/export-possible-security-issue.yml

This file was deleted.

6 changes: 0 additions & 6 deletions .changelogs/function-name-correction.yml

This file was deleted.

5 changes: 0 additions & 5 deletions .changelogs/issue_2511-1.yml

This file was deleted.

5 changes: 0 additions & 5 deletions .changelogs/issue_2511.yml

This file was deleted.

7 changes: 0 additions & 7 deletions .changelogs/issue_2552.yml

This file was deleted.

6 changes: 0 additions & 6 deletions .changelogs/issues_2434.yml

This file was deleted.

3 changes: 0 additions & 3 deletions .changelogs/php82-1.yml

This file was deleted.

5 changes: 0 additions & 5 deletions .changelogs/php82-2.yml

This file was deleted.

4 changes: 0 additions & 4 deletions .changelogs/php82.yml

This file was deleted.

4 changes: 0 additions & 4 deletions .changelogs/rest-beta-29.yml

This file was deleted.

4 changes: 0 additions & 4 deletions .changelogs/update-action-scheduler.yml

This file was deleted.

4 changes: 2 additions & 2 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
* @thomasplevy
* @ideadude

# Full Site Editing.
includes/class-llms-block-templates.php @eri-trabiccolo
includes/class-llms-block-templates.php @ideadude
60 changes: 0 additions & 60 deletions .github/workflows/coding-standards.yml

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/lint-js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ on:
workflow_dispatch:
pull_request:
# Once daily at 00:00 UTC.
schedule:
- cron: '0 0 * * *'
# schedule:
# - cron: '0 0 * * *'

concurrency:
group: ${{ github.workflow }}-${{ 'pull_request' == github.event_name && github.head_ref || github.sha }}
Expand Down
75 changes: 0 additions & 75 deletions .github/workflows/php-test-coverage.yml

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
branches:
- trunk
paths:
- 'readme.txt'
- 'CHANGELOG.md'

jobs:

Expand Down Expand Up @@ -66,4 +66,4 @@ jobs:
--data-urlencode "version=$__LLMS_PKG_VERSION" \
--data-urlencode "wp_version=$__LLMS_WP_VERSION" \
--data-urlencode "php_version=$__LLMS_PHP_VERSION" \
--data-urlencode "llms_version=$__LLMS_LLMS_VERSION"
--data-urlencode "llms_version=$__LLMS_LLMS_VERSION"
98 changes: 0 additions & 98 deletions .github/workflows/test-e2e.yml

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/test-js-unit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ on:
paths:
- src/js/**
# Once daily at 00:00 UTC.
schedule:
- cron: '0 0 * * *'
# schedule:
# - cron: '0 0 * * *'

concurrency:
group: ${{ github.workflow }}-${{ 'pull_request' == github.event_name && github.head_ref || github.sha }}
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/test-phpunit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ on:
type: string
pull_request:
# Once daily at 01:00 UTC.
schedule:
- cron: '0 1 * * *'
# schedule:
# - cron: '0 1 * * *'

concurrency:
group: ${{ github.workflow }}-${{ 'pull_request' == github.event_name && github.head_ref || github.sha }}
Expand Down Expand Up @@ -75,6 +75,9 @@ jobs:
secrets: ${{ toJSON( secrets ) }}
cache-suffix: ${{ inputs.cache-suffix }}

- name: Install NPM Dependencies
run: npm ci && npm run build

- name: Run Tests
run: composer run tests

Expand Down
Loading

0 comments on commit 09da400

Please sign in to comment.