simonmichael/hledger
1
1
Fork 0
mirror of https://github.com/simonmichael/hledger.git synced 2024-09-20 02:37:12 +03:00
Code Issues Projects Releases Wiki Activity
3,480 Commits 53 Branches 496 Tags 116 MiB
db1d866f07
Commit Graph

452 Commits

Author SHA1 Message Date
Simon Michael
2160941c86 Merge branch 'release-0.22.1' 
Conflicts:
	NEWS.md
	hledger-lib/hledger-lib.cabal
 2014-01-08 15:34:20 -08:00
Simon Michael
2ec6231a51 bump version to 0.22.1 2014-01-08 15:01:45 -08:00
Xinruo Sun
0275485bf9 web: add a --static-root option to customize static files root 2013-12-15 12:20:07 +08:00
Simon Michael
8befcb8354 bump version to 0.22, update tested-with & doc building 2013-12-13 18:28:45 -08:00
Simon Michael
641dc5aa84 web: also build with http-conduit 2.x 
http-client is now also required. Later we perhaps should switch to it
entirely and drop the http-conduit dependency.
 2013-12-09 10:06:53 -08:00
Simon Michael
d8c987a1cd web: allow latest warp & wai-handler-launch 2013-12-09 07:32:40 -08:00
Simon Michael
02fea186a3 web: fix debug option breakage in Main 2013-12-08 19:48:51 -08:00
Simon Michael
926080310a web: avoid warp 2 for now to stay installable 2013-12-07 14:41:37 -08:00
Simon Michael
c53732a4af balance: new multi-column reports & documentation 
Two new multi-column balance report modes show ending balance per
period: `--cumulative`, starting from 0, and `--historical`, starting
from the historical starting balance.

The balance command's specification has been clarified and consolidated
in the Balance.hs haddock. Reports.hs has also had haddock updates. The
old AccountsReport type is now BalanceReport, still used by
single-column balance report. The new MultiBalanceReport type is used by
the multi-column reports.
 2013-12-07 05:43:31 -08:00
Simon Michael
a7c7fc1a43 web: fix too-loose yesod dependency, we require 1.2.* 2013-11-02 11:55:04 -07:00
Simon Michael
009c7e3f90 bump version to 0.22 alpha 2013-09-22 22:38:27 -07:00
Simon Michael
a66a715eeb command line options API updates, possibly fixing hledger-web build 2013-09-22 22:31:06 -07:00
Simon Michael
060d1fdd1b change comm: to sym: and require a match on the whole symbol 2013-09-09 15:26:45 -07:00
Simon Michael
957f57a07b new comm:REGEXP query matches commodity symbols. Also some minor amt: fixes. 2013-09-09 15:04:43 -07:00
Simon Michael
c2cdead4ef web: remove another yesod-platform dependency 2013-07-10 08:23:32 -07:00
John Wiegley
a05e7a5a67 yesod-platform dependency is unnecessary 2013-06-24 15:42:12 -05:00
Simon Michael
318d36d712 bump version 2013-06-23 16:50:35 -07:00
Simon Michael
4eda6119f8 bump version to 0.21.2 2013-06-04 19:07:22 -07:00
Simon Michael
080eb866ec web: clean up language extensions a bit, make autoweb works again 2013-06-04 18:23:55 -07:00
Simon Michael
557419de8c bump version to 0.21.1 2013-06-03 23:18:30 -07:00
Simon Michael
42da3a5071 web: avoid trailing commas in register chart values, in case of trouble with IE 
Hopefully adding [] is harmless.
 2013-06-03 23:18:04 -07:00
Simon Michael
4f5b43050e web: list chart values earliest first 2013-06-03 23:17:06 -07:00
Simon Michael
b6e256554d Merge branch 'master' of github.com:simonmichael/hledger 2013-06-01 15:58:37 -07:00
Simon Michael
8f435e1620 Merge pull request #121 from jeffrichards/master 
remove the tooltip from the hledger-web journal screen.
 2013-06-01 15:58:26 -07:00
