Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-07-20 06:40:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2025-12-05 12:28:29 -05:00
parent e50edd52fc ebf2a2c5af
commit 823c6cb340
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.github/workflows/docker.yml vendored
View File

@@ -26,9 +26,6 @@ jobs:
- os: ubuntu-24.04-arm - os: ubuntu-24.04-arm
platforms: linux/arm64 platforms: linux/arm64
required: true required: true
- os: ubuntu-24.04-arm
platforms: linux/arm/v7
required: false
continue-on-error: ${{ !matrix.required }} continue-on-error: ${{ !matrix.required }}
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
steps: steps:
@@ -131,4 +128,4 @@ jobs:
$(printf '${{ env.IMAGE }}@sha256:%s ' *) $(printf '${{ env.IMAGE }}@sha256:%s ' *)
- name: Inspect image - name: Inspect image
run: | run: |
docker buildx imagetools inspect ${{ env.IMAGE }}:${{ steps.meta.outputs.version }} docker buildx imagetools inspect ${{ env.IMAGE }}:${{ steps.meta.outputs.version }}

2
src/api/categories.js
View File

@@ -126,7 +126,7 @@ categoriesAPI.getTopics = async (caller, data) => {
throw new Error('[[error:no-privileges]]'); throw new Error('[[error:no-privileges]]');
} }
const infScrollTopicsPerPage = 20; const infScrollTopicsPerPage = settings.topicsPerPage;
const sort = data.sort || data.categoryTopicSort || meta.config.categoryTopicSort || 'recently_replied'; const sort = data.sort || data.categoryTopicSort || meta.config.categoryTopicSort || 'recently_replied';
let start = Math.max(0, parseInt(data.after || 0, 10)); let start = Math.max(0, parseInt(data.after || 0, 10));