Commit graph

592 commits

Author SHA1 Message Date
Tom Bloor
e29badb59d 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
Finn
c4a99e9ec5 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
44155cd33e 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
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
17ba1e75fd 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
201594d331 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
9f9a79c69d 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
b7493af6c6 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
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
6f085ff541 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
8ed5e5d9ff 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
7d044addeb tests fixed 2017-12-15 17:52:02 +00:00
Finn
9edf15b95b 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
8c811d52bf 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
Finn
cb39b419d6 Added new stats and fixed test 2017-12-14 20:30:44 +00:00
Finn
12bd6b3ec9 org graphs and relevant test fixed 2017-12-14 17:25:00 +00:00
Finn
9594f9f746 widget graph test fixed 2017-12-14 17:22:09 +00:00
Finn
006cc7eb1e fixing graph code and added placeholder pie code 2017-12-14 17:20:06 +00:00
Finn
a03d3f5977 Fixed admin interface for org users 2017-12-13 15:29:35 +00:00
Finn
3b191e5c76 working graphs on frontend 2017-12-13 14:29:17 +00:00
Finn
5b745f666b made customer graphs work with passing test 2017-12-13 13:33:29 +00:00
Finn
536ab21551 fixed snippets if no values to get 2017-12-12 17:31:05 +00:00
Finn
5049fa9eed Placeholder test added for graphs 2017-12-12 17:23:32 +00:00
Finn
1057eda445 added snippet endpoint and test 2017-12-12 17:21:32 +00:00
Finn
7d309755c6 adding paths and placeholder for customer dash API 2017-12-12 13:32:52 +00:00
Tom Bloor
9d799620e0 Merge pull request #83 from Pear-Trading/Release-v0.10.0
Release v0.10.0
2017-12-08 16:36:22 +00:00
Thomas Bloor
2015c15684 Updated Changelog 2017-12-08 16:21:31 +00:00
Finn
e73c65d97b Merge pull request #82 from Pear-Trading/finn/esta
added ESTA and fixed association map code
2017-12-08 14:01:10 +00:00
Finn
9ea3125bca changelog updated 2017-12-08 13:30:21 +00:00
Finn
cd59547311 schema and map code updated, test fixed 2017-12-08 13:19:22 +00:00
Finn
af7dcde7aa esta added to schema and updated admin interface 2017-12-08 12:30:49 +00:00
Finn
95398d2790 Merge pull request #81 from Pear-Trading/finn/linkcorrections
added link corrections
2017-12-08 11:27:44 +00:00
Finn
0b48c69612 added new tab linking and corrected redirect 2017-12-04 12:30:10 +00:00
Finn
d8403b8b11 Revert "added new tab linking and corrected redirect"
This reverts commit 4eb5a4fd3f.
2017-12-04 12:29:34 +00:00
Finn
e926d40779 added new tab linking and corrected redirect 2017-12-04 12:27:53 +00:00
Finn
4255b70f8e Merge pull request #80 from Pear-Trading/finn/validationfix
Amended validation on orgs
2017-11-30 12:27:17 +00:00
Finn
36cd695ed5 Amended validation on orgs 2017-11-29 16:24:03 +00:00
Tom Bloor
e4e5bd9722 Merge pull request #79 from Pear-Trading/master
Master merge for v0.9.7
2017-11-29 15:08:08 +00:00
Tom Bloor
6c9cf10280 Merge pull request #78 from Pear-Trading/Release-v0.9.7
Release v0.9.7
2017-11-28 18:36:03 +00:00