slaesvuo/hledger
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,000 Commits 1 Branch 0 Tags 88 MiB
4ea02bf1cb
Commit Graph

248 Commits

Author SHA1 Message Date
Simon Michael
d165600155 lib, cli, web, api: use hpack (package.yaml) for all packages at last #371 
Generated package.yaml files from the old cabal files with hpack-convert,
removed some problematic blank lines manually,
regenerated the cabal files from the package.yaml files with hpack.
Tests pass, looks like all the info is still there.

This means that from now on, we don't edit cabal files directly.
We edit the less verbose package.yaml files. stack will update
the cabal files automatically (or non-stack users can use hpack).
The changes to both are committed, as we still want to provide
the cabal files to downloaders.
 2016-08-09 07:24:57 -07:00
Moritz Kiefer
4141067428 Replace Parsec with Megaparsec (see #289) (#366) 
* Replace Parsec with Megaparsec (see #289)

This builds upon PR #289 by @rasendubi

* Revert renaming of parseWithState to parseWithCtx

* Fix doctests

* Update for Megaparsec 5

* Specialize parser to improve performance

* Pretty print errors

* Swap StateT and ParsecT

This is necessary to get the correct backtracking behavior, i.e. discard
state changes if the parsing fails.
 2016-07-29 08:57:10 -07:00
Simon Michael
b540b4336e web: looser dependency on hledger/hledger-lib #353 2016-07-24 18:16:29 -07:00
Simon Michael
a961988a88 bump cabal versions to 0.28 2016-05-29 00:00:59 -07:00
Simon Michael
2538d14ea7 lib: textification begins! account names 
The first of several conversions from String to (strict) Text, hopefully
reducing space and time usage.

This one shows a small improvement, with GHC 7.10.3 and text-1.2.2.1:

hledger -f data/100x100x10.journal stats
string: <<ghc: 39471064 bytes, 77 GCs, 198421/275048 avg/max bytes residency (3 samples), 2M in use, 0.000 INIT (0.001 elapsed), 0.015 MUT (0.020 elapsed), 0.010 GC (0.014 elapsed) :ghc>>
text:   <<ghc: 39268024 bytes, 77 GCs, 197018/270840 avg/max bytes residency (3 samples), 2M in use, 0.000 INIT (0.002 elapsed), 0.016 MUT (0.022 elapsed), 0.009 GC (0.011 elapsed) :ghc>>

hledger -f data/1000x100x10.journal stats
string: <<ghc: 318555920 bytes, 617 GCs, 2178997/7134472 avg/max bytes residency (7 samples), 16M in use, 0.000 INIT (0.001 elapsed), 0.129 MUT (0.136 elapsed), 0.067 GC (0.077 elapsed) :ghc>>
text:   <<ghc: 314248496 bytes, 612 GCs, 2074045/6617960 avg/max bytes residency (7 samples), 16M in use, 0.000 INIT (0.003 elapsed), 0.137 MUT (0.145 elapsed), 0.067 GC (0.079 elapsed) :ghc>>

hledger -f data/10000x100x10.journal stats
string: <<ghc: 3114763608 bytes, 6026 GCs, 18858950/75552024 avg/max bytes residency (11 samples), 201M in use, 0.000 INIT (0.000 elapsed), 1.331 MUT (1.372 elapsed), 0.699 GC (0.812 elapsed) :ghc>>
text:   <<ghc: 3071468920 bytes, 5968 GCs, 14120344/62951360 avg/max bytes residency (9 samples), 124M in use, 0.000 INIT (0.003 elapsed), 1.272 MUT (1.349 elapsed), 0.513 GC (0.578 elapsed) :ghc>>

hledger -f data/100000x100x10.journal stats
string: <<ghc: 31186579432 bytes, 60278 GCs, 135332581/740228992 avg/max bytes residency (13 samples), 1697M in use, 0.000 INIT (0.008 elapsed), 14.677 MUT (15.508 elapsed), 7.081 GC (8.074 elapsed) :ghc>>
text:   <<ghc: 30753427672 bytes, 59763 GCs, 117595958/666457240 avg/max bytes residency (14 samples), 1588M in use, 0.000 INIT (0.008 elapsed), 13.713 MUT (13.966 elapsed), 6.220 GC (7.108 elapsed) :ghc>>
 2016-05-24 19:00:49 -07:00
Simon Michael
7ec3ebb66b update tested-with 
Note we seem to have lost GHC 7.4 compatibility. It should be fixable if
anyone cares.
 2016-04-28 17:32:17 -07:00
Simon Michael
91847fc6fd data-files does not support wildcards after all 2016-04-20 13:23:05 -07:00
Simon Michael
33b5c5dc94 declare generated docs as data-files, sync hpack yamls 2016-04-20 12:47:17 -07:00
Simon Michael
b73bcda52a include txt man pages in cabal tarballs 2016-04-13 22:38:53 -07:00
Simon Michael
b4d491791c doc: include nroff man pages in cabal tarballs 2016-04-12 11:25:46 -07:00
Simon Michael
5e71d749c4 doc: ensure all five main packages have a README 2016-04-12 11:13:01 -07:00
Thomas R. Koll
f9c1902cbb web: delete a few unused files from Yesod default app 
the normalize file is called but not delivered(?), anyways there is a newer version in bootstrap.css
 2015-12-18 22:51:42 +01:00
Simon Michael
a5fd56223c bump version to 0.27 2015-10-30 13:21:51 -07:00
Simon Michael
36d97a2e50 update cabal docs and other fields 2015-10-30 13:08:03 -07:00
Simon Michael
74512814ec cli/ui/web: rename X.Options modules to X.XOptions 
Make these modules' names more like the heavily-used types they
define (CliOpts, UIOpts, WebOpts). This is consistent with
RawOptions and ReportOptions, and helps with code navigation.
 2015-08-28 12:43:51 -07:00
Simon Michael
6fd1e965ed fix cabal file regression breaking GHC<7.10 (#280) 2015-08-21 12:19:43 -07:00
Simon Michael
e485962a70 cli, web: obey the threaded flag again 
[ci skip]
 2015-08-13 11:55:58 -07:00
Simon Michael
48e31d4f8c bump version to 0.26.98 2015-08-12 22:49:04 -07:00
Simon Michael
a9b2e5409c switch to hpack-generated cabal files 
The hledger-lib, hledger and hledger-web cabal files are now generated
from the package.yaml files with hpack, plus some manual fixups.
 2015-08-12 22:45:08 -07:00
Simon Michael
087f3a49bc note older tested-with versions based on hackage builder 2015-07-13 20:23:59 -07:00
Simon Michael
3d3c374cc6 update tested-with 2015-07-12 17:36:19 -07:00
Simon Michael
e5c0d75117 bump version to 0.26 2015-07-12 15:29:10 -07:00
Simon Michael
08b7b609cb web: drop deprecated network-conduit dependency 2015-07-12 14:59:39 -07:00
Simon Michael
f64d3c7944 web: re-add unminified jquery source (#161) 2015-06-23 06:09:15 -07:00
Simon Michael
0f19bfee21 web: drop unused items from cabal file 2015-06-17 13:57:59 -07:00
Simon Michael
9e2111106b drop regexpr dependency 2015-05-17 08:32:45 -07:00
Simon Michael
61423bdad4 consistently require latest base-compat for sanity 2015-04-29 07:16:08 -07:00
Simon Michael
dac8a784f4 bump version to 0.26 alpha 2015-04-28 13:48:23 -07:00
Simon Michael
1bc9b71f28 bump version to 0.25 2015-04-28 13:42:41 -07:00
Simon Michael
f75849cdd6 fix ghc 7.10 Applicative import warnings (#239) 
Still needed CPP, despite using base-compat.
 2015-03-29 16:09:41 -07:00
Simon Michael
e60eb71467 adapt to GHC-7.10's time-1.5 (#239) 2015-03-27 15:42:32 -07:00
Simon Michael
d3453c66c1 web: improve add form validation (#223, #234) 
The add form is now partly using yesod-form.
 2015-02-20 09:30:59 +00:00
Simon Michael
55967e9192 web: Post -> AddForm; drop/comment more old stuff 2015-02-16 16:21:07 +00:00
Simon Michael
ebe0ee184c web: remove unused /journal/entries view 2015-02-16 15:03:48 +00:00
Simon Michael
72ba4f1f76 web: adding missing modules for cabal test (#232) 2015-01-10 16:51:47 -08:00
Simon Michael
a719cb8f6e bump version to 0.25-unreleased 2014-12-26 11:08:20 -08:00
Simon Michael
e77225038f bump version to 0.24 2014-12-25 11:42:39 -08:00
Simon Michael
044cf39eca web: update cabal source files list 2014-12-25 11:42:39 -08:00
Julien Moutinho
cf28985cf2 lib: move from Text.ParserCombinators.Parsec to Text.Parsec 
NOTE: required to use liftIO in includedirective
SEE: http://www.vex.net/~trebla/haskell/parsec-generally.xhtml#IO
 2014-11-20 10:08:30 +01:00
Simon Michael
ba01ee447d web: require yesod 1.4; dependency cleanups (fixes #212) 
I think requiring the current yesod libs is ok.
Dropped support for: shakespeare 1.*, blaze-html 0.4, probably GHC 7.4.
 2014-10-23 10:17:28 -07:00
Simon Michael
0620ec9840 fix redundant compilation in the hledger packages, at last 
This seems to work well now with my haddock and GHC 7.8.
Not tested with GHC 7.6 though.
 2014-10-19 09:37:18 -07:00
Simon Michael
84a90374b4 make build warnings consistent 2014-10-18 10:16:22 -07:00
Simon Michael
53aee0e236 resolve conflict 2014-09-12 18:39:15 -07:00
Simon Michael
7d984fb2e4 tools: fancy .ghci for hledger-web 
Some configuration for running hledger-web in ghci, and misc. utilities
including hlint/hoogle/hayoo and a not-yet-working yesod devel-like
reloader from a recent reddit thread. (If enabling these, also uncomment
the required libs in hledger-web.cabal). Although it's not yet
automated, we can now test hledger-web changes without relinking:

>>> :serve
Starting web app on port 3000 with base url http://localhost:3000
Press ctrl-c to quit
  C-c C-cInterrupted.
>>> :r
Ok, modules loaded: Settings, Main, Hledger.Web.Main, Application, Hledger.Web.Options, Settings.Development, Import, Handler.RootR, Handler.JournalR, Handler.RegisterR, Handler.SidebarR, Handler.Common, Handler.Utils, Foundation, Settings.StaticFiles, Handler.Post.
>>> :serve
Starting web app on port 3000 with base url http://localhost:3000
 2014-07-06 10:38:41 -07:00
Simon Michael
3b30837a23 web: allow warp 3*, wai-handler-launch 3* 2014-06-21 20:36:46 -07:00
Simon Michael
ec51d28839 web: a bunch of ui cleanup & improvement 
- the web UI has been streamlined; edit form, raw & entries views dropped
- we now remember whether sidebar is open or closed
- better help dialog
- keyboard shortcuts are now available
- better add form
- more bootstrap styling
- static file cleanups
- report filtering fixes
- upgrade jquery to 2.1.1, bootstrap to 3.1.1, drop select2, add typeahead, cookie, hotkeys
- clarify debug helpers a little
- refactoring
 2014-06-13 00:19:00 +01:00
Simon Michael
34f4800e82 Revert "remove Setup.hs files again, fixing a yesod devel warning" 
Setup.hs are required by the Hydra buildbot.

This reverts commit 97ab3db8f0.
 2014-05-24 13:39:09 -07:00
Simon Michael
3ff7fe7f1b web: more static file cleanups 2014-05-23 10:20:20 -07:00
Simon Michael
13bc4d58ec web: update static files in cabal file 2014-05-23 09:46:11 -07:00
Simon Michael
97ab3db8f0 remove Setup.hs files again, fixing a yesod devel warning 
These were removed and re-added in 2011 because "hackage needed them".
Let's try again.
 2014-05-23 09:04:00 -07:00
Simon Michael
41add3ffeb oh fine still cant do that, bump to 0.23.98 2014-05-03 17:18:12 -07:00
Simon Michael
87f1e83d78 bump version to 0.24dev 2014-05-03 15:51:57 -07:00
Simon Michael
07a82724ed lib, cli, web: change from "beta" to "stable" 
Also add the hackage Console category to the first two.
 2014-05-01 08:20:05 -07:00
Simon Michael
1eeedfe551 bump versions to 0.23 2014-05-01 08:17:17 -07:00
Simon Michael
a33dc3a124 web: build with the default -O, not -O2 
Building hledger-web is taking more than half a gigabyte here.
Building with -O2 is generally considered to eat more memory.
and be less robust than -O, and seems unnecessary for hledger-web.
 2014-04-29 09:56:05 -07:00
Simon Michael
d46b290287 update tested-withs 2014-04-19 12:16:14 -07:00
Simon Michael
499cf41b03 hledger, web: allow shakespeare 2.* 2014-04-19 12:15:20 -07:00
Simon Michael
a9c83f0ce1 web: add Peter Simons' patch fixing Data.Conduit.Network HostIPv4 error (#171) 
(cherry picked from commit 993cae3a74eaa42b720fe51744e5459fd5a4eaa9)

Conflicts:
	hledger-web/Hledger/Web/Main.hs
 2014-04-17 12:35:42 -07:00
Simon Michael
8454299666 web: allow http-client 0.3.*, fixing cabal install again 2014-04-14 21:24:59 -07:00
Simon Michael
ec42b8d9ee move towards per-package changelogs, clarify doc/RELNOTES.md status 2014-04-08 15:52:37 -07:00
Simon Michael
637c0a4a17 web: allow warp 2.1 2014-03-14 11:29:57 -07:00
Simon Michael
97e3f852a1 bump version to 0.22.98 aka 0.23 alpha 2014-03-04 11:17:56 -08:00
Simon Michael
7443c8bf4b web: bump version to 0.22.4 2014-02-10 13:43:54 -08:00
Simon Michael
0ce919fdc4 web: update tested-with 2014-02-10 13:43:36 -08:00
Simon Michael
3c4cdcb2aa web: bump version to 0.22.3 2014-02-10 13:13:15 -08:00
Simon Michael
e846e8bb54 web: fix version number reported by --version 2014-02-10 13:12:56 -08:00
Simon Michael
1a5ebab34b web: bump version to 0.22.2 2014-02-10 12:47:16 -08:00
Simon Michael
93d3718b9c web: start a hackage-compatible change log for the hledger-web package 2014-02-10 12:47:00 -08:00
Simon Michael
b0b9e56a9d web: include unminified source of all javascript, to help packagers (fixes #161) 2014-02-10 12:43:37 -08:00
Simon Michael
0a3a3c6472 web: allow blaze-html 0.7 (closes #159) 2014-01-27 09:06:51 -08:00
Simon Michael
2ec6231a51 bump version to 0.22.1 2014-01-08 15:01:45 -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
926080310a web: avoid warp 2 for now to stay installable 2013-12-07 14:41:37 -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
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
4041f5a553 bump version to 0.21 2013-06-01 15:58:06 -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
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
0a77eba02e web: try using wai-launch-handler.. not working yet 2013-04-20 10:03:15 -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
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
Simon Michael
1bc8b73159 bump version 2013-04-17 17:20:59 -07:00
Simon Michael
b878779c8a web: build with latest clientsession and http-conduit 2013-04-15 08:20:59 -07:00