Commit graph

724 commits

Author SHA1 Message Date
Finn 6741aba746 Removed sector data API for customer
Should eventually be given to organisation dashboard
2018-05-22 12:47:19 +01:00
Finn 779a6e77ff Added category all time purchase list 2018-05-22 12:23:17 +01:00
Finn 174ce1f105
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 6d2cbecffa added being able to work with yearly submit 2018-05-15 16:51:39 +01:00
Finn eeeaaaaddd Merge branch 'master' into development 2018-04-16 17:04:11 +01:00
Finn eee925aa80
Merge pull request #116 from Pear-Trading/v0.10.7
v0.10.7 Release
2018-04-16 16:41:09 +01:00
Finn 59180ed310 Changelog amended 2018-04-16 16:25:07 +01:00
Tom Bloor 2ceecaa0a1
Merge pull request #114 from Pear-Trading/TBSliver/Cron-Jobs
Adding Cron Job script
2018-04-16 12:45:55 +01:00
Finn 376db29a7c
Merge pull request #115 from Pear-Trading/finn/graphs
added new graph views
2018-04-13 18:24:22 +01:00
Finn a4bcd9c6d7 changed stat viewing and amended tests 2018-04-13 18:08:10 +01:00
Finn 78fdfc1e1d added month listing 2018-04-11 19:10:19 +01:00
Finn bc92d2eb11 essential data added for bar chart 2018-04-09 19:21:14 +01:00
Finn 9284218431 changed pie data structure 2018-04-05 17:19:53 +01:00
Finn ec9fac293d fixed category list API 2018-03-26 15:13:35 +01:00
Finn b036d5494b changing pie format (broken) 2018-03-26 14:44:03 +01:00
Finn 4b4d50de07 Amended category listing 2018-03-26 14:43:23 +01:00
Thomas Bloor b22b85e0f2
Updated Changelog 2018-03-26 14:27:04 +01:00
Thomas Bloor 4b98de9075
Added new Daily Cron script 2018-03-26 14:26:02 +01:00
Finn 4844174ead
Merge pull request #113 from Pear-Trading/finn/statfix
fixed display error
2018-03-22 14:53:07 +00:00
Finn dc8f240243
Merge pull request #112 from Pear-Trading/TBSliver/Minor-Fixes
Minor Fixes
2018-03-21 18:05:56 +00:00
Finn e817dc29b1 fixed display error 2018-03-21 17:58:50 +00:00
Thomas Bloor 8a2aa3a73a
Update changelog 2018-03-21 17:49:00 +00:00
Thomas Bloor 2286e54104
Allow for parsing currency without a currency sign in front 2018-03-21 17:24:55 +00:00
Thomas Bloor 2b5bb9cd8c
Stop error on large csv exceeding size of cookies 2018-03-21 17:24:41 +00:00
Thomas Bloor 2d03d25916
Set secrets with decent default for production 2018-03-21 17:24:13 +00:00
Finn b35e18f181 Merge remote-tracking branch 'origin/master' into development 2018-03-21 17:16:26 +00:00
Finn 47bca8d39f
Merge pull request #111 from Pear-Trading/Release-v0.10.6
v0.10.6 Release
2018-03-21 16:58:58 +00:00
Finn 055b95e2fc customer snippet test amended 2018-03-21 16:37:40 +00:00
Finn c5341af3e7 customer stats test fixed 2018-03-21 16:01:46 +00:00
Finn 6527d1e36c fixed category list on postgres 2018-03-21 15:52:00 +00:00
Finn fb60ba4c0f Amended changelog 2018-03-20 19:24:04 +00:00
Finn 047ec888fa
Merge pull request #110 from Pear-Trading/finn/recurring
added recurring transaction editing and deletion
2018-03-20 19:19:15 +00:00
Finn 4ff3f07f9a fixed transaction test for updating and deleting 2018-03-20 18:54:55 +00:00
Finn 49e5e91860 made tests sane 2018-03-20 18:46:50 +00:00
Finn 73d44feace added deleting and updating transactions 2018-03-20 18:43:00 +00:00
Finn 2cf0678126 fixed to category viewing and recurring transaction data 2018-03-20 12:19:04 +00:00
Finn bcb0cd642c Merge branch 'master' into finn/recurring 2018-03-19 16:17:24 +00:00
Finn 97462df1a2 Fix to add org submission 2018-03-19 13:36:51 +00:00
Finn cc6ea41ce5 Merge remote-tracking branch 'origin/master' into development 2018-03-15 17:09:56 +00:00
Finn 58ae5b5250
Merge pull request #109 from Pear-Trading/Release-v0.10.5
v0.10.5
2018-03-15 16:54:02 +00:00
Finn 44f2a321b2
Merge pull request #108 from Pear-Trading/finn/translistchange
Revamped transaction view on admin interface
2018-03-15 16:27:17 +00:00
Finn 75ae16cd8d Merge branch 'finn/translistchange' into finn/recurring 2018-03-15 16:05:44 +00:00
Finn 4fb85b9094 Changelog amended 2018-03-15 16:04:21 +00:00
Finn b157ba0843 revamped transaction list view 2018-03-15 16:02:17 +00:00
Finn b233acfd64 made changes to still have status view from delete 2018-03-15 13:38:06 +00:00
Finn cea9e62073 amended user info view to accordion 2018-03-15 13:28:31 +00:00
Finn 3ceb926cd4 removed transaction list code 2018-03-15 13:07:29 +00:00
Finn 60438ea51c amended transactionlist code 2018-03-15 13:06:50 +00:00
Finn 551a40a9a0 fixed critical bugs introduced earlier and changed category viewing 2018-03-14 19:38:05 +00:00
Finn d5e03cc9e3 amended api for recurring transaction list 2018-03-14 17:55:24 +00:00