Merge pull request 'next release' (#200) from develop into master
Reviewed-on: #200
This commit is contained in:
commit
368c59a2bd
|
@ -7,6 +7,12 @@ pipeline:
|
||||||
event: [tag, push, pull_request]
|
event: [tag, push, pull_request]
|
||||||
branch: [master, develop, feature/*, translations]
|
branch: [master, develop, feature/*, translations]
|
||||||
|
|
||||||
|
osv_detector:
|
||||||
|
image: gitnet.fr/deblan/docker-osv-detector:v0.9
|
||||||
|
commands:
|
||||||
|
- osv-detector package-lock.json
|
||||||
|
failure: ignore
|
||||||
|
|
||||||
build:
|
build:
|
||||||
image: gitnet.fr/deblan/devenv
|
image: gitnet.fr/deblan/devenv
|
||||||
commands:
|
commands:
|
||||||
|
@ -30,14 +36,6 @@ pipeline:
|
||||||
when:
|
when:
|
||||||
event: [pull_request]
|
event: [pull_request]
|
||||||
|
|
||||||
dependency_check:
|
|
||||||
image: node:16-slim
|
|
||||||
commands:
|
|
||||||
- npm audit
|
|
||||||
failure: ignore
|
|
||||||
when:
|
|
||||||
event: [pull_request]
|
|
||||||
|
|
||||||
package:
|
package:
|
||||||
image: gitnet.fr/deblan/devenv
|
image: gitnet.fr/deblan/devenv
|
||||||
volumes:
|
volumes:
|
||||||
|
|
|
@ -1,5 +1,11 @@
|
||||||
## [Unreleased]
|
## [Unreleased]
|
||||||
|
|
||||||
|
## 3.5.1
|
||||||
|
### Added
|
||||||
|
* add translations (thanks to p-bo adn gallegonovato)
|
||||||
|
### Fixed
|
||||||
|
* fix #189: sorting not applied on mobile
|
||||||
|
|
||||||
## 3.5.0
|
## 3.5.0
|
||||||
### Added
|
### Added
|
||||||
* add dependency check (ci)
|
* add dependency check (ci)
|
||||||
|
|
|
@ -32,7 +32,7 @@ Notice
|
||||||
Because I believe in a free and decentralized Internet, [Gitnet](https://gitnet.fr) is **self-hosted at home**.
|
Because I believe in a free and decentralized Internet, [Gitnet](https://gitnet.fr) is **self-hosted at home**.
|
||||||
In case of downtime, you can download **Custom Menu** from [here](https://kim.deblan.fr/~side_menu/).
|
In case of downtime, you can download **Custom Menu** from [here](https://kim.deblan.fr/~side_menu/).
|
||||||
]]></description>
|
]]></description>
|
||||||
<version>3.5.0</version>
|
<version>3.5.1</version>
|
||||||
<licence>agpl</licence>
|
<licence>agpl</licence>
|
||||||
<author mail="contact@deblan.fr" homepage="https://www.deblan.io/">Simon Vieille</author>
|
<author mail="contact@deblan.fr" homepage="https://www.deblan.io/">Simon Vieille</author>
|
||||||
<namespace>SideMenu</namespace>
|
<namespace>SideMenu</namespace>
|
||||||
|
|
|
@ -53,6 +53,7 @@
|
||||||
:aria-label="appLabel(app)"
|
:aria-label="appLabel(app)"
|
||||||
:aria-current="app.active ? 'page' : false"
|
:aria-current="app.active ? 'page' : false"
|
||||||
:href="app.href"
|
:href="app.href"
|
||||||
|
:style="makeStyle(app)"
|
||||||
class="app-menu-popover-entry">
|
class="app-menu-popover-entry">
|
||||||
<template #icon>
|
<template #icon>
|
||||||
<div class="app-icon" :class="{ 'has-unread': app.unread > 0 }">
|
<div class="app-icon" :class="{ 'has-unread': app.unread > 0 }">
|
||||||
|
@ -110,13 +111,19 @@ export default {
|
||||||
this.observer.disconnect()
|
this.observer.disconnect()
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
appLabel() {
|
appLabel(app) {
|
||||||
return (app) => app.name
|
return app.name
|
||||||
+ (app.active ? ' (' + t('core', 'Currently open') + ')' : '')
|
+ (app.active ? ' (' + t('core', 'Currently open') + ')' : '')
|
||||||
+ (app.unread > 0 ? ' (' + n('core', '{count} notification', '{count} notifications', app.unread, { count: app.unread }) + ')' : '')
|
+ (app.unread > 0 ? ' (' + n('core', '{count} notification', '{count} notifications', app.unread, { count: app.unread }) + ')' : '')
|
||||||
},
|
},
|
||||||
appList() {
|
appList() {
|
||||||
return Object.values(this.apps)
|
let items = Object.values(this.apps)
|
||||||
|
|
||||||
|
items.sort((a, b) => {
|
||||||
|
return a.order < b.order ? -1 : 1;
|
||||||
|
})
|
||||||
|
|
||||||
|
return items
|
||||||
},
|
},
|
||||||
mainAppList() {
|
mainAppList() {
|
||||||
return this.appList().slice(0, this.appLimit)
|
return this.appList().slice(0, this.appLimit)
|
||||||
|
|
|
@ -90,4 +90,4 @@
|
||||||
"Applications kept in the top menu": "Aplikace ponechané v horní nabídce"
|
"Applications kept in the top menu": "Aplikace ponechané v horní nabídce"
|
||||||
"Applications kept in the top menu but also shown in side menu": "Aplikace ponechané v horní nabídce ale také zobrazené v té boční"
|
"Applications kept in the top menu but also shown in side menu": "Aplikace ponechané v horní nabídce ale také zobrazené v té boční"
|
||||||
"These applications must be selected in the previous option.": "Tyto aplikace je třeba vybrat v předchozí volbě."
|
"These applications must be selected in the previous option.": "Tyto aplikace je třeba vybrat v předchozí volbě."
|
||||||
"Hide labels on mouse over": "Hide labels on mouse over"
|
"Hide labels on mouse over": "Skrýt popisky při najetím ukazatele myši"
|
||||||
|
|
|
@ -90,4 +90,4 @@
|
||||||
"Applications kept in the top menu": "Aplicaciones guardadas en el menú superior"
|
"Applications kept in the top menu": "Aplicaciones guardadas en el menú superior"
|
||||||
"Applications kept in the top menu but also shown in side menu": "Las aplicaciones se mantienen en el menú superior pero también se muestran en el menú lateral"
|
"Applications kept in the top menu but also shown in side menu": "Las aplicaciones se mantienen en el menú superior pero también se muestran en el menú lateral"
|
||||||
"These applications must be selected in the previous option.": "Estas aplicaciones deben ser seleccionadas en las opciones anteriores."
|
"These applications must be selected in the previous option.": "Estas aplicaciones deben ser seleccionadas en las opciones anteriores."
|
||||||
"Hide labels on mouse over": "Hide labels on mouse over"
|
"Hide labels on mouse over": "Ocultar las etiquetas al pasar el ratón"
|
||||||
|
|
Loading…
Reference in a new issue