Tom Bloor
|
0ca1386212
|
Merge branch 'development'
|
2017-08-17 15:45:50 +01:00 |
|
Tom Bloor
|
f771e5e85c
|
Merge branch 'TBSliver/More-Upload-Fix' into development
|
2017-08-17 15:45:40 +01:00 |
|
Tom Bloor
|
d169249538
|
Better fix and change status to 400 for upload errors
|
2017-08-17 15:45:26 +01:00 |
|
Tom Bloor
|
0a38102200
|
Merge branch 'development'
|
2017-08-17 15:39:21 +01:00 |
|
Tom Bloor
|
bc09479a61
|
Merge branch 'TBSliver/Upload-Fix' into development
|
2017-08-17 15:38:38 +01:00 |
|
Tom Bloor
|
d07610e72d
|
Check for organisation and transaction actually being defined on upload
|
2017-08-17 15:38:08 +01:00 |
|
Tom Bloor
|
e6ceffe28f
|
Merge branch 'development'
|
2017-08-14 17:52:31 +01:00 |
|
Finn
|
3197352ff2
|
Merge pull request #28 from Pear-Trading/finn/PSQLupgradefix
Fix to PostgreSQL upgrade
|
2017-08-14 17:52:01 +01:00 |
|
Finn
|
08c6b2886e
|
Fix to PostgreSQL upgrade
|
2017-08-14 17:41:01 +01:00 |
|
Tom Bloor
|
dd39ddc47d
|
Merge branch 'development'
|
2017-08-14 17:36:51 +01:00 |
|
Finn
|
2bb6287579
|
Merge pull request #27 from Pear-Trading/finn/Datetimeredundancy
Added system redundancy
|
2017-08-14 16:22:04 +01:00 |
|
Finn
|
efbcdbce84
|
Added system redundancy
|
2017-08-14 16:21:06 +01:00 |
|
Finn
|
89aac53c02
|
Merge pull request #26 from Pear-Trading/finn/LeaderboardFix
Leaderboards corrected and fixes
|
2017-08-14 16:11:10 +01:00 |
|
Finn
|
c6726682d4
|
Leaderboards corrected and fixes
|
2017-08-14 16:10:14 +01:00 |
|
Finn
|
4a5e7328f5
|
Merge pull request #25 from Pear-Trading/finn/DateSubmission
Datetime Submission and validation
|
2017-08-14 15:47:31 +01:00 |
|
Finn
|
d078a09ccd
|
Added receipt datetime string submission validation & validator test
|
2017-08-14 15:35:23 +01:00 |
|
Finn
|
65d5bab444
|
Fixed errors and tests and updated DB
|
2017-08-14 15:04:24 +01:00 |
|
Finn
|
b44a256434
|
Updated DB and added more DateTime
|
2017-08-14 12:45:54 +01:00 |
|
Finn
|
f9703b6561
|
Updated tests to include receipt datetime submission
|
2017-08-14 11:55:52 +01:00 |
|
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 |
|