Compare commits

...

61 Commits

Author SHA1 Message Date
Simon Vieille dc49747115 Merge pull request 'v2.4.3' (#115) from develop into master
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/115
2022-08-13 17:30:51 +02:00
Simon Vieille 1ce3f06b46 release v2.4.3 2022-08-13 17:26:35 +02:00
Simon Vieille 5fe272405e Merge pull request 'Tweaks to Czech localization' (#114) from Pavelb/side_menu:develop into develop
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/114
2022-08-13 17:23:19 +02:00
Pavelb f2a09bc170 Updated Czech localization
Removed duplicated source string, minor tweaks to wording.
2022-08-13 14:50:46 +02:00
Pavelb a2ab8fa907 Merge pull request 'develop' (#1) from deblan/side_menu:develop into develop
Reviewed-on: https://gitnet.fr/Pavelb/side_menu/pulls/1
2022-08-13 14:38:27 +02:00
Simon Vieille 638ba27564 remove drone ci conf and update woodpecker ci conf 2022-07-28 10:14:37 +02:00
Simon Vieille 013d5b99f1 Merge pull request 'update ci' (#113) from develop into master
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/113
2022-07-26 15:29:33 +02:00
Simon Vieille 5bd88a32d9 Merge branch 'develop' 2022-07-26 15:08:39 +02:00
Simon Vieille 3cf1b358b3 Merge pull request 'update ci' (#110) from develop into master
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/110
2022-07-26 14:57:46 +02:00
Simon Vieille ff1ebb4a50 update ci 2022-07-26 14:57:46 +02:00
Simon Vieille e6176d3e01 Merge pull request 'update ci' (#109) from develop into master
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/109
2022-07-26 14:55:43 +02:00
Simon Vieille 06b10568e7 update ci 2022-07-26 14:55:43 +02:00
Simon Vieille a6df8db96b Merge pull request 'update ci' (#108) from develop into master
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/108
2022-07-26 14:50:14 +02:00
Simon Vieille ef604ee612 fix merge 2022-07-26 14:44:43 +02:00
Simon Vieille eafc020210 merge develop 2022-07-26 14:43:25 +02:00
Simon Vieille 2dac9ce0f4 Merge branch 'develop' 2022-07-26 14:41:52 +02:00
Simon Vieille 4c74b620b1 Merge pull request 'add new ci and fix minur bugs' (#107) from develop into master
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/107
2022-07-25 11:04:22 +02:00
Simon Vieille b83d9f8d76 add woodpacker ci 2022-07-25 11:04:22 +02:00
Simon Vieille 5835f1ae92 add woodpacker ci 2022-07-25 11:04:22 +02:00
Simon Vieille f6c40d9391 fix typo 2022-07-25 11:04:22 +02:00
Simon Vieille 325b618434 Merge branch 'master' of gitnet.fr:deblan/side_menu 2022-07-05 16:52:13 +02:00
Simon Vieille 4ea6c5b191 Merge pull request 'develop' (#106) from develop into master
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/106
2022-07-05 14:51:05 +02:00
Simon Vieille 87090b90c2 Merge branch 'develop' 2022-07-05 14:49:13 +02:00
Simon Vieille 1d914458d0 Merge pull request 'release v2.4.0' (#104) from develop into master
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/104
2022-05-31 21:28:36 +02:00
Simon Vieille 3fc141bee1 Merge branch 'develop' 2022-05-04 21:05:43 +02:00
Simon Vieille 3e3e6ae943 Merge pull request 'release v2.3.5' (#100) from develop into master
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/100
2022-04-11 19:15:24 +02:00
Simon Vieille d759ccbdcc Merge branch 'develop' 2022-04-11 19:11:51 +02:00
Simon Vieille 457c1ff53e Merge branch 'develop' 2022-04-10 18:56:58 +02:00
Simon Vieille 92e1857ae8 Merge pull request 'fix issue #96' (#97) from develop into master
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/97
2022-03-15 11:14:40 +01:00
Simon Vieille b4951b6cf1 Merge pull request 'develop' (#94) from develop into master
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/94
2022-02-07 14:35:05 +01:00
Simon Vieille 4e21020600 Merge pull request 'develop' (#92) from develop into master
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/92
2022-01-14 17:03:28 +01:00
Simon Vieille 22011cb681 Merge pull request 'update the ci/cd config and screenshots' (#91) from develop into master
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/91
2022-01-13 00:47:43 +01:00
Simon Vieille 17a8137b4e Merge branch 'master' of gitnet.fr:deblan/side_menu 2022-01-13 00:20:11 +01:00
Simon Vieille 1e68d6877d Merge pull request 'Quick fix' (#90) from develop into master
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/90
2022-01-12 14:13:08 +01:00
Simon Vieille 68123ed45c Merge pull request 'Quick fix (#88)' (#89) from develop into master
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/89
2022-01-12 13:32:29 +01:00
Simon Vieille fef936bef0 Merge pull request 'Issues #82 #83' (#87) from develop into master
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/87
2022-01-12 12:53:54 +01:00
Simon Vieille 9871cb93d8 Merge pull request 'develop' (#86) from develop into master
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/86
2022-01-10 15:07:07 +01:00
Simon Vieille 2e8bed4531 Merge pull request 'update changelog' (#81) from develop into master
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/81
2021-12-03 14:15:36 +01:00
Simon Vieille 134148c6b2 Merge pull request 'release v2.1.0 (NC23 is compatible)' (#80) from develop into master
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/80
2021-12-03 14:03:10 +01:00
Simon Vieille 8d287672e9 Merge branch 'master' of gitnet.fr:deblan/side_menu 2021-11-14 20:07:49 +01:00
Simon Vieille 7f33f7523f Merge pull request 'Release 2.0.1' (#79) from develop into master
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/79
2021-11-14 20:07:41 +01:00
Simon Vieille 0ecc706bad Merge branch 'develop' 2021-11-14 20:05:33 +01:00
Simon Vieille 70caa80af6 Merge pull request 'update makefile for assets build' (#75) from develop into master
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/75
2021-11-14 17:33:55 +01:00
Simon Vieille 6296c1c807 Merge pull request 'Release v2.0.0' (#74) from develop into master
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/74
2021-11-14 17:22:49 +01:00
Simon Vieille 74d26106dc Merge pull request 'add ci/cd conf' (#72) from develop into master
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/72
2021-11-03 20:04:03 +01:00
Simon Vieille ff5ba04217 Merge pull request 'add ci/cd conf (drone)' (#71) from develop into master
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/71
2021-11-03 19:20:36 +01:00
Simon Vieille 240b564e22 Merge pull request 'update documentation' (#70) from develop into master
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/70
2021-10-31 19:44:17 +01:00
Simon Vieille 0608011d80 Merge pull request 'update metroline conf file' (#69) from develop into master
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/69
2021-10-31 18:45:36 +01:00
Simon Vieille 1544b28b57 Merge pull request 'add ci configuration' (#68) from develop into master
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/68
2021-10-31 17:47:47 +01:00
Simon Vieille 1e64b34cff Merge branch 'develop' 2021-10-28 13:17:04 +02:00
Simon Vieille cc71fda3b0 Merge branch 'develop' 2021-10-21 21:43:51 +02:00
Simon Vieille fd367fe2d4 Merge branch 'develop' 2021-10-21 21:37:40 +02:00
Simon Vieille 3f590a97bc Merge branch 'develop' 2021-10-21 20:06:41 +02:00
Simon Vieille aac9f2cb16 Merge branch 'develop' 2021-08-11 11:58:25 +02:00
Simon Vieille f7d4a8284b Merge branch 'develop' 2021-08-02 21:49:02 +02:00
Simon Vieille 04d161ad9b Merge branch 'develop' 2021-07-09 12:55:07 +02:00
Simon Vieille dab5566be4 Merge branch 'develop' 2021-07-09 12:54:32 +02:00
Simon Vieille d735e1cfa6 Merge branch 'develop' 2021-07-09 12:43:01 +02:00
Simon Vieille 96a4235a10 Merge branch 'develop' 2021-07-09 11:52:28 +02:00
Simon Vieille 4413623618 merge develop 2021-07-07 21:36:02 +02:00
Simon Vieille 7306a31a7d release v1.24.0 2021-07-03 20:32:39 +02:00
5 changed files with 10 additions and 59 deletions
-54
View File
@@ -1,54 +0,0 @@
---
kind: pipeline
type: docker
name: default
steps:
- name: dependencies
image: deblan/devenv
commands:
- npm install
- name: build
image: deblan/devenv
commands:
- make npm-build
when:
branch:
exclude:
- master
include:
- develop
- feature/*
event:
- push
- pull_request
- name: release
image: deblan/devenv
volumes:
- name: artifacts
path: /artifacts
environment:
APP_CERTIFICATE:
from_secret: app_certificate
commands:
- mkdir -p "$HOME/.nextcloud/certificates"
- echo "$APP_CERTIFICATE" > "$HOME/.nextcloud/certificates/side_menu.key"
- export VERSION=$(grep "<version>" appinfo/info.xml | grep -o "[0-9]*\.[0-9]*\.[0-9]*" --color=never)
- export RELEASE_DIRECTORY="/artifacts/deblan/side_menu"
- make release
when:
branch:
exclude:
- develop
- feature/*
include:
- master
event:
- push
volumes:
- name: artifacts
host:
path: /var/www/html/artifacts
+2
View File
@@ -5,6 +5,7 @@ pipeline:
- npm install
when:
event: [tag, push, pull_request]
branch: [master, develop, feature/*]
build:
image: deblan/devenv
@@ -35,6 +36,7 @@ pipeline:
api_key:
from_secret: gitnet_api_key
base_url: https://gitnet.fr
note: ${CI_COMMIT_MESSAGE}
files: /var/www/html/artifacts/deblan/side_menu/${CI_COMMIT_TAG/v//}/*
when:
event: [tag]
+4
View File
@@ -1,5 +1,9 @@
## [Unreleased]
## 2.4.3
### Fixed
* fix translations
## 2.4.2
### Fixed
* fix typo
+1 -1
View File
@@ -26,7 +26,7 @@ If you like this application and if you want to support the development:
* [Donate with liberapay](https://liberapay.com/deblan)
* [Leave a comment](https://apps.nextcloud.com/apps/side_menu#comments)
]]></description>
<version>2.4.2</version>
<version>2.4.3</version>
<licence>agpl</licence>
<author mail="contact@deblan.fr" homepage="https://www.deblan.io/">Simon Vieille</author>
<namespace>SideMenu</namespace>
+3 -4
View File
@@ -3,8 +3,8 @@
"No": "Ne"
"Yes": "Ano"
"Menu": "Nabídka"
'Use the shortcut <span class="keyboard-key">Ctrl</span>+<span class="keyboard-key">o</span> to open and to hide the side menu. Use <span class="keyboard-key">tab</span> to navigate.': 'Pro otevření/skrytí postranní nabídky použijte zkratku <span class="keyboard-key">Ctrl</span>+<span class="keyboard-key">o</span>. Pro pohyb po použijte klávesu <span class="keyboard-key">tab</span>.'
"Top menu": "Hlavní nabídka"
'Use the shortcut <span class="keyboard-key">Ctrl</span>+<span class="keyboard-key">o</span> to open and to hide the side menu. Use <span class="keyboard-key">tab</span> to navigate.': 'Pro otevření/skrytí postranní nabídky použijte zkratku <span class="keyboard-key">Ctrl</span>+<span class="keyboard-key">O</span> („O“ jako otevřít). Pro pohyb po použijte klávesu <span class="keyboard-key">Tab</span>.'
"Top menu": "Horní nabídka"
"Apps that not must be moved in the side menu": "Aplikace, které nepřesouvat do postranní nabídky"
"If there is no selection then the global configuration is applied.": "Pokud neexistuje žádný výběr, je uplatněno globální nastavení."
"Experimental": "Experimentální"
@@ -62,7 +62,7 @@
"Export the configuration": "Exportovat nastavení"
"Purge the cache": "Vyprázdnit mezipaměť"
"Show the link to settings": "Zobrazit odkaz na nastavení"
"The menu is enabled by default for users": "Nabídka je ve výchozím stavu zapnutá pro uživatele"
"The menu is enabled by default for users": "Nabídka je ve výchozím stavu pro uživatele zapnutá"
"Except when the configuration is forced.": "S výjimkou, kdy je nastavení vynuceno."
"Apps that should not be displayed in the menu": "Aplikace, které by neměly být v nabídce zobrazeny"
"This feature is only compatible with the <code>big menu</code> display.": "Tato funkce je kompatibilní pouze s <code>velkou nabídkou</ code>."
@@ -78,7 +78,6 @@
"Dark mode colors": "Barvy tmavého režimu"
"With categories": "S kategoriemi"
"Custom categories": "Vlastní kategorie"
"Customize application categories": "Personnaliser les catégories des applications"
"Customize application categories": "Přizpůsobte kategorie aplikací"
"Apps only visible in the top menu": "Aplikace jsou viditelné pouze v horní nabídce "
"Apps visible in the top and side menus": "Aplikace viditelné v horní a boční nabídce"