Commit graph

549 commits

Author SHA1 Message Date
piratefinn
977cee339d applied new category style to fixed category view 2018-03-12 17:43:15 +00:00
piratefinn
736df71fde Placeholder recurring transaction box 2018-03-12 17:41:01 +00:00
piratefinn
b741b69a23 Merge branch 'development' into finn/buttoncategory 2018-03-12 17:40:00 +00:00
piratefinn
5819839bd9 Merge branch 'master' into development 2018-03-12 17:39:52 +00:00
piratefinn
a24bf4d188 changelog updated 2018-03-12 17:38:39 +00:00
piratefinn
6a4dfa6187 Merge branch 'development' 2018-03-12 17:37:06 +00:00
piratefinn
0924388619 Merge branch 'master' into development 2018-03-12 17:36:27 +00:00
piratefinn
180a854c60 emergency fix for category viewing on purchase 2018-03-12 17:35:18 +00:00
piratefinn
de39179179 Converted category select into buttons, no color yet 2018-03-12 16:36:26 +00:00
Finn
8d02effbc2 Merge pull request #69 from Pear-Trading/master
merge to dev
2018-03-09 17:28:53 +00:00
Finn
9470671621 Merge pull request #68 from Pear-Trading/Release-v0.1.4
0.1.4 Release
2018-03-09 17:11:47 +00:00
piratefinn
45e15b7dd9 version bumps 2018-03-09 16:51:58 +00:00
piratefinn
bd9dd64a84 Updated angular CLI to solve security dependency issue 2018-03-09 15:48:04 +00:00
piratefinn
d2d6b55339 Merge branch 'finn/changelog' into development 2018-03-09 14:29:05 +00:00
piratefinn
0aa3d45c82 updated changelog 2018-03-09 14:28:55 +00:00
piratefinn
85a429c4f2 emergency fix to upload for category 2018-03-08 15:09:35 +00:00
Finn
99c02d7a21 Merge pull request #67 from Pear-Trading/finn/recurring
fixed views and added recurring purchase input
2018-03-07 13:06:07 +00:00
piratefinn
d1357d459c updated moment to fix known vulnerability 2018-03-07 13:02:42 +00:00
piratefinn
ce9abe14df added fixes to category viewing 2018-03-07 12:58:01 +00:00
piratefinn
9b37fbbe26 added fixes for input 2018-03-06 15:19:35 +00:00
piratefinn
ddd0011ea2 amended upload for recurring 2018-03-05 15:35:26 +00:00
piratefinn
1cbfb334de amended if code and validation 2018-03-05 13:42:28 +00:00
piratefinn
0a7b49a387 added recurring purchase inputs 2018-03-05 13:33:26 +00:00
Finn
5f3c4c927f Merge pull request #66 from Pear-Trading/finn/essentialpurchase
added essential purchase
2018-03-02 17:00:17 +00:00
piratefinn
db2aa19801 fixed display with essential and categories 2018-03-02 16:31:14 +00:00
piratefinn
96cbe87013 removed unnecessary console logs and cleaned essential input 2018-03-01 17:07:25 +00:00
piratefinn
eb560a6c18 added initial essential branch checkbox 2018-02-28 12:02:01 +00:00
Finn
910cb46f5f Merge pull request #65 from Pear-Trading/finn/categories
Budget view amended
2018-01-25 16:25:19 +00:00
piratefinn
efcfaa72ab updated changelog 2018-01-25 16:21:52 +00:00
piratefinn
24b39c06af made input two columns if wide enough 2018-01-25 16:19:02 +00:00
piratefinn
6dd8aeaad9 removed unnecessary console logging 2018-01-25 15:56:23 +00:00
piratefinn
182679e9ac Changed percentages on budget view screen 2018-01-25 11:18:31 +00:00
piratefinn
d1d47785e5 Changed to radio buttons on transaction category input 2018-01-25 11:18:13 +00:00
Finn
dd0e9266c3 Merge pull request #64 from Pear-Trading/finn/categories
Categorised purchase list fully added
2018-01-24 16:09:55 +00:00
piratefinn
4d2ca8be74 list fully finished 2018-01-24 13:18:51 +00:00
piratefinn
1fee46a086 No longer throwing errors and proper limit & slice 2018-01-24 12:51:03 +00:00
piratefinn
2976166371 properly viewing category list 2018-01-24 12:38:58 +00:00
piratefinn
b33000edc5 Placeholder and date math 2018-01-22 17:23:56 +00:00
piratefinn
929b9417d1 changed category list size 2018-01-19 13:22:18 +00:00
piratefinn
477efe4093 Merge branch 'master' into finn/categories 2018-01-19 13:22:00 +00:00
Finn
daffda50de 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
f7adc3a08f updated changelog 2018-01-18 13:04:32 +00:00
Tom Bloor
a37784e1f9 Merge pull request #62 from Pear-Trading/TBSliver/Travis-Temp-Fix
Update .travis.yml
2018-01-18 13:00:26 +00:00
Tom Bloor
1d3fa11b45 Update .travis.yml
Setting sudo mode for the travis builds
2018-01-18 12:57:38 +00:00
Finn
de6b547473 Merge pull request #61 from Pear-Trading/development
Release of categories
2018-01-18 12:41:34 +00:00
Finn
4819138de7 Merge pull request #60 from Pear-Trading/finn/categoryrelease
Amended category change for release
2018-01-18 12:23:20 +00:00
piratefinn
779224089b updated changelog 2018-01-18 12:20:26 +00:00
piratefinn
551eff0d48 Changed transaction category input 2018-01-18 12:17:40 +00:00
piratefinn
003f973192 added just in case for font loading file attribute 2018-01-18 12:17:35 +00:00
piratefinn
214524f7dd removed unused button on pie 2018-01-18 12:17:27 +00:00