Commit graph

1184 commits

Author SHA1 Message Date
Tom Bloor
8be16867bb
Added fairly trading org field and change org transactions to show
purchases not sales
2018-01-02 19:57:12 +00:00
Tom Bloor
e29badb59d Added is_fair column for fairly trading organisations 2018-01-02 19:56:48 +00:00
Tom Bloor
d4ff855251
Added is_fair column for fairly trading organisations 2018-01-02 19:56:48 +00:00
Tom Bloor
69811229c8 Fix booleans on sqlite ddl 2018-01-02 19:56:10 +00:00
Tom Bloor
d6d4121cb3
Fix booleans on sqlite ddl 2018-01-02 19:56:10 +00:00
Finn
c4a99e9ec5 Merge pull request #92 from Pear-Trading/master
Master merge to develop
2017-12-21 16:14:46 +00:00
Finn
67394ce8fa
Merge pull request #92 from Pear-Trading/master
Master merge to develop
2017-12-21 16:14:46 +00:00
Finn
0c42ad0fe2 Merge pull request #91 from Pear-Trading/Release-v0.10.1
Release v0.10.1
2017-12-21 15:51:10 +00:00
Finn
0214ad4558
Merge pull request #91 from Pear-Trading/Release-v0.10.1
Release v0.10.1
2017-12-21 15:51:10 +00:00
Finn
44155cd33e updated changelog 2017-12-21 15:39:34 +00:00
Finn
3346dbd0d4 updated changelog 2017-12-21 15:39:34 +00:00
Finn
cca147a8e1 Merge pull request #90 from Pear-Trading/master
Master merge for v0.10.0
2017-12-21 15:37:53 +00:00
Finn
2673f79f98
Merge pull request #90 from Pear-Trading/master
Master merge for v0.10.0
2017-12-21 15:37:53 +00:00
Finn
cd9420da42 Merge pull request #89 from Pear-Trading/finn/loopdashboard
frontpage stats amended for sectors and weeks
2017-12-20 13:25:22 +00:00
Finn
2bbc1d508e
Merge pull request #89 from Pear-Trading/finn/loopdashboard
frontpage stats amended for sectors and weeks
2017-12-20 13:25:22 +00:00
Finn
17ba1e75fd frontpage stats amended for sectors and weeks 2017-12-19 18:03:15 +00:00
Finn
bb254cb278 frontpage stats amended for sectors and weeks 2017-12-19 18:03:15 +00:00
Finn
86184cfbdb Merge pull request #88 from Pear-Trading/finn/sectorU
added new sector
2017-12-19 18:01:55 +00:00
Finn
12364c2a17
Merge pull request #88 from Pear-Trading/finn/sectorU
added new sector
2017-12-19 18:01:55 +00:00
Finn
201594d331 added new sector 2017-12-18 16:19:10 +00:00
Finn
cdde2f5ca8 added new sector 2017-12-18 16:19:10 +00:00
Finn
6484ef277a Merge pull request #87 from Pear-Trading/finn/applegacy
reverted fix and did different fix to order_by
2017-12-18 15:50:17 +00:00
Finn
38f8883ab1
Merge pull request #87 from Pear-Trading/finn/applegacy
reverted fix and did different fix to order_by
2017-12-18 15:50:17 +00:00
Finn
9f9a79c69d reverted fix and did different fix to order_by 2017-12-18 15:36:24 +00:00
Finn
feeba76523 reverted fix and did different fix to order_by 2017-12-18 15:36:24 +00:00
Finn
e87931e825 Merge pull request #86 from Pear-Trading/finn/applegacy
fixed counts for sqlite vs postgres
2017-12-18 15:20:17 +00:00
Finn
9851ef5b6f
Merge pull request #86 from Pear-Trading/finn/applegacy
fixed counts for sqlite vs postgres
2017-12-18 15:20:17 +00:00
Finn
b7493af6c6 added missing pg_or_sqlite sub 2017-12-18 15:08:15 +00:00
Finn
8e34f34bd6 added missing pg_or_sqlite sub 2017-12-18 15:08:15 +00:00
Finn
713fee37d6 fixed counts for sqlite vs postgres 2017-12-18 14:46:32 +00:00
Finn
cc0ca06470 fixed counts for sqlite vs postgres 2017-12-18 14:46:32 +00:00
Finn
5ae8aa92f8 Merge pull request #85 from Pear-Trading/finn/applegacy
added support for mobile app back
2017-12-18 14:20:09 +00:00
Finn
4653f713fa
Merge pull request #85 from Pear-Trading/finn/applegacy
added support for mobile app back
2017-12-18 14:20:09 +00:00
Finn
6f085ff541 Fixed stats test 2017-12-18 14:05:51 +00:00
Finn
f1c1748b34 Fixed stats test 2017-12-18 14:05:51 +00:00
Finn
e6ce9cc81a added support for mobile app back 2017-12-18 12:56:45 +00:00
Finn
3914ec44a8 added support for mobile app back 2017-12-18 12:56:45 +00:00
Finn
8ed5e5d9ff Merge pull request #84 from Pear-Trading/finn/customerdashboard
revamped API for customer dashboard
2017-12-15 18:10:48 +00:00
Finn
2dceb4067e
Merge pull request #84 from Pear-Trading/finn/customerdashboard
revamped API for customer dashboard
2017-12-15 18:10:48 +00:00
Finn
767ed73234 changelog updated 2017-12-15 17:56:39 +00:00
Finn
5ce2f0beea changelog updated 2017-12-15 17:56:39 +00:00
Finn
7d044addeb tests fixed 2017-12-15 17:52:02 +00:00
Finn
a89a320685 tests fixed 2017-12-15 17:52:02 +00:00
Finn
9edf15b95b pie test added 2017-12-15 17:09:15 +00:00
Finn
5dabc7a28a pie test added 2017-12-15 17:09:15 +00:00
Finn
2012e67273 sectors code added 2017-12-15 15:30:47 +00:00
Finn
74a1b3d238 sectors code added 2017-12-15 15:30:47 +00:00
Finn
8c811d52bf fixed stats test 2017-12-15 15:05:04 +00:00
Finn
229c2bb801 fixed stats test 2017-12-15 15:05:04 +00:00
Finn
7ffdfc5bd3 pie code made functional and relevant distance code updated 2017-12-15 14:59:38 +00:00