Commit graph

736 commits

Author SHA1 Message Date
Finn
dc759cbb74 Merge pull request #123 from Pear-Trading/master
Master
2018-06-06 14:32:14 +01:00
Finn
647e68aee1 Merge pull request #122 from Pear-Trading/v0.10.9
v0.10.9
2018-06-06 14:15:46 +01:00
Finn
b7b0076bf6 updated changelog 2018-06-05 14:47:43 +01:00
Finn
86d27a7415 Merge branch 'development' into v0.10.9 2018-06-05 14:44:43 +01:00
Finn
3fdcb59130 Merge pull request #121 from Pear-Trading/TBSliver/Recur-Calc-Fix
Fix recurring transactions calculator for after-the-fact updates
2018-06-05 14:43:51 +01:00
Finn
dd5694b793 updated changelog 2018-06-05 14:23:39 +01:00
Finn
34139941e5 Merge pull request #120 from Pear-Trading/finn/moregraphs
added graph stuff for dashboard
2018-06-04 16:05:04 +01:00
Finn
2577b95605 updated stats test 2018-06-04 15:48:21 +01:00
Thomas Bloor
07a36c2268 Fix recurring transactions calculator for after-the-fact updates 2018-05-24 15:16:28 +01:00
Tom Bloor
898b6ff8f0 Merge pull request #119 from Pear-Trading/master
Master
2018-05-24 14:49:33 +01:00
Tom Bloor
a088ab0738 Merge pull request #118 from Pear-Trading/Release-v0.10.8
Release v0.10.8
2018-05-24 13:32:16 +01:00
Thomas Bloor
64ff64afdb Updated Changelog 2018-05-24 13:01:22 +01:00
Finn
db71cab2d4 Removed sector data API for customer
Should eventually be given to organisation dashboard
2018-05-22 12:47:19 +01:00
Finn
081274c78e Added category all time purchase list 2018-05-22 12:23:17 +01:00
Finn
4c5760651e Merge pull request #117 from Pear-Trading/finn/yearlysubmit
added being able to work with yearly submit
2018-05-15 17:16:31 +01:00
Finn
51e045287b added being able to work with yearly submit 2018-05-15 16:51:39 +01:00
Finn
3ccffdf13c Merge branch 'master' into development 2018-04-16 17:04:11 +01:00
Finn
1439edb01a Merge pull request #116 from Pear-Trading/v0.10.7
v0.10.7 Release
2018-04-16 16:41:09 +01:00
Finn
71526250c9 Changelog amended 2018-04-16 16:25:07 +01:00
Tom Bloor
385045215e Merge pull request #114 from Pear-Trading/TBSliver/Cron-Jobs
Adding Cron Job script
2018-04-16 12:45:55 +01:00
Finn
0f529d9f68 Merge pull request #115 from Pear-Trading/finn/graphs
added new graph views
2018-04-13 18:24:22 +01:00
Finn
2d92ac2f03 changed stat viewing and amended tests 2018-04-13 18:08:10 +01:00
Finn
662db25c3c added month listing 2018-04-11 19:10:19 +01:00
Finn
45f0edef47 essential data added for bar chart 2018-04-09 19:21:14 +01:00
Finn
e7dee61433 changed pie data structure 2018-04-05 17:19:53 +01:00
Finn
9ea0509030 fixed category list API 2018-03-26 15:13:35 +01:00
Finn
5f324dd00a changing pie format (broken) 2018-03-26 14:44:03 +01:00
Finn
3a738a1000 Amended category listing 2018-03-26 14:43:23 +01:00
Thomas Bloor
483ea47177 Updated Changelog 2018-03-26 14:27:04 +01:00
Thomas Bloor
711daf8594 Added new Daily Cron script 2018-03-26 14:26:02 +01:00
Finn
8a12442eac Merge pull request #113 from Pear-Trading/finn/statfix
fixed display error
2018-03-22 14:53:07 +00:00
Finn
c0238ebe6e Merge pull request #112 from Pear-Trading/TBSliver/Minor-Fixes
Minor Fixes
2018-03-21 18:05:56 +00:00
Finn
81e171c413 fixed display error 2018-03-21 17:58:50 +00:00
Thomas Bloor
6df772da98 Update changelog 2018-03-21 17:49:00 +00:00
Thomas Bloor
9b761ee343 Allow for parsing currency without a currency sign in front 2018-03-21 17:24:55 +00:00
Thomas Bloor
b937badc6e Stop error on large csv exceeding size of cookies 2018-03-21 17:24:41 +00:00
Thomas Bloor
9f71971249 Set secrets with decent default for production 2018-03-21 17:24:13 +00:00
Finn
583e324a49 Merge remote-tracking branch 'origin/master' into development 2018-03-21 17:16:26 +00:00
Finn
b9811862fd Merge pull request #111 from Pear-Trading/Release-v0.10.6
v0.10.6 Release
2018-03-21 16:58:58 +00:00
Finn
358c0ca99b customer snippet test amended 2018-03-21 16:37:40 +00:00
Finn
a02c74d830 customer stats test fixed 2018-03-21 16:01:46 +00:00
Finn
be0571f90b fixed category list on postgres 2018-03-21 15:52:00 +00:00
Finn
4f703cb019 Amended changelog 2018-03-20 19:24:04 +00:00
Finn
ad95b32113 Merge pull request #110 from Pear-Trading/finn/recurring
added recurring transaction editing and deletion
2018-03-20 19:19:15 +00:00
Finn
b63adc590c fixed transaction test for updating and deleting 2018-03-20 18:54:55 +00:00
Finn
5faca4d792 made tests sane 2018-03-20 18:46:50 +00:00
Finn
504fec5207 added deleting and updating transactions 2018-03-20 18:43:00 +00:00
Finn
4affc1bd54 fixed to category viewing and recurring transaction data 2018-03-20 12:19:04 +00:00
Finn
6849f12415 Merge branch 'master' into finn/recurring 2018-03-19 16:17:24 +00:00
Finn
37deb7f52c Fix to add org submission 2018-03-19 13:36:51 +00:00