Commit graph

488 commits

Author SHA1 Message Date
Finn
85c80980c3 Added code for date submission in receipt upload 2017-08-14 11:15:33 +01:00
Finn
e222b635a8 Merge pull request #23 from Pear-Trading/finn/UserInfo
Added User Info Retrieval and Updating
2017-07-27 15:56:19 +01:00
Finn
9affdbf08e Removed redundant file and fixed user updat e+ added tests 2017-07-27 14:18:22 +01:00
Finn
bad60c85e7 Removed bad error 2017-07-26 19:22:28 +01:00
Finn
397de48711 Error codes added and fix 2017-07-26 19:05:35 +01:00
Finn
2ef73c9346 Added User Account update code 2017-07-26 18:57:13 +01:00
Finn
2b3c13518b Added API endpoints and user info retrieval 2017-07-26 18:28:14 +01:00
Finn
b0e9ef249a Rewrote code for login info retrieval 2017-07-26 16:45:46 +01:00
Finn
dfa1ba11f0 Fix to naming of JSON 2017-07-26 15:55:39 +01:00
Finn
1d782a4e84 Added giving user info on login 2017-07-26 15:29:38 +01:00
Tom Bloor
79a6b391a5 Merge branch 'development' 2017-07-26 11:48:57 +01:00
Tom Bloor
4c2bfd0ab3 Merge branch 'TBSliver/leaderboard-script-fix' into development 2017-07-26 11:48:40 +01:00
Tom Bloor
fbad7222c3 Fixed leaderboard scripts to use production config 2017-07-26 11:48:23 +01:00
Tom Bloor
0abfe6d5cb Merge branch 'development' 2017-07-25 19:54:02 +01:00
Tom Bloor
98dfbd100c Merge branch 'TBSliver/Leaderboard-Scripts' into development 2017-07-25 19:53:16 +01:00
Tom Bloor
b4513f487c Added leaderboard generating scripts 2017-07-25 19:53:04 +01:00
Finn
a86baa2660 Merge pull request #22 from Pear-Trading/development
First Release
2017-07-25 17:36:44 +01:00
Tom Bloor
4f72b454bc Merge branch 'TBSliver/Postcode-Validation-Fix' into development 2017-07-25 17:07:36 +01:00
Tom Bloor
e2732a6a93 Change to underlying postcode regex for validation 2017-07-25 17:07:15 +01:00
Tom Bloor
9c7e9d325a Merge branch 'TBSliver/Org-Pagination' into development 2017-07-25 15:44:29 +01:00
Tom Bloor
4644f9217e Added pagination to organisation pages 2017-07-25 15:44:16 +01:00
Tom Bloor
1df31d79a0 Merge pull request #20 from Pear-Trading/TBSliver/Organisation-Approve
Fix organisation approving, Closes #7
2017-07-25 14:42:49 +01:00
Tom Bloor
9dd808c547 Fix issue with approving organisations. 2017-07-25 14:33:11 +01:00
Tom Bloor
b009fa5c86 Remove admin approve and merge tests for removed code 2017-07-25 14:30:42 +01:00
Tom Bloor
01c7db6844 Removed admin api endpoint as unused 2017-07-25 14:23:03 +01:00
Tom Bloor
e32363b41a Merge pull request #19 from Pear-Trading/TBSliver/Search-Fixes
Fix issue with turning quote_names on with case insensitive search
2017-07-25 14:15:10 +01:00
Tom Bloor
b44cb5fe1d Fix issue with turning quote_names on with case insensitive search 2017-07-25 14:14:30 +01:00
Finn
74d69e708a Merge pull request #18 from Pear-Trading/finn/htmllayout
Changed viewed layout
2017-07-25 13:40:36 +01:00
Finn
40816a5386 Changed viewed layout 2017-07-25 13:38:15 +01:00
Finn
3946aaa033 Merge pull request #17 from Pear-Trading/finn/feedback
Feedback API and DB
2017-07-24 15:43:32 +01:00
Finn
bf6ff3bc82 Version 2 schema DLL upgrade 2017-07-24 15:39:28 +01:00
Finn
6126e44c6b Final changes to schema an upgrade 2017-07-24 15:39:06 +01:00
Finn
09f9cf9d48 Feedback HTML views added and fixes made 2017-07-24 15:21:10 +01:00
Finn
baea01e8b5 Schema and actual DB submit code added 2017-07-24 14:55:05 +01:00
Finn
d38758ac90 New Feedback API endpoint added 2017-07-24 13:20:22 +01:00
Tom Bloor
4da2c14066 Merge branch 'TBSliver/Fix-Undef-Leaderboard' into development 2017-07-20 17:42:46 +01:00
Tom Bloor
f01346b667 Merge pull request #16 from Pear-Trading/TBSliver/Login-Fix
Fix issue with login error
2017-07-21 18:43:24 +01:00
Tom Bloor
a6724f2495 Merge pull request #15 from Pear-Trading/TBSliver/Deployment-Handler
Deployment Handler
2017-07-21 18:33:01 +01:00
Tom Bloor
e76025c44e Merge pull request #14 from Pear-Trading/finn/frontpagestats
Merge frontpage rank into dev
2017-07-21 17:58:24 +01:00
Tom Bloor
50e06981d7 Fix issue with undefined leaderboard 2017-07-20 17:41:59 +01:00
Tom Bloor
243722df93 Fix issue with login error
fixes #9
2017-07-20 17:34:33 +01:00
Tom Bloor
60918800b3 Added initialisation of Leaderboards to DH 2017-07-20 17:16:24 +01:00
Tom Bloor
f136b0baab Mint version 1 of Schema DDL 2017-07-20 17:09:55 +01:00
Tom Bloor
dde8988345 Deployment Handler Script
Adding the script and required items for deployment handler script to work
2017-07-20 17:08:02 +01:00
Tom Bloor
5713f03cf2 Fix test
Needed to initialise a leaderboard for monthly stats
2017-07-20 16:41:35 +01:00
Finn
16abfe34ea Fixed rank sending and added leaderboard creation script 2017-07-20 11:56:24 +01:00
Finn
4f09483f59 Front page stat sending added 2017-07-19 17:29:00 +01:00
Tom Bloor
7010825707 Merge branch 'TBSliver/Leaderboard-Position-Fix' into development 2017-06-13 23:15:29 +01:00
Tom Bloor
559e88d9e6 Fix issue with leaderboard position due to wrong calculation of trend 2017-06-13 23:15:10 +01:00
Tom Bloor
1fb247c675 Merge branch 'TBSliver/Dev-Script-Fix' into development 2017-06-13 22:01:49 +01:00