Compare commits

...

7 Commits

Author SHA1 Message Date
kolaente ac373fef75
chore: 0.18.2 release preparations 2021-11-23 21:06:44 +01:00
kolaente e5e4301723
feat: remove ssl generation from docker image
(cherry-picked from 73651ef964)
2021-11-23 21:05:46 +01:00
kolaente ff696b732b
chore: 0.18.2 release preparations 2021-11-23 20:48:59 +01:00
kolaente c2bb85154e
chore(ci): use latest version of s3 plugin
(cherry picked from commit 234951fe3b)
2021-11-23 20:47:44 +01:00
kolaente 771eef9e54
chore: release preparations 2021-11-23 20:18:07 +01:00
kolaente 469a0ad837
fix: edit saved filter title 2021-11-23 20:16:39 +01:00
kolaente 591441ae20
fix(docker): properly replace api url
(cherry picked from commit 587f2edd83)
2021-11-23 20:01:28 +01:00
7 changed files with 23 additions and 14 deletions

View File

@ -126,7 +126,7 @@ steps:
- build-dev
- name: upload-test-results
image: plugins/s3:1
image: plugins/s3
pull: true
settings:
bucket: drone-test-results
@ -209,7 +209,7 @@ steps:
depends_on: [ build ]
- name: release
image: plugins/s3:1
image: plugins/s3
pull: true
settings:
bucket: vikunja-releases
@ -284,7 +284,7 @@ steps:
depends_on: [ build ]
- name: release
image: plugins/s3:1
image: plugins/s3
pull: true
settings:
bucket: vikunja-releases

View File

@ -9,6 +9,16 @@ All releases can be found on https://code.vikunja.io/frontend/releases.
The releases aim at the api versions which is why there are missing versions.
## [0.18.2] - 2021-11-23
### Fixed
* 0.18.2 release preparations
* Edit saved filter title
* Properly replace api url
* Remove ssl generation from docker image
* Use latest version of s3 plugin
## [0.18.1] - 2021-09-08
### Added

View File

@ -24,12 +24,6 @@ RUN \
# Stage 2: copy
FROM nginx
RUN apt-get update && apt-get install -y apt-utils openssl && \
mkdir -p /etc/nginx/ssl && \
openssl genrsa -out /etc/nginx/ssl/dummy.key 2048 && \
openssl req -new -key /etc/nginx/ssl/dummy.key -out /etc/nginx/ssl/dummy.csr -subj "/C=DE/L=Berlin/O=Vikunja/CN=Vikunja Snakeoil" && \
openssl x509 -req -days 3650 -in /etc/nginx/ssl/dummy.csr -signkey /etc/nginx/ssl/dummy.key -out /etc/nginx/ssl/dummy.crt
COPY nginx.conf /etc/nginx/nginx.conf
COPY run.sh /run.sh

View File

@ -4,7 +4,7 @@
[![Build Status](https://drone.kolaente.de/api/badges/vikunja/frontend/status.svg)](https://drone.kolaente.de/vikunja/frontend)
[![License: AGPL v3](https://img.shields.io/badge/License-AGPL%20v3-blue.svg)](LICENSE)
[![Download](https://img.shields.io/badge/download-v0.18.1-brightgreen.svg)](https://dl.vikunja.io)
[![Download](https://img.shields.io/badge/download-v0.18.2-brightgreen.svg)](https://dl.vikunja.io)
[![Translation](https://badges.crowdin.net/vikunja/localized.svg)](https://crowdin.com/project/vikunja)
This is the web frontend for Vikunja, written in Vue.js.

View File

@ -60,14 +60,15 @@ http {
server {
listen 80;
listen 81 default_server http2 proxy_protocol; ## Needed when behind HAProxy with SSL termination + HTTP/2 support
listen 443 default_server ssl http2;
server_name _;
expires $expires;
ssl_certificate /etc/nginx/ssl/dummy.crt;
ssl_certificate_key /etc/nginx/ssl/dummy.key;
location ~* .(txt|webmanifest|css|js|mjs|map|svg|jpg|jpeg|png|ico|ttf|woff|woff2|wav)$ {
root /usr/share/nginx/html;
try_files $uri $uri/ =404;
}
location / {
root /usr/share/nginx/html;

3
run.sh
View File

@ -9,7 +9,8 @@ fi
# Escape the variable to prevent sed from complaining
VIKUNJA_API_URL=$(echo $VIKUNJA_API_URL |sed 's/\//\\\//g')
sed -i "s/http\:\/\/localhost\:3456\/api\/v1/$VIKUNJA_API_URL/g" /usr/share/nginx/html/index.html
sed -i "s/http\:\/\/localhost\:3456//g" /usr/share/nginx/html/index.html # replacing in two steps to make sure api urls from releases are properly replaced as well
sed -i "s/'\/api\/v1/'$VIKUNJA_API_URL/g" /usr/share/nginx/html/index.html
# Set the uid and gid of the nginx run user
usermod --non-unique --uid ${PUID} nginx

View File

@ -61,6 +61,7 @@ import SavedFilterService from '@/services/savedFilter'
import ListModel from '@/models/list'
import Filters from '@/components/list/partials/filters.vue'
import {objectToSnakeCase} from '@/helpers/case'
import {CURRENT_LIST} from '../../../store/mutation-types'
export default {
name: 'filter-settings-edit',
@ -120,6 +121,8 @@ export default {
this.success({message: this.$t('filters.attributes.edit.success')})
this.filter = r
this.filters = objectToSnakeCase(this.filter.filters)
this.$store.commit(CURRENT_LIST, r)
this.setTitle(this.getListTitle(r))
this.$router.back()
})
.catch(e => this.error(e))