Commit graph

480 commits

Author SHA1 Message Date
piratefinn
48fd3114b2 Merge branch 'finn/UIfixes' into development 2018-04-16 15:42:02 +01:00
piratefinn
4f3e0aa22d Amended for possible undefined error 2018-04-16 15:41:45 +01:00
Finn
735b2de28a
Merge pull request #73 from Pear-Trading/finn/UIfixes
Amended close button
2018-04-16 15:09:58 +01:00
piratefinn
daff33657f Fixed instruction for close menu button 2018-04-16 15:08:23 +01:00
piratefinn
3d5d20e419 Added hint for closing menu 2018-04-16 14:52:19 +01:00
Finn
7881ae1103
Merge pull request #72 from Pear-Trading/finn/graphs
Adding new graph views and fixes
2018-04-13 18:19:12 +01:00
piratefinn
2709a7893d various fixes 2018-04-13 16:37:26 +01:00
piratefinn
9d17a331fa transferred stuff from pie panel to dashboard 2018-04-13 16:07:26 +01:00
piratefinn
52a2b6716c fixed view of charts to show currency where relevant 2018-04-12 14:12:34 +01:00
piratefinn
61cd0905d1 fixed bar chart 2018-04-11 19:19:34 +01:00
piratefinn
093cdef3cf weekly view fixed, broken category bar chart
Chart needs fixing and currencies should pipe to show currency
2018-04-11 19:10:03 +01:00
piratefinn
511f680800 working essential bar chart 2018-04-09 19:19:06 +01:00
piratefinn
351aa5b2c1 added preliminary pie dashboard 2018-03-26 15:47:21 +01:00
piratefinn
6c202fa84a changed category view method 2018-03-26 14:47:20 +01:00
piratefinn
1f24095285 hotfix and version fixes 2018-03-21 17:41:07 +00:00
piratefinn
4bd3d67323 Merge remote-tracking branch 'origin/master' into development 2018-03-21 17:16:01 +00:00
Finn
085c1b40d5
Merge pull request #71 from Pear-Trading/finn/Release-v0.1.6
v0.1.6 Release
2018-03-21 16:58:48 +00:00
piratefinn
022f0ab2a1 changelog updated 2018-03-20 19:17:02 +00:00
Finn
8b65d8eefb
Merge pull request #70 from Pear-Trading/finn/buttoncategory
Added ability to edit and delete recurring transactions
2018-03-20 19:11:22 +00:00
piratefinn
e8217de9b6 fixed errors 2018-03-20 19:04:05 +00:00
piratefinn
db1e3efbf5 removed console logs 2018-03-20 17:41:35 +00:00
piratefinn
40eef44666 fixed recurring transaction editing 2018-03-20 17:41:03 +00:00
piratefinn
463bbe98a9 fully working transaction edit and delete 2018-03-20 17:29:00 +00:00
piratefinn
2188c1272f added updating transaction 2018-03-20 16:53:29 +00:00
piratefinn
49bd7d2e0c fixed httpclient error logging 2018-03-20 16:53:14 +00:00
piratefinn
3e8767e481 fixed category viewing and editing on several pages 2018-03-19 17:52:54 +00:00
piratefinn
f36ef00478 fixed add data submission and removed unnecessary console logs 2018-03-19 16:28:46 +00:00
piratefinn
b9578da579 Added initial recurring variable viewing 2018-03-14 20:06:21 +00:00
piratefinn
c45790c7e9 fixed upload submissions 2018-03-14 20:05:46 +00:00
piratefinn
e1dfa37f63 removed unnecessary console logs 2018-03-14 16:49:01 +00:00
piratefinn
f3c6370394 Amended purchase validation and submission 2018-03-13 12:49:30 +00:00
piratefinn
40b0a0088c applied new category style to fixed category view 2018-03-12 17:43:15 +00:00
piratefinn
dc27b286cf Placeholder recurring transaction box 2018-03-12 17:41:01 +00:00
piratefinn
144961acb3 Merge branch 'development' into finn/buttoncategory 2018-03-12 17:40:00 +00:00
piratefinn
2965a8d33c Merge branch 'master' into development 2018-03-12 17:39:52 +00:00
piratefinn
7bb8500315 changelog updated 2018-03-12 17:38:39 +00:00
piratefinn
dbf77ca4ee Merge branch 'development' 2018-03-12 17:37:06 +00:00
piratefinn
0b27aa43e4 Merge branch 'master' into development 2018-03-12 17:36:27 +00:00
piratefinn
c8c52d33c4 emergency fix for category viewing on purchase 2018-03-12 17:35:18 +00:00
piratefinn
aaaa7c7a05 Converted category select into buttons, no color yet 2018-03-12 16:36:26 +00:00
Finn
c62e74e07a
Merge pull request #69 from Pear-Trading/master
merge to dev
2018-03-09 17:28:53 +00:00
Finn
675f319993
Merge pull request #68 from Pear-Trading/Release-v0.1.4
0.1.4 Release
2018-03-09 17:11:47 +00:00
piratefinn
eee50b9073 version bumps 2018-03-09 16:51:58 +00:00
piratefinn
c37b30bea5 Updated angular CLI to solve security dependency issue 2018-03-09 15:48:04 +00:00
piratefinn
db8d27a888 Merge branch 'finn/changelog' into development 2018-03-09 14:29:05 +00:00
piratefinn
247e38e680 updated changelog 2018-03-09 14:28:55 +00:00
piratefinn
f7697178fd emergency fix to upload for category 2018-03-08 15:09:35 +00:00
Finn
b4f3f754c2
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
d97c21caf8 updated moment to fix known vulnerability 2018-03-07 13:02:42 +00:00
piratefinn
f6ef50f686 added fixes to category viewing 2018-03-07 12:58:01 +00:00