Commit graph

538 commits

Author SHA1 Message Date
piratefinn
bcfd6b0a54 Merge branch 'Release-0.1.9' 2018-04-17 14:20:46 +01:00
piratefinn
2297cc4221 version bumps and changelog 2018-04-17 14:20:26 +01:00
piratefinn
d07faaf8ca Merge branch 'finn/fixes' into development 2018-04-17 14:19:07 +01:00
piratefinn
2ee930f69f made fixes 2018-04-17 14:17:57 +01:00
piratefinn
4f1bd1c495 fixed layout on dashboard 2018-04-17 12:16:22 +01:00
piratefinn
0d3dc85195 Merge branch 'master' into development 2018-04-16 16:46:50 +01:00
Finn
0e8a74d4f5 Merge pull request #74 from Pear-Trading/Release-0.07
0.1.8 Release
2018-04-16 16:27:44 +01:00
piratefinn
f2aeb00cf9 changelog and version bumps 2018-04-16 16:06:00 +01:00
piratefinn
3463a323c9 Merge branch 'finn/UIfixes' into development 2018-04-16 15:42:02 +01:00
piratefinn
ff9079e331 Amended for possible undefined error 2018-04-16 15:41:45 +01:00
Finn
bf5bfd66fe Merge pull request #73 from Pear-Trading/finn/UIfixes
Amended close button
2018-04-16 15:09:58 +01:00
piratefinn
2ca7fd458a Fixed instruction for close menu button 2018-04-16 15:08:23 +01:00
piratefinn
5f49a738b1 Added hint for closing menu 2018-04-16 14:52:19 +01:00
Finn
6df87adb7b Merge pull request #72 from Pear-Trading/finn/graphs
Adding new graph views and fixes
2018-04-13 18:19:12 +01:00
piratefinn
80fc9f330f various fixes 2018-04-13 16:37:26 +01:00
piratefinn
66ed89ffc5 transferred stuff from pie panel to dashboard 2018-04-13 16:07:26 +01:00
piratefinn
a50cb1bac0 fixed view of charts to show currency where relevant 2018-04-12 14:12:34 +01:00
piratefinn
823a1d398f fixed bar chart 2018-04-11 19:19:34 +01:00
piratefinn
96b4e0f382 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
80daa2d771 working essential bar chart 2018-04-09 19:19:06 +01:00
piratefinn
d485001fb3 added preliminary pie dashboard 2018-03-26 15:47:21 +01:00
piratefinn
3b2009186a changed category view method 2018-03-26 14:47:20 +01:00
piratefinn
87d6e51842 hotfix and version fixes 2018-03-21 17:41:07 +00:00
piratefinn
e99ac01e7b Merge remote-tracking branch 'origin/master' into development 2018-03-21 17:16:01 +00:00
Finn
867bfda871 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
d44f60c811 changelog updated 2018-03-20 19:17:02 +00:00
Finn
41088cc7ad 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
4fadf5297b fixed errors 2018-03-20 19:04:05 +00:00
piratefinn
7a432b4983 removed console logs 2018-03-20 17:41:35 +00:00
piratefinn
11f42d08e4 fixed recurring transaction editing 2018-03-20 17:41:03 +00:00
piratefinn
390b670be5 fully working transaction edit and delete 2018-03-20 17:29:00 +00:00
piratefinn
df6c469965 added updating transaction 2018-03-20 16:53:29 +00:00
piratefinn
2eddb4dd9c fixed httpclient error logging 2018-03-20 16:53:14 +00:00
piratefinn
e7c718250f fixed category viewing and editing on several pages 2018-03-19 17:52:54 +00:00
piratefinn
cd2a47bfdd fixed add data submission and removed unnecessary console logs 2018-03-19 16:28:46 +00:00
piratefinn
bad59b5e33 Added initial recurring variable viewing 2018-03-14 20:06:21 +00:00
piratefinn
3119feabcc fixed upload submissions 2018-03-14 20:05:46 +00:00
piratefinn
470daa306c removed unnecessary console logs 2018-03-14 16:49:01 +00:00
piratefinn
065aa80e98 Amended purchase validation and submission 2018-03-13 12:49:30 +00:00
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