Commit graph

707 commits

Author SHA1 Message Date
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
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
Tom Bloor
bf74fcc44f Redo all admin pages for bootstrap 4 beta 2017-09-29 15:52:34 +01:00
Tom Bloor
cf2c7dcc4b Initial pass of Transaction reports 2017-09-29 14:45:44 +01:00
Tom Bloor
2486c701a5 Improve feedback list some more 2017-09-28 17:10:13 +01:00
Tom Bloor
9cc1358283 improve layout of feedback reading 2017-09-28 17:03:26 +01:00
Tom Bloor
c3519fa4df Improved Feedback list page 2017-09-28 16:39:16 +01:00
Tom Bloor
4beb26a0a4 Added mobile view meta tag for admin view 2017-09-28 15:51:56 +01:00
Tom Bloor
90d1eeeb21 Merge pull request #64 from Pear-Trading/master
Release v0.9.3
2017-09-28 15:15:49 +01:00
Tom Bloor
0198d5364a Merge branch 'Release-v0.9.3' 2017-09-28 14:44:47 +01:00
Tom Bloor
2dcb591c19 Update Changelog with next version number 2017-09-28 14:44:18 +01:00
Tom Bloor
005c4694ff Merge pull request #63 from Pear-Trading/TBSliver/Postcode-Location
Added lat/long to customers and organisations
2017-09-28 14:42:57 +01:00