diff options
| author | Mark Wales <mark@smallhadroncollider.com> | 2020-09-14 14:13:14 +0100 |
|---|---|---|
| committer | Mark Wales <mark@smallhadroncollider.com> | 2020-09-14 14:13:14 +0100 |
| commit | b6a4d4a460b0ca79c94396f81b16c1c074cf0fe6 (patch) | |
| tree | 96a60ff17f1707c0a7a1d94e3098b3c54ad3cdbb | |
| parent | d0c51d17d751577cd8a0ad8e44ddda361473d973 (diff) | |
| parent | a6822e2236a780fe69af3fa0e5612036806b8d2c (diff) | |
Merge branch 'release/1.10.1' into master1.10.1
| -rwxr-xr-x | docs/html/_config.yml | 2 | ||||
| -rw-r--r-- | docs/html/index.md | 4 | ||||
| -rw-r--r-- | package.yaml | 2 | ||||
| -rw-r--r-- | src/Taskell/Events/State.hs | 3 | ||||
| -rw-r--r-- | stack.yaml | 2 | ||||
| -rw-r--r-- | stack.yaml.lock | 8 |
6 files changed, 13 insertions, 8 deletions
diff --git a/docs/html/_config.yml b/docs/html/_config.yml index e854c19..ee80e20 100755 --- a/docs/html/_config.yml +++ b/docs/html/_config.yml @@ -3,7 +3,7 @@ title: taskell tagline: Command-line Kanban board/task management baseurl: "" locale: "en" -version: 1.10.0 +version: 1.10.1 destination: _site/public exclude: [deployment, Capfile, log, Gemfile, Gemfile.lock] diff --git a/docs/html/index.md b/docs/html/index.md index 7c27bcc..7826312 100644 --- a/docs/html/index.md +++ b/docs/html/index.md @@ -262,6 +262,10 @@ subtask = "-" **Warning**: currently if you change your `[markdown]` settings any older files stored with different settings will not be readable. +### Template + +You can edit the `template.md` config file to change what a new taskell file looks like. + ### Controls You can edit keyboard bindings in the `bindings.ini` config file. diff --git a/package.yaml b/package.yaml index 4606437..8d800c7 100644 --- a/package.yaml +++ b/package.yaml @@ -1,5 +1,5 @@ name: taskell -version: '1.10.0' +version: '1.10.1' category: Command Line Tools author: Mark Wales maintainer: mark@smallhadroncollider.com diff --git a/src/Taskell/Events/State.hs b/src/Taskell/Events/State.hs index 9e9584e..fc4be23 100644 --- a/src/Taskell/Events/State.hs +++ b/src/Taskell/Events/State.hs @@ -65,6 +65,7 @@ import ClassyPrelude hiding (delete) import Control.Lens ((%~), (&), (.~), (?~), (^.)) import Data.Char (digitToInt, ord) +import Data.Text (strip) import Data.Time.Zones (TZ) import qualified Taskell.Data.List as L (List, deleteTask, duplicate, getTask, move, nearest, new, @@ -150,7 +151,7 @@ setCurrentTask task state = setList state . L.update (getIndex state) task <$> g setCurrentTaskText :: Text -> Stateful setCurrentTaskText text state = - flip setCurrentTask state =<< (name .~ text) <$> getCurrentTask state + flip setCurrentTask state =<< (name .~ strip text) <$> getCurrentTask state startCreate :: Stateful startCreate = pure . (mode .~ Insert ITask ICreate blankField) @@ -1,4 +1,4 @@ -resolver: lts-16.7 +resolver: lts-16.14 pvp-bounds: both packages: - . diff --git a/stack.yaml.lock b/stack.yaml.lock index d77e2d4..4f86fcd 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -13,7 +13,7 @@ packages: hackage: tz-0.1.3.3 snapshots: - completed: - size: 531237 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/16/1.yaml - sha256: 954b6b14b0c8130732cf4773f7ebb4efc9a44600d1a5265d142868bf93462bc6 - original: lts-16.1 + size: 532382 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/16/14.yaml + sha256: 1ef27e36f38824abafc43224ca612211b3828fa9ffd31ba0fc2867ae2e19ba90 + original: lts-16.14 |