Commit graph

580 commits

Author SHA1 Message Date
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 feeba76523 reverted fix and did different fix to order_by 2017-12-18 15:36:24 +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 8e34f34bd6 added missing pg_or_sqlite sub 2017-12-18 15:08:15 +00:00
Finn cc0ca06470 fixed counts for sqlite vs postgres 2017-12-18 14:46:32 +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 f1c1748b34 Fixed stats test 2017-12-18 14:05:51 +00:00
Finn 3914ec44a8 added support for mobile app back 2017-12-18 12:56:45 +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 5ce2f0beea changelog updated 2017-12-15 17:56:39 +00:00
Finn a89a320685 tests fixed 2017-12-15 17:52:02 +00:00
Finn 5dabc7a28a pie test added 2017-12-15 17:09:15 +00:00
Finn 74a1b3d238 sectors code added 2017-12-15 15:30:47 +00:00
Finn 229c2bb801 fixed stats test 2017-12-15 15:05:04 +00:00
Finn 88aa5becff pie code made functional and relevant distance code updated 2017-12-15 14:59:38 +00:00
Finn c4b7fa5102 Added new stats and fixed test 2017-12-14 20:30:44 +00:00
Finn b9a57c7dcb org graphs and relevant test fixed 2017-12-14 17:25:00 +00:00
Finn 60615e9b4a widget graph test fixed 2017-12-14 17:22:09 +00:00
Finn b2627eea4f fixing graph code and added placeholder pie code 2017-12-14 17:20:06 +00:00
Finn af95b31eb8 Fixed admin interface for org users 2017-12-13 15:29:35 +00:00
Finn f50c5e685c working graphs on frontend 2017-12-13 14:29:17 +00:00
Finn 8067d3cb96 made customer graphs work with passing test 2017-12-13 13:33:29 +00:00
Finn 8e1e9b2ec2 fixed snippets if no values to get 2017-12-12 17:31:05 +00:00
Finn 59dd053b45 Placeholder test added for graphs 2017-12-12 17:23:32 +00:00
Finn 3100fec233 added snippet endpoint and test 2017-12-12 17:21:32 +00:00
Finn b3f1a018b5 adding paths and placeholder for customer dash API 2017-12-12 13:32:52 +00:00
Finn da320d250f
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 db95f239cd changelog updated 2017-12-08 13:30:21 +00:00
Finn e6c236e1ff schema and map code updated, test fixed 2017-12-08 13:19:22 +00:00
Finn fb25cbe773 esta added to schema and updated admin interface 2017-12-08 12:30:49 +00:00
Finn 0b6d823145
Merge pull request #81 from Pear-Trading/finn/linkcorrections
added link corrections
2017-12-08 11:27:44 +00:00
Finn 1e02062ca3 added new tab linking and corrected redirect 2017-12-04 12:30:10 +00:00
Finn 8b91c3b3c8 Revert "added new tab linking and corrected redirect"
This reverts commit 4eb5a4fd3f.
2017-12-04 12:29:34 +00:00
Finn 4eb5a4fd3f added new tab linking and corrected redirect 2017-12-04 12:27:53 +00:00
Finn 3868721324
Merge pull request #80 from Pear-Trading/finn/validationfix
Amended validation on orgs
2017-11-30 12:27:17 +00:00
Finn a95bfccdf9 Amended validation on orgs 2017-11-29 16:24:03 +00:00
Tom Bloor a14277ee48
Merge pull request #79 from Pear-Trading/master
Master merge for v0.9.7
2017-11-29 15:08:08 +00:00
Tom Bloor 738a72b64e
Merge pull request #78 from Pear-Trading/Release-v0.9.7
Release v0.9.7
2017-11-28 18:36:03 +00:00
Thomas Bloor 6e016641cd
Updated changelog for 0.9.7 2017-11-28 18:33:58 +00:00
Tom Bloor c8e876711c
Merge pull request #77 from Pear-Trading/TBSliver/Import-Fixes
Fix import screen
2017-11-28 18:31:55 +00:00
Tom Bloor 843037ea78
Merge branch 'development' into TBSliver/Import-Fixes 2017-11-28 17:52:56 +00:00
Finn 6c738993f4
Merge pull request #76 from Pear-Trading/finn/association
associations added
2017-11-27 17:30:39 +00:00
Finn 65cadb5d24 test fixed 2017-11-27 17:17:22 +00:00
Finn 9a71c1b7f5 extra info fixed and test amended and fixtures changed 2017-11-27 17:16:22 +00:00
Finn 9adf9668b1 added location info to main map 2017-11-27 11:36:21 +00:00
Finn b6397aedf4 changelog updated 2017-11-23 17:19:21 +00:00
Tom Bloor 0799d6eeb1 Updated changelog 2017-11-23 17:18:07 +00:00
Tom Bloor 1bc56016e7 Fix dev_data Command for testing 2017-11-23 16:52:52 +00:00
Tom Bloor 6d138af016 Fixed issue with Importset for users and orgs trying to much data for
the group by
2017-11-23 16:52:33 +00:00
Finn 460c9e6049 extra org data added 2017-11-23 16:35:45 +00:00