Merge remote-tracking branch 'upstream/master' into icu-sorting

Author: alerque

.appveyor.yml

@@ -1,12 +1,13 @@
 [test "website"]
     command      = ./Shake.hs && ./Shake Clean && ./Shake website
-    trackedFiles = site/_site \
-                   site/csv.md \
-                   site/hledger-api.md \
-                   site/hledger-ui.md \
-                   site/hledger-web.md \
-                   site/hledger.md \
-                   site/journal.md \
-                   site/manual.md \
-                   site/timeclock.md \
-                   site/timedot.md
+#TODO: update for new site
+#    trackedFiles = site/_site \
+#                   site/csv.md \
+#                   site/hledger-ui.md \
+#                   site/hledger-web.md \
+#                   site/hledger.md \
+#                   site/journal.md \
+#                   site/manual.md \
+#                   site/timeclock.md \
+#                   site/timedot.md
+#

.ci

@@ -1,21 +1,16 @@
---exclude=.build
---exclude=.idea
---exclude=.shake
---exclude=.stack-work
---exclude=.vagrant
---exclude=.vscode
+--exclude=.*
 --exclude=_*
 --exclude=bin
 --exclude=doc/irc
 --exclude=doc/profs
---exclude=dist
+--exclude=dist*
 --exclude=examples
 --exclude=bootstrap*
 --exclude=excanvas*
 --exclude=highslide*
 --exclude=jquery*
 --exclude=typeahead*
 --exclude=old
---exclude=site/doc
---exclude=site/files
---exclude=tests/addons/hledger-*
+--exclude=site/out*
+--exclude=site/src/1*
+--exclude=hledger/test/addons/hledger-*

.ctags

@@ -1,4 +1,13 @@
 :set prompt "ghci> "
+import System.Environment
+setEnv "NO_COLOR" "1"
+-- TEMP
+-- :m +*Hledger.Cli.Commands
+
+-- https://github.com/cdepillabout/pretty-simple
+-- If not using a cabal environment file with pretty-simple added, this adds itK here:
+-- :set -package pretty-simple
+:set -interactive-print=Text.Pretty.Simple.pPrintNoColor
 
 -- ghci commands to be run once at ghci startup
 -- http://www.haskell.org/ghc/docs/7.6.3/html/users_guide/ghci-commands.html
@@ -11,6 +20,9 @@
 -- -- :reload and run commands in .ghci2
 -- :def R \_ -> return ":reload\n:script .ghci2"
 
+-- Reload (to pick up code changes and flush cached unsafePerformIO values) and run main with the given args
+:def! rmain \args -> return $ ":reload\n:main "<>args
+
 -- -- run commands from a file, .ghci2 by default
 -- :def s \f -> readFile $ if null f then ".ghci2" else f
 

.ghci

@@ -1,7 +1,8 @@
 # These are supported funding model platforms
 
 github: [simonmichael]  # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
-patreon: # Replace with a single Patreon username
+liberapay: simonmichael
+# patreon: simonmichael  # Replace with a single Patreon username
 open_collective: hledger  # Replace with a single Open Collective username
 ko_fi: # Replace with a single Ko-fi username
 tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel

.github/FUNDING.yml

@@ -1,21 +1,12 @@
 ---
 name:  A bug
-about: Any problem that is most likely an error or weakness in hledger's software, documentation, web presence, usability etc.
+about: A weakness in the software, documentation, usability, or project
 labels: A BUG
 ---
 
-Thank you for helping to make hledger better!
+Thanks for reporting! Here are some tips (please remove this text before submitting):
 
-If you're not sure it's a bug, or if some discussion would help,
-contact us first on the #hledger IRC chat room or the mail list:
-
-http://irc.hledger.org  (best; no chat client needed)
-http://list.hledger.org
-
-Some details that may be helpful to include: 
-
-- a minimal reproducible example
-- what related documentation you found at http://hledger.org
-- your hledger version
-- how you installed it
-- what platform you're on.
+- Have you checked (the right version of) the manual ? Eg https://hledger.org/hledger.html
+- If some discussion would help, just ask in chat or mail list: https://hledger.org/support.html
+- Any of these are very helpful: a small reproducible example, hledger --version output,
+  what platform you're running on, a link to to any relevant doc that you found.

.github/ISSUE_TEMPLATE/a-bug.md

@@ -1,15 +1,21 @@
 ---
 name:  A wish
-about: A request for something new to improve hledger software, documentation, etc.
+about: A request or proposal for improving hledger or the project.
 labels: A WISH
 ---
 
-Thank you for your input!
+Thanks for your suggestion! Here are some tips (please delete them before submitting):
 
-Note, we try to not clutter the bug tracker with wishlist items and ideas.
-Often it's best to raise these first on the #hledger IRC chat room or the mail list:
+- Have you looked for related features in the hledger manuals ? Eg:
+  https://hledger.org/dev/hledger.html
 
-http://irc.hledger.org   (quickest; no chat client needed)
-http://list.hledger.org  (most eyeballs)
+- We try to not clutter the bug tracker with too many wishes, since ideas are endless and developers are few.
+  Often it's better to discuss and build interest on chat or the mail list first:
+  https://hledger.org/support.html
 
-to discuss solutions and attract interest. Use your best judgement.
+- Not required, but any of these help to move things forward:
+  - A draft of user manual content and suggested location.
+  - A draft of command line help.
+  - A small mockup or example of intended output or UI.
+  - Appropriate topic labels, if you have the access level to set those.
+    (If not, feel free to write them in the issue title, eg as a prefix.)

.github/ISSUE_TEMPLATE/a-wish.md

@@ -0,0 +1,12 @@
+# https://help.github.com/en/github/building-a-strong-community/configuring-issue-templates-for-your-repository
+
+blank_issues_enabled: true
+contact_links:
+
+  - name: A support request
+    url: https://hledger.org/support.html
+    about: For questions and support, please use our chat or mail list. See hledger.org > Support.
+
+  - name: A security issue
+    url: https://joyful.com
+    about: Contact [email protected].

.github/ISSUE_TEMPLATE/config.yml

@@ -1,9 +1,22 @@
-# Thanks for your pull request! We appreciate it. 
-# If you're a new developer, FOSS contributor, or hledger contributor, welcome.
-# 
-# Much of our best design work and knowledge sharing happens during code review,
-# so be prepared for more work ahead, especially if your PR is large.
-# To minimise waste, and learn how to get hledger PRs accepted swiftly, 
-# please check the latest guidelines in the developer docs:
-# 
-# https://hledger.org/CONTRIBUTING.html#pull-requests
+<!--
+Thanks for your pull request! We appreciate it. 
+If you're a new developer, FOSS contributor, or hledger contributor, welcome.
+
+Much of our best design work and knowledge sharing happens during code review,
+so be prepared for more work ahead, especially if your PR is large.
+To minimise waste, and get your hledger PRs accepted quickly,
+please check the guidelines in the developer docs:
+
+https://hledger.org/PULLREQUESTS.html
+https://hledger.org/COMMITS.html
+
+You don't need to master our commit conventions, but do add at least one prefix and colon
+to the commit message summary. The most common prefixes are:
+
+- feat: for user-visible features
+- fix:  for user-visible fixes
+- imp:  for user-visible improvements
+- ;doc:  for documentation improvements  (; at the start enables quicker/cheaper CI tests)
+- dev:  for internal improvements
+
+-->