Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-12-22 16:30:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Squashed commit of the following:

Browse Source 
commit 072a11b89f
Merge: 25ef62dc6b 8fb0ed82b8
Author: Barış Soner Uşaklı <barisusakli@gmail.com>
Date:   Thu Feb 29 13:10:01 2024 -0500

    Merge branch 'develop' of https://github.com/NodeBB/NodeBB into develop

commit 25ef62dc6b
Author: Barış Soner Uşaklı <barisusakli@gmail.com>
Date:   Thu Feb 29 13:09:56 2024 -0500

    chore: up harmony

commit 8fb0ed82b8
Author: Misty Release Bot <deploy@nodebb.org>
Date:   Thu Feb 29 18:08:50 2024 +0000

    chore(i18n): fallback strings for new resources: nodebb.themes-harmony

commit 96bc5d6f84
Author: Barış Soner Uşaklı <barisusakli@gmail.com>
Date:   Thu Feb 29 13:08:25 2024 -0500

    add harmony setting label

commit 516c8d0424
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Thu Feb 29 12:53:39 2024 -0500

    chore(deps): update commitlint monorepo to v19 (#12369)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit a8abc7aea4
Merge: 3aaa072756 aa6859dfae
Author: Barış Soner Uşaklı <barisusakli@gmail.com>
Date:   Thu Feb 29 10:42:42 2024 -0500

    Merge branch 'develop' of https://github.com/NodeBB/NodeBB into develop

commit 3aaa072756
Author: Barış Soner Uşaklı <barisusakli@gmail.com>
Date:   Thu Feb 29 10:42:37 2024 -0500

    chore: up peace

commit aa6859dfae
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Thu Feb 29 10:42:16 2024 -0500

    fix(deps): update dependency nodemailer to v6.9.11 (#12380)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit 2c3540b25c
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Thu Feb 29 10:42:07 2024 -0500

    fix(deps): update dependency express to v4.18.3 (#12379)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit c8a5e24aee
Author: Barış Soner Uşaklı <barisusakli@gmail.com>
Date:   Thu Feb 29 10:39:02 2024 -0500

    test: fix test

commit 5556c1d549
Author: Barış Soner Uşaklı <barisusakli@gmail.com>
Date:   Thu Feb 29 10:29:37 2024 -0500

    add missing btn class

commit fb98dc054d
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Thu Feb 29 09:43:17 2024 -0500

    fix(deps): update dependency nodebb-plugin-markdown to v12.2.6 (#12371)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit 9de0ab3165
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Thu Feb 29 09:42:13 2024 -0500

    fix(deps): update dependency archiver to v7 (#12374)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit 131d2fe78b
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Thu Feb 29 09:41:56 2024 -0500

    fix(deps): update dependency chart.js to v4.4.2 (#12376)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit 0ab1982cb8
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Thu Feb 29 09:41:37 2024 -0500

    chore(deps): update dependency smtp-server to v3.13.3 (#12378)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit 65f3c73493
Author: Barış Soner Uşaklı <barisusakli@gmail.com>
Date:   Thu Feb 29 09:31:17 2024 -0500

    chore: up peace

commit a5101dcbe1
Author: Misty Release Bot <deploy@nodebb.org>
Date:   Thu Feb 29 09:19:05 2024 +0000

    Latest translations and fallbacks

commit 0f11533c23
Author: Barış Soner Uşaklı <barisusakli@gmail.com>
Date:   Wed Feb 28 16:04:25 2024 -0500

    cache page changes

commit 53b3c5d669
Author: Barış Soner Uşaklı <barisusakli@gmail.com>
Date:   Wed Feb 28 11:41:18 2024 -0500

    feat: add chat widget areas, closes #12375

commit 1ed4d76363
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Wed Feb 28 11:14:20 2024 -0500

    fix(deps): update dependency bootswatch to v5.3.3 (#12373)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit ea99401a0d
Merge: f4c651fe25 caf8722fd5
Author: Barış Soner Uşaklı <barisusakli@gmail.com>
Date:   Wed Feb 28 09:19:09 2024 -0500

    Merge branch 'master' into develop

commit caf8722fd5
Author: Misty Release Bot <deploy@nodebb.org>
Date:   Wed Feb 28 14:17:10 2024 +0000

    chore: update changelog for v3.6.7

commit 78b8fab3e7
Author: Misty Release Bot <deploy@nodebb.org>
Date:   Wed Feb 28 14:17:09 2024 +0000

    chore: incrementing version number - v3.6.7

commit f4c651fe25
Author: Misty Release Bot <deploy@nodebb.org>
Date:   Wed Feb 28 09:18:50 2024 +0000

    Latest translations and fallbacks

commit 5eb503440d
Merge: 7207814b90 5f597dc97f
Author: Barış Soner Uşaklı <barisusakli@gmail.com>
Date:   Tue Feb 27 15:22:23 2024 -0500

    Merge branch 'master' into develop

commit 5f597dc97f
Author: Barış Soner Uşaklı <barisusakli@gmail.com>
Date:   Tue Feb 27 15:13:06 2024 -0500

    align center

commit 107f5613bf
Author: Barış Soner Uşaklı <barisusakli@gmail.com>
Date:   Tue Feb 27 15:07:23 2024 -0500

    fix: #12372, fix manual digest buttons

commit 7207814b90
Author: Barış Soner Uşaklı <barisusakli@gmail.com>
Date:   Tue Feb 27 09:20:44 2024 -0500

    feat: add hook into user.posts.isReady

    can be used to disable post delays or apply custom logic
    closes https://github.com/NodeBB/NodeBB/pull/12367

commit 1df37c0153
Author: Misty Release Bot <deploy@nodebb.org>
Date:   Tue Feb 27 09:19:09 2024 +0000

    Latest translations and fallbacks
This commit is contained in:
Barış Soner Uşaklı
2024-02-29 15:04:29 -05:00
parent e1c4311299
commit cb8d38ee2f
91 changed files with 415 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/src/modules/helpers.common.js
View File

@@ -170,7 +170,7 @@ module.exports = function (utils, Benchpress, relative_path) {
} else if (groupObj.isInvited) {
return `<button class="btn btn-warning" data-action="rejectInvite" data-group="${groupObj.displayName}">[[groups:membership.reject]]</button><button class="btn btn-success" data-action="acceptInvite" data-group="${groupObj.name}"><i class="fa fa-plus"></i> [[groups:membership.accept-invitation]]</button>`;
} else if (!groupObj.disableJoinRequests && groupObj.name !== 'administrators') {
return `<button class="btn btn-success" data-action="join" data-group="${groupObj.displayName}"><i class="fa fa-plus"></i> [[groups:membership.join-group]]</button>`;
return `<button class="btn btn-success ${btnClass}" data-action="join" data-group="${groupObj.displayName}"><i class="fa fa-plus"></i> [[groups:membership.join-group]]</button>`;
}
return '';
}