Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-07-13 03:27:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
djmaze 2021-05-13 00:42:12 +02:00
commit df8de36f91
2 changed files with 28 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

54
Makefile
View file

@ -1,75 +1,75 @@
#!make #!make
rebuild: _down rebuild: _down
docker-compose build --no-cache docker compose build --no-cache
up: _up status up: _up status
_up: _up:
docker-compose up -d docker compose up -d
stop: _stop status stop: _stop status
_stop: _stop:
docker-compose stop docker compose stop
down: _down status down: _down status
_down: _down:
docker-compose down docker compose down
restart: _stop _up status restart: _stop _up status
status: status:
@docker-compose ps @docker compose ps
tx: tx:
@docker-compose run --no-deps --rm tx tx pull -a -s -f -d @docker compose run --no-deps --rm tx tx pull -a -s -f -d
console-node: console-node:
@docker-compose run --no-deps --rm node sh @docker compose run --no-deps --rm node sh
console-tx: console-tx:
@docker-compose run --no-deps --rm tx sh @docker compose run --no-deps --rm tx sh
console-php: console-php:
@docker-compose exec php sh @docker compose exec php sh
console: console-node console: console-node
logs: logs:
@docker-compose logs --tail=100 -f @docker compose logs --tail=100 -f
logs-db: logs-db:
@docker-compose logs --tail=100 -f db @docker compose logs --tail=100 -f db
logs-php: logs-php:
@docker-compose logs --tail=100 -f php @docker compose logs --tail=100 -f php
logs-node: logs-node:
@docker-compose logs --tail=100 -f node @docker compose logs --tail=100 -f node
logs-nginx: logs-nginx:
@docker-compose logs --tail=100 -f nginx @docker compose logs --tail=100 -f nginx
logs-mail: logs-mail:
@docker-compose logs --tail=100 -f mail @docker compose logs --tail=100 -f mail
logs-tx: logs-tx:
@docker-compose logs --tail=100 -f tx @docker compose logs --tail=100 -f tx
rl-lint: rl-lint:
@docker-compose run --no-deps --rm node gulp lint @docker compose run --no-deps --rm node gulp lint
rl-dev: rl-dev:
@docker-compose run --no-deps --rm node npm run watch-js @docker compose run --no-deps --rm node npm run watch-js
rl-compile: rl-compile:
@docker-compose run --no-deps --rm node gulp build @docker compose run --no-deps --rm node gulp build
rl-compile-with-source: rl-compile-with-source:
@docker-compose run --no-deps --rm node gulp build --source @docker compose run --no-deps --rm node gulp build --source
rl-watch-css: rl-watch-css:
@docker-compose run --no-deps --rm node npm run watch-css @docker compose run --no-deps --rm node npm run watch-css
rl-watch-js: rl-watch-js:
@docker-compose run --no-deps --rm node npm run watch-js @docker compose run --no-deps --rm node npm run watch-js
rl-build: rl-build:
@docker-compose run --no-deps --rm node gulp all @docker compose run --no-deps --rm node gulp all
rl-build-pro: rl-build-pro:
@docker-compose run --no-deps --rm node gulp all --pro @docker compose run --no-deps --rm node gulp all --pro
yarn-install: yarn-install:
@docker-compose run --no-deps --rm node yarn install @docker compose run --no-deps --rm node yarn install
yarn-outdated: yarn-outdated:
@docker-compose run --no-deps --rm node yarn outdated @docker compose run --no-deps --rm node yarn outdated
yarn-upgrade: yarn-upgrade:
@docker-compose run --no-deps --rm node yarn upgrade-interactive --exact --latest @docker compose run --no-deps --rm node yarn upgrade-interactive --exact --latest
gpg: gpg:
docker run -it --rm -w=/var/www \ docker run -it --rm -w=/var/www \

3
dev/View/Popup/Languages.js
View file

@ -27,8 +27,7 @@ class LanguagesPopupView extends AbstractViewPopup {
} }
languageTooltipName(language) { languageTooltipName(language) {
const result = convertLangName(language, true); return convertLangName(language, true);
return convertLangName(language, false) === result ? '' : result;
} }
setLanguageSelection() { setLanguageSelection() {