Commit graph

570 commits

Author SHA1 Message Date
Tom Bloor
b92ea1f7c6 Added logging on admin login endpoint 2017-11-21 10:42:23 +00:00
Tom Bloor
832dab70cb dded minor logging to API login endpoint 2017-11-21 10:40:22 +00:00
Tom Bloor
29cd70ca1c Merge pull request #72 from Pear-Trading/TBSliver/Admin-Improvements
Major improvements to Admin Interface
2017-11-20 16:07:33 +00:00
Tom Bloor
d3a2410507 Updated Changelog 2017-11-20 13:32:10 +00:00
Tom Bloor
733107539d Added badges to users and pagination 2017-11-20 13:26:52 +00:00
Tom Bloor
c3ae7a2615 Added badge on organisations showing if they are a user or not 2017-11-20 13:02:07 +00:00
Tom Bloor
baffe144f3 Added major merge code for merging organisations 2017-11-17 18:10:16 +00:00
Tom Bloor
a11727ba1c Refactored valid read template slightly and added merge link 2017-11-17 18:09:49 +00:00
Tom Bloor
9517b98c24 Removed unused template 2017-11-17 18:09:08 +00:00
Tom Bloor
b3036c13ee Changed non-local-org badge to secondary colour in backend 2017-11-16 15:12:46 +00:00
Tom Bloor
91677034ca Finishing off CSV import functionality 2017-11-15 18:22:49 +00:00
Tom Bloor
423c68aca2 Allow for ignoring of values in import and toggle showing of them 2017-11-14 18:41:54 +00:00
Tom Bloor
9d07830e27 Added org lookup and assignment for import 2017-11-14 15:02:46 +00:00
Tom Bloor
f0b1540f3e Refactored csv import flash errors 2017-11-14 12:57:28 +00:00
Tom Bloor
b873e63d55 Merge branch 'development' into TBSliver/Admin-Improvements
Conflicts:
	CHANGELOG.md
2017-11-14 12:43:29 +00:00
Tom Bloor
08b5d25764 Merge pull request #71 from Pear-Trading/master
Master merge for 0.9.5
2017-11-14 12:42:00 +00:00
Tom Bloor
18d223743d Merge pull request #70 from Pear-Trading/Release-v0.9.5
Update for 0.9.5
2017-11-14 11:07:39 +00:00
Tom Bloor
af312ffbe3 Updated changelog for 0.9.5 2017-11-13 22:12:36 +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
Tom Bloor
6b2b61856f Merge pull request #69 from Pear-Trading/finn/appleaderboard
Web App Leaderboard endpoint
2017-11-13 11:48:37 +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
eebac70276 update changelog 2017-10-24 17:56:24 +01:00
Tom Bloor
3e3f667053 Rework transaction views 2017-10-24 17:55:49 +01:00
Tom Bloor
751c6e64f2 Updated Changelog 2017-10-24 15:28:40 +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
11d6785062 Fix mobile breakpoints for feedback view 2017-10-23 16:14:50 +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
3d31e94367 Added feedback id number to feedback view 2017-10-23 15:08:51 +01:00
Tom Bloor
6c798d8d3f Word wrap feedback in admin console 2017-10-23 15:02:18 +01:00
Tom Bloor
afac877d12 Merge pull request #68 from Pear-Trading/TBSliver/Transaction-Distance
Transaction Distance Calculation
2017-10-04 16:12:36 +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
f1e3756075 updated Geo::UK::Postcode::Regex 2017-10-03 15:27:05 +01:00
Tom Bloor
5dafed5054 Merge pull request #67 from Pear-Trading/master
Master merge for v0.9.4
2017-10-03 11:43:29 +01:00
Tom Bloor
8f699c25c7 Merge pull request #66 from Pear-Trading/Release-v0.9.4
Release v0.9.4
2017-10-02 14:41:34 +01:00
Tom Bloor
1a54bae4e9 Updated changelog for next release 2017-10-02 14:27:10 +01:00
Tom Bloor
ede5fe1cee Merge pull request #65 from Pear-Trading/TBSliver/Mobile-Admin-View
Admin area improvements
2017-10-02 14:26:10 +01:00
Tom Bloor
9e127b8851 Finalised Transaction report graph and test 2017-10-02 14:08:24 +01:00
Tom Bloor
9631c78f57 Added changelog comments 2017-09-29 16:26:40 +01:00