Commit graph

379 commits

Author SHA1 Message Date
Unknown
59cbc920c2 Merge branch 'development' into theslby/pushapi 2018-03-06 12:25:58 +00:00
Finn
db5a712a5d
Merge pull request #66 from Pear-Trading/finn/essentialpurchase
added essential purchase
2018-03-02 17:00:17 +00:00
piratefinn
8b7b5e50be fixed display with essential and categories 2018-03-02 16:31:14 +00:00
piratefinn
5762b35fbe removed unnecessary console logs and cleaned essential input 2018-03-01 17:07:25 +00:00
piratefinn
f6dd18bfc8 added initial essential branch checkbox 2018-02-28 12:02:01 +00:00
Finn
46e2efeaba
Merge pull request #65 from Pear-Trading/finn/categories
Budget view amended
2018-01-25 16:25:19 +00:00
piratefinn
9bbf7a5c2e updated changelog 2018-01-25 16:21:52 +00:00
piratefinn
bf965448c5 made input two columns if wide enough 2018-01-25 16:19:02 +00:00
piratefinn
d11fbcb4e6 removed unnecessary console logging 2018-01-25 15:56:23 +00:00
piratefinn
5d112ff4a6 Changed percentages on budget view screen 2018-01-25 11:18:31 +00:00
piratefinn
ec1aef6627 Changed to radio buttons on transaction category input 2018-01-25 11:18:13 +00:00
Finn
6c16b7aee0
Merge pull request #64 from Pear-Trading/finn/categories
Categorised purchase list fully added
2018-01-24 16:09:55 +00:00
piratefinn
d674c5b59b list fully finished 2018-01-24 13:18:51 +00:00
piratefinn
ca2cf0fdab No longer throwing errors and proper limit & slice 2018-01-24 12:51:03 +00:00
piratefinn
9446ef11d4 properly viewing category list 2018-01-24 12:38:58 +00:00
piratefinn
5f2eee81ba Placeholder and date math 2018-01-22 17:23:56 +00:00
Unknown
175c2decdd Merge remote-tracking branch 'origin/master' into theslby/pushapi 2018-01-19 13:40:17 +00:00
Unknown
6e0b059241 push stuff 2018-01-19 13:39:54 +00:00
piratefinn
6cca97cc68 changed category list size 2018-01-19 13:22:18 +00:00
piratefinn
fae6b7ce31 Merge branch 'master' into finn/categories 2018-01-19 13:22:00 +00:00
Finn
2cc087a295
Merge pull request #63 from Pear-Trading/Release-v0.1.3
Release of v0.1.3
2018-01-18 13:08:01 +00:00
piratefinn
43144da9fc updated changelog 2018-01-18 13:04:32 +00:00
Tom Bloor
d27d18e729
Merge pull request #62 from Pear-Trading/TBSliver/Travis-Temp-Fix
Update .travis.yml
2018-01-18 13:00:26 +00:00
Tom Bloor
40973b87ff
Update .travis.yml
Setting sudo mode for the travis builds
2018-01-18 12:57:38 +00:00
Finn
9e122bf4bc
Merge pull request #61 from Pear-Trading/development
Release of categories
2018-01-18 12:41:34 +00:00
Finn
4a388a4c3e
Merge pull request #60 from Pear-Trading/finn/categoryrelease
Amended category change for release
2018-01-18 12:23:20 +00:00
piratefinn
22b3e00eaa updated changelog 2018-01-18 12:20:26 +00:00
piratefinn
a20d94d9cb Changed transaction category input 2018-01-18 12:17:40 +00:00
piratefinn
7284452317 added just in case for font loading file attribute 2018-01-18 12:17:35 +00:00
piratefinn
d285b04119 removed unused button on pie 2018-01-18 12:17:27 +00:00
piratefinn
004c30cc28 Changed transaction category input 2018-01-18 12:16:37 +00:00
piratefinn
45eb7cb7a1 added new category transaction listing page 2018-01-17 17:36:28 +00:00
piratefinn
bd8af1d1bd added just in case for font loading file attribute 2018-01-17 15:02:53 +00:00
piratefinn
b18943c268 removed unused button on pie 2018-01-17 15:02:32 +00:00
Finn
a2ff339a84
Merge pull request #59 from Pear-Trading/finn/categories
Added categories to transactions
2018-01-17 14:51:46 +00:00
piratefinn
93b5fb52cc angular & CLI version bump 2018-01-17 13:23:36 +00:00
piratefinn
511969656e Fixed app, added ability for non category transaction changed reset form 2018-01-16 15:57:38 +00:00
piratefinn
d17a686490 functional receiving, choosing and upload of transaction category 2018-01-15 16:20:51 +00:00
piratefinn
59efe7a650 Retrieving categories from API 2018-01-15 15:33:38 +00:00
piratefinn
e64b6057e8 added category list endpoint 2018-01-15 14:19:16 +00:00
Finn
c4b5f8f91f
Merge pull request #57 from Pear-Trading/Release-v0.1.1
Release v0.1.1
2017-12-21 17:29:43 +00:00
piratefinn
c7020f4283 changelog and versioning updated 2017-12-21 17:27:14 +00:00
Finn
08a8f464f3
Merge pull request #56 from Pear-Trading/finn/pielayoutchange
updated pie css
2017-12-21 17:25:28 +00:00
piratefinn
71eee8f06b updated pie css 2017-12-21 17:20:56 +00:00
Finn
f9711b6686
Merge pull request #55 from Pear-Trading/master
Master merge for v0.1.0
2017-12-21 15:54:46 +00:00
Finn
ef66009baa
Merge pull request #54 from Pear-Trading/Release-v0.1.0
Release v0.1.0
2017-12-21 15:43:55 +00:00
piratefinn
057487db4c versioning updated 2017-12-21 15:31:58 +00:00
Finn
ee43c80041
Merge pull request #53 from Pear-Trading/finn/circlefix
snippet circles fixed
2017-12-20 16:52:26 +00:00
piratefinn
11fcf170ba updated changelog 2017-12-20 16:46:57 +00:00
piratefinn
95a918076a snippet circles fixed 2017-12-20 16:46:25 +00:00