Commit Graph

562 Commits

Author SHA1 Message Date
Simon Michael
7138acaec4 web: clarify some confusing parameter handling 2015-02-15 08:17:47 +00:00
Simon Michael
6543f44d82 doc: forgot add release date to changelogs 2015-01-10 17:03:44 -08: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
Simon Michael
4cfec7043a doc: update changelogs 2014-12-25 11:04:26 -08:00
Simon Michael
68a4adb0bd doc: draft changelogs for all three packages 2014-12-21 12:01:11 -08:00
Simon Michael
5545ed3632 web: "sidebar" query parameter shows/hides sidebar 2014-12-11 12:13:31 -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
c1c9a989be web: fix a warning 2014-10-23 10:27:07 -07: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
b6774f47a3 balance, print: add -o and CSV output here too
Not very elegant yet, but works.
2014-10-21 12:02:23 -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
c2644f4c48 web: clean up warnings 2014-10-18 10:35:04 -07:00
Simon Michael
84a90374b4 make build warnings consistent 2014-10-18 10:16:22 -07:00
gwern
d1618aaca8 strip trailing whitespace from all Haskell files 2014-10-14 18:48:24 -07:00
Simon Michael
5d403c2bb7 doc: changelogs (resolve conflicts)
Conflicts:
	hledger-lib/CHANGES
	hledger-web/CHANGES
2014-09-12 18:41:35 -07:00
Simon Michael
53aee0e236 resolve conflict 2014-09-12 18:39:15 -07:00
Simon Michael
2992ce069d web: add form ignores trailing blank fields
Empty final account/amount fields are now ignored. Empty fields
followed by non-empty fields are not allowed.
2014-08-14 01:10:51 -07:00
Simon Michael
8d1ceb00f5 web: increase initial add form postings to four
We can't enable typeahead in dynamically added postings currently,
so increase the number of postings shown initially.
2014-08-14 00:55:51 -07:00
Simon Michael
834fef7389 web: add handler cleanup, rename vars 2014-08-14 00:26:22 -07:00
Julien Moutinho
73d4c86002 web: journal: better display of account names 2014-07-29 11:54:31 -07:00
Simon Michael
50ef6d52dd web: update typeahead.js to 0.10.4 2014-07-29 10:50:23 -07:00
Simon Michael
6c60119a92 web: show right zero commodities on register chart
If zero amounts are recorded with a commodity, any resulting zero
balances appearing in the register chart will have the proper commodity
and colour. (This is the first and so far only case of hledger
preserving the commodity of zero amounts.)
2014-07-28 18:47:59 -07:00
Simon Michael
40ab1e17f6 amounts cleanups, and support zeros with commodity 2014-07-28 18:45:13 -07:00
Simon Michael
455de6531d web: just show a simple link as the home button for now 2014-07-23 15:04:17 -07:00
Simon Michael
f2845e9b2e web: ensure whitespace between accounts headings 2014-07-23 15:03:41 -07:00
Simon Michael
f622f8e532 web: ensure the null commodity appears in legend 2014-07-23 15:03:03 -07:00
Simon Michael
cf6da3af5d web: tweak some keys 2014-07-21 18:16:46 -07:00
Simon Michael
059c8dfc97 web: also handle keys when journal select focussed 2014-07-21 08:54:37 -07:00
Simon Michael
43eee83c33 web: fix js error on journal select field 2014-07-21 08:54:17 -07:00
Simon Michael
a415759022 web: make chart point color consistent 2014-07-18 17:06:47 -07:00
Simon Michael
ed44ee99e4 web: add missing and all remaining flot js 2014-07-18 16:59:51 -07:00
Simon Michael
f2d9c6e9c1 web: more register chart improvements
- show a background color for future and less-than-zero regions
- show points for transactions, not all line corners
- hovering over point shows balance, date, posted amount and transaction
- clicking a point scrolls towards that date
2014-07-18 16:45:46 -07:00
Simon Michael
470835adc2 web: show points and zero/today lines on chart 2014-07-18 07:55:23 -07:00
Simon Michael
4333cae43f web: register chart improvements
- bigger
- plot is horizontal when balance is not changing
- legend for commodities
- some work towards stable commodity colors
2014-07-17 18:56:55 -07:00
Simon Michael
50577588d0 web: upgrade flot to 0.8.3 2014-07-17 16:51:49 -07:00
Simon Michael
441cae645f web: account transactions report, register clarifications
Clarify the semantics and code of account transactions report a bit.

In the web account register view, emphasise the "historical balance" vs
"running total" distinction; show it as a label for the chart as well,
to reduce confusion.
2014-07-17 16:20:34 -07:00
Simon Michael
927e7593fa web: cleanups 2014-07-17 15:05:39 -07:00
Simon Michael
b42298c1e2 web: fix warnings 2014-07-15 06:55:14 -07:00
Simon Michael
b0d74b1466 web: support more than 2 postings in the add form
- ctrl plus/ctrl minus adds/removes posting fields
- clicking the more link or pressing tab in the last field also works
- the focus is adjusted sensibly
- the add form is reset if closed and reopened, except the number of postings
- keyboard shortcuts should be less dependent on focus now
- tested in recent firefox, chrome, safari
- things should be robust with typeahead, with one notable exception:
  typeahead is not enabled in the new account fields when you add
  postings. I tried hard, help welcome.
