Commit graph

303 commits

Author SHA1 Message Date
Finn
72813ff2a3 Made image upload optional 2017-08-31 11:41:38 +01:00
Finn
a30b05f1c0 Merge pull request #39 from Pear-Trading/finn/SelectSector
Added Selection for Sector Code
2017-08-31 11:05:23 +01:00
Finn
dac0061a0c Added Selection for Sector Code 2017-08-30 17:09:51 +01:00
Tom Bloor
c7e0b675c1 Merge pull request #38 from Pear-Trading/TBSliver/Org-Graphs
Initial Organisation graphs endpoints
2017-08-29 16:55:11 +01:00
Tom Bloor
3bb18103c9 Remove debug items from graphs test 2017-08-29 12:43:13 +01:00
Tom Bloor
3ae8a43df4 Added organisation graph endpoint and tests 2017-08-29 12:42:27 +01:00
Tom Bloor
7ed2636978 Added fixture installer to main fixtures set 2017-08-25 17:12:12 +01:00
Tom Bloor
cc046f517b Added users fixture set 2017-08-25 16:36:43 +01:00
Tom Bloor
df7f1de1a6 Merge pull request #37 from Pear-Trading/TBSliver/Login-Info
Added extra info to login return
2017-08-25 16:15:16 +01:00
Finn
5fb0b7c483 Merge pull request #36 from Pear-Trading/finn/sector
Sector endpoint added
2017-08-25 16:03:03 +01:00
Finn
6cdc8891c3 Tests fixed 2017-08-25 15:47:54 +01:00
Finn
ef2e0627e1 Fixes and schema update stuff 2017-08-25 15:32:39 +01:00
Finn
ff263374ec Added endpoints for organisation sector 2017-08-25 15:25:52 +01:00
Tom Bloor
deba59dc00 Add test for showing display name and user type correctly 2017-08-25 15:17:12 +01:00
Tom Bloor
768cc38410 Refactor api login test 2017-08-25 15:14:43 +01:00
Tom Bloor
4a4c568fb7 Return user type on login 2017-08-25 14:59:15 +01:00
Tom Bloor
0a9ca57689 Added user type attribute 2017-08-25 14:59:01 +01:00
Tom Bloor
e886eb2ce6 Remove explicit undef returns 2017-08-25 14:44:36 +01:00
Finn
06e89c9199 Merge pull request #34 from Pear-Trading/finn/AccountUpdateFix
Fixed validation for organisation edit
2017-08-24 13:21:05 +01:00
Finn
22c4a1198b Merge pull request #35 from Pear-Trading/finn/AdminAccountEdit
Account editing added
2017-08-24 13:20:43 +01:00
Finn
b5feae5f06 Disabled some entries and attempted autocomplete removal 2017-08-24 13:01:11 +01:00
Finn
7c25ecccfd Entry field and test fixed 2017-08-24 12:48:32 +01:00
Finn
db45f710c3 Code fixed, now functioning account edit 2017-08-24 12:37:53 +01:00
Finn
9865130666 Added user account stuff test and some fixes 2017-08-23 18:42:19 +01:00
Finn
4c7836c9f6 Initial server code added for updating user account 2017-08-23 16:50:04 +01:00
Finn
6f01bf2661 Fixed validation removing redundant code 2017-08-23 16:47:29 +01:00
Finn
4d299cee10 Fixed validation for organisation edit 2017-08-23 16:25:08 +01:00
Tom Bloor
49beb3037d Merge pull request #33 from Pear-Trading/TBSliver/Recalc-Leaderboards
Recalculate Leaderboards
2017-08-21 17:04:26 +01:00
Tom Bloor
e907ad37d4 Replace all leaderboard scripts with the single recalc script 2017-08-21 16:51:35 +01:00
Tom Bloor
f0334be0fc Merge pull request #32 from Pear-Trading/finn/AddOrg
Add Organisation & test
2017-08-21 16:49:29 +01:00
Tom Bloor
2dfce6afd2 Added scripts for generating fixtures - no data stored for now 2017-08-21 15:32:02 +01:00
Tom Bloor
9b9b2bd322 Enabled recalculation of leaderboards at any point 2017-08-21 15:29:10 +01:00
Tom Bloor
3f743f0b5f Fixed all_day calculating from the wrong time 2017-08-21 15:29:09 +01:00
Tom Bloor
6c35bc36e0 Added basic docs for leaderboards, and fixtures 2017-08-21 15:29:09 +01:00
Tom Bloor
e49d806308 Added Fixtures to cpanfile 2017-08-21 15:29:09 +01:00
Finn
573c1ad50a Test renamed and add organisation rest added 2017-08-21 15:18:34 +01:00
Finn
a1b6dd8d2a Add Organisation Code 2017-08-21 15:10:33 +01:00
Finn
0a65cc2f47 Merge pull request #31 from Pear-Trading/finn/EditOrganisation
Edit Orgs capability and added test
2017-08-21 14:03:06 +01:00
Finn
36a5fdf2e3 Fixed code and added test for reading and editing Organisations 2017-08-18 16:46:49 +01:00
Finn
db2dc9fc0f Can now edit valid and pending organisations 2017-08-18 12:56:14 +01:00
Tom Bloor
8473fc839a Initial docs on Leaderboard concepts 2017-08-18 11:54:46 +01:00
Tom Bloor
45a8a58b30 Merge branch 'Hotfix/Syntax-Error' into development 2017-08-17 16:35:13 +01:00
Tom Bloor
056d37501b Fixing syntax error 2017-08-17 16:34:43 +01:00
Tom Bloor
36ececb69e Merge branch 'development' 2017-08-17 16:27:49 +01:00
Tom Bloor
3ca2436fac Merge pull request #30 from Pear-Trading/finn/DatetimeErrorFix
Datetime error log fix
2017-08-17 16:27:24 +01:00
Finn
fa1968f035 DatetimeErrorlogfix 2017-08-17 16:26:11 +01:00
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