Commit graph

291 commits

Author SHA1 Message Date
Finn b3f1a018b5 adding paths and placeholder for customer dash API 2017-12-12 13:32:52 +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 a95bfccdf9 Amended validation on orgs 2017-11-29 16:24:03 +00:00
Tom Bloor 843037ea78
Merge branch 'development' into TBSliver/Import-Fixes 2017-11-28 17:52:56 +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
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
Finn 8ada3f86b6 fixes added and working admin interface 2017-11-23 16:25:14 +00:00
Finn 0072a97a3a endpoint and code added for LIS orgs 2017-11-23 15:42:37 +00:00
Finn 8c166464cc database upgraded and interface added 2017-11-23 14:54:59 +00:00
Finn d36091528f Entity Assoiciations added to database 2017-11-23 13:20:26 +00:00
Tom Bloor fc0d2f6fa0
Fixed schema issue for import value foreign key being set wrong 2017-11-21 11:13:04 +00:00
Tom Bloor 9f4d39e029
Added logging on admin login endpoint 2017-11-21 10:42:23 +00:00
Tom Bloor addd5c640c
dded minor logging to API login endpoint 2017-11-21 10:40:22 +00:00
Tom Bloor 9aaf3b4718
Added badges to users and pagination 2017-11-20 13:26:52 +00:00
Tom Bloor bccb292441
Added badge on organisations showing if they are a user or not 2017-11-20 13:02:07 +00:00
Tom Bloor 14410b475a
Added major merge code for merging organisations 2017-11-17 18:10:16 +00:00
Tom Bloor f49fb93658
Finishing off CSV import functionality 2017-11-15 18:22:49 +00:00
Tom Bloor 1015be7810
Allow for ignoring of values in import and toggle showing of them 2017-11-14 18:41:54 +00:00
Tom Bloor 7df6fecfc4
Added org lookup and assignment for import 2017-11-14 15:02:46 +00:00
Tom Bloor 37bc29829f
Refactored csv import flash errors 2017-11-14 12:57:28 +00:00
Tom Bloor cb7ab797f5 Merge branch 'development' into TBSliver/Admin-Improvements
Conflicts:
	CHANGELOG.md
2017-11-14 12:43:29 +00:00
Tom Bloor 72929bf86b Added assigning users to import values 2017-11-13 19:00:34 +00:00
Tom Bloor 9096bef00d Further work on import functions 2017-11-13 13:30:33 +00:00
Tom Bloor 593efcedfa Schema update for v 16 to include import lookups 2017-11-13 13:02:22 +00:00
Finn 105c9093b8 fixes 2017-11-10 18:39:00 +00:00
Finn 049b4836c5 Added code to leaderboard web app API 2017-11-10 17:07:41 +00:00
Finn c4681ffc3a web app api leaderboard added 2017-11-10 16:45:58 +00:00
Tom Bloor 40dbd1eb50 Added ignore_value boolean to Import Value table 2017-10-27 12:10:52 +01:00
Tom Bloor e09974f0d9 First pass of importing data 2017-10-26 17:01:23 +01:00
Tom Bloor ef36cbc541 Add setting of is_local to organisations 2017-10-24 15:23:09 +01:00
Tom Bloor d881b3f95f Added is_local flag to organisation table 2017-10-24 13:47:41 +01:00
Tom Bloor dcd5896cea Added pagination to organisation listings 2017-10-24 13:31:04 +01:00
Tom Bloor ed8607fd35 Combine organisation lists into one with badges for warnings 2017-10-23 17:44:38 +01:00
Tom Bloor de90fe1f77 Added toggling of actioned on feedback, and view change for lists 2017-10-23 16:09:20 +01:00
Tom Bloor 0302a3d299 Upgrade to have actioned boolean on feedback - also fix boolean
deployment defaults
2017-10-23 15:46:30 +01:00
Tom Bloor 62881a0eda Added transaction distance calculation 2017-10-03 18:08:30 +01:00
Tom Bloor 37e8f0b46a Updated to allow for user updates to change location by postcode 2017-10-03 15:47:05 +01:00
Tom Bloor 202deb9178 Added output of location on User endpoint, and setting lat/long on user
registration
2017-10-03 15:33:43 +01:00
Tom Bloor 9e127b8851 Finalised Transaction report graph and test 2017-10-02 14:08:24 +01:00
Tom Bloor 13b594e64f Added footer with current git version shown 2017-09-29 16:21:24 +01:00
Tom Bloor e667947c65 Fix uninitialised warning 2017-09-29 16:14:02 +01:00
Tom Bloor a739b02eed Allow for day scale of transaction report 2017-09-29 16:04:41 +01:00