2014-07-14 14:30:30 -07:00
Simon Michael
c27ea12b66 web: upgrade bootstrap to 3.2 2014-07-14 14:28:20 -07:00
Simon Michael
67c8ceb142 web: after adding, just redisplay the journal 2014-07-12 15:18:39 -07:00
Simon Michael
009df13baf web: make the add form a modal dialog
The add form has become a modal dialog, and been moved into the default
template. This simplifies some things, for now. Eg it's easily
accessible from any page.
2014-07-09 00:04:50 -07:00
Simon Michael
ed3fd58fb9 web: rename help modal 2014-07-09 00:00:23 -07:00
Simon Michael
14b5d1ca3e web: fix a haddock breakage 2014-07-08 11:49:34 -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
8fe26fe345 web: add form stricter parsing, better errors (fixes #194) 2014-07-05 13:07:57 -07:00
Simon Michael
f30deee197 web: fix compilation after recent lib changes 2014-07-03 09:37:02 -07:00
Simon Michael
201521dc5a a few tweaks 2014-06-24 14:51:09 -07:00
Simon Michael
3b30837a23 web: allow warp 3*, wai-handler-launch 3* 2014-06-21 20:36:46 -07:00
Simon Michael
4f0b4ea36c web: add missing hs & js files 2014-06-14 14:33:11 -07:00
Simon Michael
09ec9b2f90 web: help tweaks 2014-06-13 00:39:15 +01:00
Simon Michael
71bd9f4110 web: changelog 2014-06-13 00:19:18 +01:00
Simon Michael
b25563b59f web: fix manual link 2014-06-13 00:19:12 +01: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
884f64e292 web: reduce ui over-complexity
For now, you can do three things in the web ui: add a transaction, view
journal entries, view an account register. Filtering is not quite right yet.
2014-05-24 08:23:02 -07:00
Simon Michael
adde48a805 web: small column heading improvements 2014-05-24 08:20:33 -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
6ecb2b9882 web: style.css -> hledger.css 2014-05-23 09:45:55 -07:00
Simon Michael
eea10d4420 web: upgrade jquery to 2.1.1 2014-05-23 09:34:32 -07:00
Simon Michael
bc8e4ef91e web: upgrade bootstrap to 3.1.1
This nicely fixes the too-narrow page layout.
2014-05-23 09:32:29 -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
702f900ec0 web: fix warnings 2014-05-23 09:02:20 -07:00
Simon Michael
3c8786df1f web: tweak tooltips, remove unused code 2014-05-23 09:01:25 -07:00
Simon Michael
3ee0b5f29b web: fix account "only" hover links 2014-05-23 08:39:22 -07:00
Simon Michael
7778a0b821 web: reorganise sidebar links 2014-05-22 20:57:22 -07:00
Simon Michael
3f3a526e8a web: move sidebar links out of balanceReportAsHtml 2014-05-22 20:36:49 -07:00
Simon Michael
6b059aeb5e Merge branch 'rdesfo-0.23'
Conflicts:
	.version
	hledger-lib/Hledger/Read/CsvReader.hs
	hledger-lib/hledger-lib.cabal
	hledger-web/hledger-web.cabal
	hledger/hledger.cabal
2014-05-22 16:15:35 -07:00
Ryan Desfosses
b60da51386 made the following changes to resolve deprecated warnings:
replaced hamletToRepHtml with giveUrlRenderer
  updated type RepHtml to Html
  replaced settingsPort with setPort
2014-05-21 07:30:54 -04:00
Ryan Desfosses
3182f2c69a Common: Added Register link to sidebar 2014-05-14 12:13:34 -04:00
Simon Michael
2bba4dbe3c update changelogs 2014-05-08 14:35:20 -07:00
Simon Michael
3113e09a62 bump version to 0.23.2 2014-05-08 14:32:29 -07:00
Simon Michael
6d93fe15d3 update changelogs 2014-05-08 14:32:06 -07:00
Simon Michael
4b1714a9e0 bump version to 0.23.1 2014-05-07 16:44:44 -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
524bfe73c6 final changelogs 2014-05-01 08:14:36 -07:00
Simon Michael
e6a1339370 cli: options help polish 2014-05-01 07:22:44 -07:00
Simon Michael
3fb5e25fd4 web: rename --static-root to --file-url 2014-04-30 08:48:23 -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
7d579adb0e changelog updates 2014-04-28 00:55:14 -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
f94d784f48 changelog updates from release branch
give hledger-lib a changelog, update changelogs

(cherry picked from commit a67cee4e5f9e3dc09be86e7bc0e8fd77168a5070)

Conflicts:
	hledger/CHANGES

update changelogs

(cherry picked from commit ef053a42523ff2d57921837896b9ccc0a260cc27)

web: changelog

(cherry picked from commit 105c1d01429680a4e8a11a8c4be06f4ceca4329e)

web: changelog

(cherry picked from commit 3d42c123be7dd51be6586549f1f057052cc6fff9)
2014-04-17 12:36:00 -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
53b801f033 changelog
(cherry picked from commit 033586dd526012252df8b26ab3515d12ab8d228f)
2014-04-15 16:56:28 -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
b3ab814478 docs typo 2014-04-08 16:00:41 -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
7d36789b74 web: fix build failures caught by the bot 2014-03-19 08:45:52 -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
5da1e4c71c web: changelog 2014-02-10 13:44:04 -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
d9370d72d8 web: include the right unminified version of jquery.url.js (1.1) to avoid js breakage 2014-02-10 13:42:12 -08:00
Simon Michael
94add086b2 web: changelog 2014-02-10 13:14:06 -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
3b8b3d234e web: work around build failures on new OS X/xcode 5 related to clang 2014-02-08 08:43:20 -08:00
Simon Michael
0a3a3c6472 web: allow blaze-html 0.7 (closes #159) 2014-01-27 09:06:51 -08:00
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