Commit graph

1181 commits

Author SHA1 Message Date
Finn
aa9519e74e Added icon line to category schema 2018-06-12 12:19:23 +01:00
Finn
4323e49cfc Added icon line to category schema 2018-06-12 12:19:23 +01:00
Finn
dc759cbb74 Merge pull request #123 from Pear-Trading/master
Master
2018-06-06 14:32:14 +01:00
Finn
969b529a66
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
644ccadbfc
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
2296fb8d42 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
aabe98cc67 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
b8b06c06fe
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
61f5d761da 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
2fd0eed782
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
Finn
0f98f22404 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
Thomas Bloor
25b6b3a9a4
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
ccdbff42e6
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
Tom Bloor
10ea8cfe92
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
Thomas Bloor
e30717383c
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
6741aba746 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
779a6e77ff 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
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
51e045287b added being able to work with yearly submit 2018-05-15 16:51:39 +01:00
Finn
6d2cbecffa 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
eeeaaaaddd 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
eee925aa80
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
Finn
59180ed310 Changelog amended 2018-04-16 16:25:07 +01:00
Thomas Bloor
ab1c1f6c35 Merge branch 'development' into TBSliver/Minion-Tasks 2018-04-16 12:49:59 +01:00
Thomas Bloor
c3ac620a2d
Merge branch 'development' into TBSliver/Minion-Tasks 2018-04-16 12:49:59 +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
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
0f529d9f68 Merge pull request #115 from Pear-Trading/finn/graphs
added new graph views
2018-04-13 18:24:22 +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
2d92ac2f03 changed stat viewing and amended tests 2018-04-13 18:08:10 +01:00
Finn
a4bcd9c6d7 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
78fdfc1e1d added month listing 2018-04-11 19:10:19 +01:00