Merge branch 'master' into improvement/rights-performance
This commit is contained in:
commit
8ef5dc5d70
48
.drone1.yml
48
.drone1.yml
|
@ -205,6 +205,25 @@ steps:
|
|||
docker_image: vikunja/api
|
||||
confirm: true
|
||||
depends_on: [ docker ]
|
||||
|
||||
- name: telegram
|
||||
image: appleboy/drone-telegram
|
||||
depends_on:
|
||||
- rancher
|
||||
- release-latest
|
||||
settings:
|
||||
token:
|
||||
from_secret: TELEGRAM_TOKEN
|
||||
to:
|
||||
from_secret: TELEGRAM_TO
|
||||
message: >
|
||||
{{repo.owner}}/{{repo.name}}: \[{{build.status}}] Build {{build.number}}
|
||||
{{commit.author}} pushed to {{commit.branch}} {{commit.sha}}: `{{commit.message}}`
|
||||
Build started at {{datetime build.started "2006-Jan-02T15:04:05Z" "GMT+2"}} finished at {{datetime build.finished "2006-Jan-02T15:04:05Z" "GMT+2"}}.
|
||||
when:
|
||||
status:
|
||||
- success
|
||||
- failure
|
||||
---
|
||||
########
|
||||
# Build a release when tagging
|
||||
|
@ -324,34 +343,11 @@ steps:
|
|||
repo: vikunja/api
|
||||
auto_tag: true
|
||||
|
||||
# Update the instance on try.vikunja.io
|
||||
- name: rancher
|
||||
image: peloton/drone-rancher
|
||||
settings:
|
||||
url: http://server01.kolaente.de:8080/v1
|
||||
access_key:
|
||||
from_secret: RANCHER_ACCESS_KEY
|
||||
secret_key:
|
||||
from_secret: RANCHER_SECRET_KEY
|
||||
service: vikunja-dev/api
|
||||
docker_image: vikunja/api
|
||||
confirm: true
|
||||
depends_on: [ docker ]
|
||||
|
||||
---
|
||||
#############
|
||||
# Tell people vikunja was updated
|
||||
#############
|
||||
|
||||
kind: pipeline
|
||||
name: notify
|
||||
depends_on:
|
||||
- deploy-version
|
||||
- deploy-master
|
||||
|
||||
steps:
|
||||
- name: telegram
|
||||
image: appleboy/drone-telegram
|
||||
depends_on:
|
||||
- docker
|
||||
- release-version
|
||||
settings:
|
||||
token:
|
||||
from_secret: TELEGRAM_TOKEN
|
||||
|
|
|
@ -133,7 +133,6 @@ Sorry for some of them being in German, I'll tranlate them at some point.
|
|||
* [x] Deps nach mod umziehen
|
||||
* [ ] Performance bei rechtchecks verbessern
|
||||
* User & Teamright sollte sich für n rechte in einer Funktion testen lassen
|
||||
* [ ] Globale Limits für anlegbare Listen + Namespaces
|
||||
* [ ] "Smart Lists", Listen nach bestimmten Kriterien gefiltert -> nur UI?
|
||||
* [ ] "Performance-Statistik" -> Wie viele Tasks man in bestimmten Zeiträumen so geschafft hat etc
|
||||
* [ ] IMAP-Integration -> Man schickt eine email an Vikunja und es macht daraus dann nen task -> Achtung missbrauchsmöglichkeiten
|
||||
|
@ -165,6 +164,19 @@ Sorry for some of them being in German, I'll tranlate them at some point.
|
|||
* [ ] unused -> waiting for mod
|
||||
* [ ] gosec -> waiting for mod
|
||||
|
||||
### More server settings
|
||||
|
||||
* [ ] Caldav disable/enable
|
||||
* [ ] Assignees disable/enable
|
||||
* [ ] List/Namespace limits
|
||||
* [ ] Attachements disable/enable
|
||||
* [ ] Attachements size
|
||||
* [ ] Templates disable/enable
|
||||
* [ ] Stats disable/enable
|
||||
* [ ] Activity notifications disable/enable
|
||||
* [ ] IMAP integration disable/enable
|
||||
* [ ] Reminders via mail disable/enable
|
||||
|
||||
### Later
|
||||
|
||||
* [ ] Plugins
|
||||
|
@ -188,7 +200,7 @@ Sorry for some of them being in German, I'll tranlate them at some point.
|
|||
* [ ] Add new users via to a list which don't have an account yet, they'd get a link to sign up for vikunja.
|
||||
* [ ] Respect registration email domain limits
|
||||
* [ ] Export all data from Vikunja to json
|
||||
* [ ] Watch a list -> Will get notification for everything
|
||||
* [ ] Watch a (n internal) list -> Will get notification for everything
|
||||
* [ ] Archive a task instead of deleting
|
||||
* [ ] Task dependencies
|
||||
* [ ] Time tracking (possible plugin)
|
||||
|
|
2
Makefile
2
Makefile
|
@ -26,8 +26,6 @@ SOURCES ?= $(shell find . -name "*.go" -type f)
|
|||
|
||||
TAGS ?=
|
||||
|
||||
TMPDIR := $(shell mktemp -d 2>/dev/null || mktemp -d -t 'kasino-temp')
|
||||
|
||||
ifeq ($(OS), Windows_NT)
|
||||
EXECUTABLE := vikunja.exe
|
||||
else
|
||||
|
|
|
@ -17,6 +17,15 @@ first:
|
|||
child: true
|
||||
```
|
||||
|
||||
## Config file locations
|
||||
|
||||
Vikunja will search on various places for a config file:
|
||||
|
||||
* Next to the location of the binary
|
||||
* In the `service.rootpath` location set in a config (remember you can set config arguments via environment variables)
|
||||
* In `/etc/vikunja`
|
||||
* In `~/.config/vikunja`
|
||||
|
||||
# Default configuration with explanations
|
||||
|
||||
This is the same as the `config.yml.sample` file you'll find in the root of vikunja.
|
||||
|
|
|
@ -84,8 +84,9 @@ func init() {
|
|||
viper.AutomaticEnv()
|
||||
|
||||
// Load the config file
|
||||
viper.AddConfigPath(exPath)
|
||||
viper.AddConfigPath(viper.GetString("service.rootpath"))
|
||||
viper.AddConfigPath("/etc/vikunja/")
|
||||
viper.AddConfigPath("~/.config/vikunja")
|
||||
viper.AddConfigPath(".")
|
||||
viper.SetConfigName("config")
|
||||
err = viper.ReadInConfig()
|
||||
|
|
Loading…
Reference in New Issue