Simon Michael
4041f5a553 bump version to 0.21 2013-06-01 15:58:06 -07:00
Simon Michael
9602c29692 web: show zero-balance accounts in the sidebar as well (fixed #106) 2013-06-01 15:42:50 -07:00
Simon Michael
2e5718d5ea web: show one line per commodity in charts. Needs more polish, but fixes #109. 2013-06-01 15:33:33 -07:00
Jeff Richards
7890f24415 remove a the tool tip from the journal screen, as it just duplicates the 
info shown on screen.
 2013-06-01 14:20:08 -07:00
Simon Michael
cc087826e0 web: don't show prices in the accounts sidebar (fixes #114) 2013-06-01 12:35:10 -07:00
Simon Michael
c744451dfa web: loosen "starting web browser" message for servers 2013-06-01 11:40:00 -07:00
Simon Michael
41277766fc fix a compilation warning 2013-06-01 11:38:01 -07:00
Xinruo Sun
34a31285a9 web: use select2 to autocomplete 
Use the javascript library select2 to autocomplete descriptions and
account names when adding a transaction. The autocomplete searches by
substring, prefix and infix. New values will also be accepted.

This replaces dhtmlxcombo library so it is removed. Also updated jquery
to the latest 1.10.1.
 2013-06-01 13:20:37 +08:00
Simon Michael
207fd06a6f web: fix a compilation breakage from balance assertions work 2013-05-30 14:45:30 -07:00
Simon Michael
4721bfce42 bump yesod-platform dependency to avoid a cabal install failure 
cabal-install's default backtracking of 200 is insufficient to
install (eg) current hledger-web, yesod-platform 1.2 and HP. (It works
at 400). Requiring the latest yesod-platform seems to resolve the problem.
 2013-05-29 22:24:52 -07:00
Simon Michael
19d55076a4 web: require yesod 1.2, cabal file cleanup 2013-05-14 15:36:44 -07:00
Simon Michael
4ff2635bf8 bump version to 0.20.98 (0.21 alpha) 2013-05-14 10:30:46 -07:00
Simon Michael
1db8920644 bump version to 0.20.0.1 2013-05-04 07:26:15 -07:00
Simon Michael
28a605ceb0 docs: update bug tracker and repository locations in cabal files 2013-05-03 06:46:23 -07:00
Simon Michael
9234923ed5 web: require at least version 1.1.7 of yesod-core to avoid a Foundation.hs build error 2013-05-03 06:36:48 -07:00
Simon Michael
b89168d1b0 bump version number 2013-05-01 12:46:37 -07:00
Simon Michael
8873ffbe77 web: fix auto-exit in local mode, clarify startup messages 2013-05-01 12:02:47 -07:00
Simon Michael
b06c96c04c web: be less verbose about web files source, mention it only in dev mode 2013-05-01 07:24:42 -07:00
Simon Michael
c9b6dd8819 web: --server flag re-enables long-running, request-logging mode; output cleanups 2013-05-01 07:23:59 -07:00
Simon Michael
0a47715b17 web: also launch a browser at startup; auto-terminate after 2m or on enter 
We're now using the wai-handler-launch middleware. This injects a
script in each page that pings the server repeatedly, and terminates
the server if it gets no pings (ie there are no browser tabs
displaying the app) for two minutes. The server can also be easily
terminated at the console by pressing enter, yesod devel style.
 2013-04-20 20:02:50 -07:00
Simon Michael
9148bd8e8c web: don't use wai-handler-launch with yesod devel 2013-04-20 19:57:19 -07:00
Simon Michael
0a77eba02e web: try using wai-launch-handler.. not working yet 2013-04-20 10:03:15 -07:00
Simon Michael
e252b43c0a web: remove left sidebar border, extend right border to height of sidebar content 2013-04-19 14:49:15 -07:00
Simon Michael
dc6998ea2a web: hide copyright boilerplate in dev build 2013-04-19 14:46:22 -07:00
Simon Michael
1a57dbb65c web: disable request logging in production builds, for now 2013-04-19 14:45:25 -07:00
Simon Michael
2eabcd1360 reverse and rename the blaze_html_0_5 flag to blaze_html_0_4 2013-04-19 12:40:29 -07:00
Simon Michael
a32b0513bd update tested-withs. hledger needs 7.2+, hledger-web needs 7.4+ for now 2013-04-19 12:26:05 -07:00
Simon Michael
fc39b4c25d the version bump was premature, revert so I can push 
This reverts commit 1bc8b73159.
 2013-04-19 11:54:26 -07:00
Simon Michael
dd956ea395 web: make cabal test pass 2013-04-19 11:50:41 -07:00
Simon Michael
030a03d9e3 Merge branch 'master' of github.com:simonmichael/hledger 2013-04-18 12:49:14 -07:00
Peter Simons
b7283759d6 hledger-web: allow building with blaze-html 0.6.x 2013-04-18 14:23:05 +02:00
Peter Simons
da8f4a1cb6 hledger-web: add missing Setup.hs file 2013-04-18 13:16:38 +02:00
Simon Michael
1bc8b73159 bump version 2013-04-17 17:20:59 -07:00
Simon Michael
05da80b71d web: use full width for search box, update search help 2013-04-15 17:28:30 -07:00
Simon Michael
b878779c8a web: build with latest clientsession and http-conduit 2013-04-15 08:20:59 -07:00
Simon Michael
d5e575c862 web: remove io-storage 2013-04-09 12:53:21 -07:00
Simon Michael
0df4a235af web: set up journal for yesod devel, store it in App (fixes #101) 
The web app's journal state is now kept in the yesod App as an IORef,
instead of using io-storage.
yesod devel now works; it uses the journal file specified by
$LEDGER_FILE, or ~/.hledger.journal.

web: update journal state handling, fix yesod devel - WIP
 2013-04-09 12:41:22 -07:00
Marko Kocic
2cd0a9c9c0 Switch to new yesod clientSessionBacked2 for better performance 2013-04-09 08:56:41 +00:00
Simon Michael
9ffd34687a web: avoid a fromJust error when running with yesod devel (not working yet) 2013-04-05 20:59:31 -07:00
Simon Michael
a33b42bbd9 update tested-with in cabal files 2013-02-25 19:50:49 +00:00
Simon Michael
345bc18182 web: 98: add missing template files to cabal file, again fixing cabal-dev & hackage builds (Eric Hetzner) 2013-01-24 17:07:21 +00:00
Simon Michael
caa0b27cb0 web: 97: add missing static files to cabal file fixing cabal-dev and hackage builds 2013-01-11 14:49:28 +00:00
Simon Michael
67d1f91909 web: fix compilation; also fixes some hardcoded static urls (Xinruo Sun) 2013-01-11 13:54:49 +00:00
Simon Michael
621a91807e rename actual/effective dates to primary/secondary 
The command-line flag is now --date2. Alternate spellings --effective and --aux-date
are accepted for compatibility.
 2012-12-06 04:43:41 +00:00
Simon Michael
e3d5fdde66 web: small style cleanup 2012-12-03 23:53:26 +00:00
Simon Michael
c553103caf bump version 2012-11-27 23:53:16 +00:00
Simon Michael
3da5f3c0c6 web: use normalise, bootstrap, and widgets 2012-11-27 23:52:08 +00:00
Simon Michael
a44d30e6f1 web: serve a favicon (Yesod's) 2012-11-27 23:51:24 +00:00
Simon Michael
bd629e4853 web: tested with GHC 7.6 2012-11-27 05:31:31 +00:00
Simon Michael
7599ec2c84 web: allow latest shakespeare-js & yesod-form 2012-11-27 05:31:12 +00:00
Simon Michael
1d8fe29c4c docs: point to new repo location on darcs hub 2012-11-17 04:31:21 +00:00
Simon Michael
0f664057d7 web: fix this dev build warning without breaking prod 2012-11-23 20:49:53 +00:00
Simon Michael
6cf883bcc3 web: fix build error 2012-11-21 17:39:31 +00:00
Simon Michael
ad88df99fa refactor: try to organise handler support code better 2012-11-20 02:51:38 +00:00
Simon Michael
26a37bf3df web: quick fix for "Prelude.read: no parse" errors with GHC >= 7.6 2012-11-24 15:13:14 +00:00
Simon Michael
81354fb492 web: split handlers into multiple files 2012-11-20 02:23:23 +00:00
Simon Michael
64180b18ef refactor: clarify that price amounts have only a single commodity 2012-11-19 23:17:55 +00:00
Simon Michael
5a534f1c73 web: fix after refactor 2012-11-19 21:47:47 +00:00
Simon Michael
ae74983436 web: build-depends cleanup 2012-11-24 15:35:09 +00:00
Simon Michael
3d8dbb9d35 web: depend on same yesod version in lib and exe 2012-11-21 17:41:11 +00:00
Simon Michael
7798744d60 should have released hledger-lib; bump all version numbers again 2012-11-24 16:01:19 +00:00
Simon Michael
d22be3ac30 bump hledger & hledger-web versions 2012-11-24 15:34:53 +00:00
Simon Michael
0e8eb92c23 web: bump hledger dependency, release notes 2012-11-17 03:49:29 +00:00
Simon Michael
3d33673b25 web: obey command-line query options at startup again 2012-11-15 17:53:10 +00:00
Simon Michael
2ed17f29e6 web: fix ghc/cabal warnings 2012-11-16 17:08:27 +00:00
Simon Michael
a39b8f652a web: add missing files to cabal 2012-11-16 17:08:54 +00:00
Simon Michael
42185474c0 web: tweak "embedded files" message 2012-11-17 01:23:05 +00:00
Simon Michael
695ff9a49e 91: don't require a ./config/ directory at hledger-web startup 
As before, hledger-web writes a yesod session file in the current
directory at startup. It's now called ./.hledger-web_client_session_key.aes
 2012-11-17 01:25:33 +00:00
Simon Michael
cfbd8bb956 web: update for yesod 1.1.3 
Build with latest yesod. Also reorganise to conform more closely with
yesod's standard scaffold layout to reduce upgrade effort.
 2012-11-15 17:48:48 +00:00
Simon Michael
f441bbd946 web: add missing CPP pragma 2012-10-13 14:57:42 +00:00
Simon Michael
00f22819ae balance report speedup 
This refactoring fixes an O(n^2) slowdown in the balance command with
large numbers of accounts. It's now speedy, and the implementation is
clearer. To facilitate this, the Account type now represents a tree of
accounts which can easily be traversed up or down (and/or flattened
into a list).

Benchmark on a 2010 macbook:

    +-------------------------------------------++--------------+------------+--------+
    |                                           || before:      | after:     |        |
    |                                           || hledger-0.18 | hledgeropt | ledger |
    +===========================================++==============+============+========+
    | -f data/100x100x10.journal     balance    ||         0.21 |       0.07 |   0.09 |
    | -f data/1000x1000x10.journal   balance    ||        10.13 |       0.47 |   0.62 |
    | -f data/1000x10000x10.journal  balance    ||        40.67 |       0.67 |   1.01 |
    | -f data/10000x1000x10.journal  balance    ||        15.01 |       3.22 |   2.36 |
    | -f data/10000x1000x10.journal  balance aa ||         4.77 |       4.40 |   2.33 |
    +-------------------------------------------++--------------+------------+--------+
 2012-10-21 17:18:18 +00:00
Simon Michael
51a9f2a948 bump version 2012-10-21 20:20:35 +00:00
Simon Michael
f03b020e2f set version with CPP instead of cabal-file-th; make building more robust 
hledger and hledger-web were reading their version number (and program
name) from their cabal files at compile time using cabal-file-th,
which allowed the version number be maintained in one place (per
package).

This meant you had to be in same directory as the cabal file when
building, which made life more complicated, eg emacs compilation mode
could not jump to errors. Also, it slowed down building slightly, and
is a factor in hledger Debian packages being unavailable on a number
of platforms (we also use TH for report templates).

Now, the build version is set with a CPP VERSION flag, which seems
simpler overall. For cabal builds, this needs to be configured
manually in a few more places in each cabal file. For makefile builds,
it is set it to the name of the most recent darcs tag (which should be
more useful than the old behaviour). If not set, it defaults to the
blank string, useful eg for haddock. And, all makefile builds now run
from the top directory.
 2012-10-13 19:21:17 +00:00
Simon Michael
7fec954cbf support latest cmdargs, haskeline, split 2012-10-08 16:50:35 +00:00
Simon Michael
155cb0eafe web: fix compilation error with -fblaze_html_0_5 flag 2012-07-08 00:18:39 +00:00
Simon Michael
f8a9cce43d bump base lower bound to 4.3 to enforce GHC 7 requirement 2012-07-08 00:22:20 +00:00
Simon Michael
63973c3728 bump version to 0.18.2 2012-07-08 00:24:40 +00:00
Simon Michael
5e944374de web: don't auto-create a missing journal file at startup 2012-06-29 22:48:41 +00:00
Simon Michael
461f370db0 web: fix a cabal warning 2012-06-29 22:54:54 +00:00
Simon Michael
480e9a4080 web: cabal flag "blaze_html_0_5", off by default, uses the newer blaze-html 0.5 2012-06-29 23:07:19 +00:00
Simon Michael
6db9db0be1 bump version 2012-06-29 23:09:19 +00:00
Simon Michael
4b11890e02 web: fix a build error 2012-03-07 16:42:35 +00:00
Simon Michael
e8114f3ffb web: add missing language flag to hledger-web.hs 2012-03-30 19:24:43 +00:00
Simon Michael
28d86aca53 web: fix excess angle bracket in add form 2012-04-01 21:07:01 +00:00
Simon Michael
25b514b721 web: fix js error breaking second use of add form (#72) 2012-04-01 21:08:30 +00:00
Simon Michael
bb131f1b8c web: add closing angle brackets which yesod 1.0 requires 2012-04-01 20:30:44 +00:00
Simon Michael
296a4d1bb2 web: better hamlet override 2012-04-03 17:53:12 +00:00
Simon Michael
64b6316785 web: revert unintended hunk in Settings.hs 2012-04-03 17:43:49 +00:00
Simon Michael
acc5139c54 tools: makefile updates 2012-04-03 17:12:47 +00:00
Simon Michael
f298aac874 web: fix account balance rendering 2012-05-29 03:18:24 +00:00
Simon Michael
9184036fe8 require blaze-html < 0.5 to simplify that dep 2012-05-29 14:59:43 +00:00
Simon Michael
f35b961c86 web: update for yesod 1.0 2012-05-29 02:53:33 +00:00
Simon Michael
8f94ae3de4 web: yesod 0.10 now requires shakespeare-text 0.11, relax the upper bound on that 2012-03-28 15:43:32 +00:00
Simon Michael
98274b481d more build warnings 2012-05-06 20:44:23 +00:00
Simon Michael
88f69e12e2 fix Dates exports for hledger-web 2012-04-16 17:09:27 +00:00
Simon Michael
d0bf2667c2 bump version 2012-05-28 21:08:05 +00:00
Simon Michael
1f1a1eb16f bump version 2012-03-30 00:27:23 +00:00
Simon Michael
93dd7bd064 web: simplify ifdef 2012-05-29 16:43:13 +00:00
Simon Michael
b4514cc37d web: don't munge static file names in dev mode 2012-05-29 03:09:43 +00:00
Simon Michael
f6f615196f web: define our own hamlet so it can be tweaked for debugging 2012-04-01 20:49:36 +00:00
Simon Michael
cfa59cc4f8 web: Hledger.Web api cleanup, haddocks 2012-04-01 20:29:10 +00:00
Simon Michael
2912a11929 web: officially drop GHC 6.12 support, fix build warnings with 7.0, 7.2, 7.4 2012-03-29 23:24:48 +00:00
Simon Michael
7f3b990394 docs: fix api docs 2012-03-07 16:05:04 +00:00
Simon Michael
5b749ab8a2 web: work around static file problem by skipping etag parameter 2012-05-29 16:45:24 +00:00
Simon Michael
88212f26e8 simplify journal parser names 2012-05-09 15:34:05 +00:00
Simon Michael
c23d1793ae docs: clarify supported GHC versions 2012-03-29 22:09:54 +00:00
Simon Michael
e1b1b8bce8 rename Matcher to Query, simplify constructors 2012-05-16 07:12:49 +00:00
Simon Michael
0c73d91f94 web: fix static file embedding in non-dev builds 2012-03-09 18:52:31 +00:00
Simon Michael
a27eb7c29f more matcher -> query renaming 2012-05-16 07:37:24 +00:00
Simon Michael
c27707f578 web: bump version, upgrade to yesod 0.10 2012-03-05 07:52:36 +00:00
Simon Michael
8492f6cae4 fix unicode handling on GHC >= 7.2, unify utf8 IO compatibility layer 
tests pass again from GHC 6.12.3 to 7.4.1
 2012-03-29 19:06:31 +00:00
Simon Michael
51408e52ed web: make "yesod devel" work 2012-03-30 19:31:53 +00:00
Simon Michael
6eb7ad28e1 refactor/beef up readJournal/readJournalFile 2012-03-23 16:21:41 +00:00
Simon Michael
1165a9e634 set more upper bounds to fix cabal install issues with latest web packages 2012-03-03 19:01:32 +00:00
Simon Michael
f1da4912e8 web: we can use the main aeson package again 2012-01-02 13:17:44 +00:00
Simon Michael
48460b0130 fix missing chart regression (#72) 2012-01-03 13:00:28 +00:00
Simon Michael
03359b48d3 web: prevent flot js error which broke add form fields after adding a transaction (#72) 2012-01-03 12:14:22 +00:00
Simon Michael
7f60e3504c web: fix $ quoting 2012-01-03 10:46:39 +00:00
Simon Michael
fd22dde57b web: needed to escape literal dollar signs in hamlet templates 2012-01-02 13:19:12 +00:00
Simon Michael
015dacb0d7 web: add form should reject blank account names (#81) 2012-01-04 11:35:39 +00:00
Simon Michael
26ad00a659 support and require latest cmdargs 2012-01-05 18:25:15 +00:00
Simon Michael
3e3af47b96 bump cmdargs upper bound in other places 2012-01-03 11:00:35 +00:00
Simon Michael
0bd7fffaf7 web: dodge a yesod-core regression breaking add form redirect (#53) 2012-01-12 15:44:32 +00:00
Simon Michael
1b834afb20 web: avoid problematic redirect after submitting the add form 2012-01-03 12:43:30 +00:00
Simon Michael
0670fda22e web: allow template-haskell 2.6.0.0 2012-01-29 21:32:07 +00:00
Simon Michael
c686645fab refactor: update version number handling 2012-01-31 06:01:31 +00:00