Commit graph

1187 commits

Author SHA1 Message Date
Finn
9563851941 Fixed schema and added update for sql 2018-02-21 12:51:43 +00:00
Finn
f519bb9f2f Fixed schema and added update for sql 2018-02-21 12:51:43 +00:00
Finn
62dbc1a49e fixed table name and added initial org medal schema 2018-02-20 17:44:22 +00:00
Finn
413479b94f fixed table name and added initial org medal schema 2018-02-20 17:44:22 +00:00
Finn
5171a88db2 Added initial schema for medals 2018-02-20 17:20:51 +00:00
Finn
940d96921c Added initial schema for medals 2018-02-20 17:20:51 +00:00
Finn
328ffc10e0 Merge pull request #101 from Pear-Trading/finn/medals
Added placeholder API for user points
2018-02-08 12:17:12 +00:00
Finn
480c8ed78f
Merge pull request #101 from Pear-Trading/finn/medals
Added placeholder API for user points
2018-02-08 12:17:12 +00:00
Finn
46a2727ef8 Added placeholder API for user points 2018-02-05 14:58:55 +00:00
Finn
156af841c2 Added placeholder API for user points 2018-02-05 14:58:55 +00:00
Finn
565c90d56a Merge pull request #100 from Pear-Trading/finn/medals
Placeholder medal and endpoint added
2018-02-01 11:11:30 +00:00
Finn
26191d413d
Merge pull request #100 from Pear-Trading/finn/medals
Placeholder medal and endpoint added
2018-02-01 11:11:30 +00:00
Finn
8a48dc571b made placeholder more obvious 2018-01-31 12:54:14 +00:00
Finn
6879a8b3b8 made placeholder more obvious 2018-01-31 12:54:14 +00:00
Finn
e26a2330df Added routing and placeholder for medal data 2018-01-31 12:52:52 +00:00
Finn
613272f413 Added routing and placeholder for medal data 2018-01-31 12:52:52 +00:00
Finn
4e82e0ec98 Merge pull request #99 from Pear-Trading/finn/categoryAPI
Updated data view
2018-01-26 10:29:31 +00:00
Finn
da86e52735
Merge pull request #99 from Pear-Trading/finn/categoryAPI
Updated data view
2018-01-26 10:29:31 +00:00
Finn
7006999ab1 Updated changelog 2018-01-26 10:09:47 +00:00
Finn
a4706ef05e Updated changelog 2018-01-26 10:09:47 +00:00
Finn
fb3582d2a9 Updated data view 2018-01-26 09:51:28 +00:00
Finn
1b74931248 Updated data view 2018-01-26 09:51:28 +00:00
Finn
b00b581417 Merge pull request #98 from Pear-Trading/finn/categorylist
Category budget view added with test
2018-01-25 16:22:45 +00:00
Finn
9f3971815e
Merge pull request #98 from Pear-Trading/finn/categorylist
Category budget view added with test
2018-01-25 16:22:45 +00:00
Finn
2daef6c36a Working test added 2018-01-24 16:08:20 +00:00
Finn
3ea79ad8de Working test added 2018-01-24 16:08:20 +00:00
Finn
1914f564fb category purchase list fully grouped 2018-01-24 13:19:35 +00:00
Finn
ecbcd205fe category purchase list fully grouped 2018-01-24 13:19:35 +00:00
Finn
4aae7fb3ea working API with arrays 2018-01-22 16:26:45 +00:00
Finn
6cd7df1259 working API with arrays 2018-01-22 16:26:45 +00:00
Finn
d14f1fb7f0 Merge branch 'development' into finn/categorylist 2018-01-19 12:31:32 +00:00
Finn
6e970de92c Merge branch 'development' into finn/categorylist 2018-01-19 12:31:32 +00:00
Finn
5ebbb492f3 Merge branch 'master' into development 2018-01-18 14:26:18 +00:00
Finn
41928e1ff6 Merge branch 'master' into development 2018-01-18 14:26:18 +00:00
Finn
5e0adc1350 Merge branch 'Hotfix-categoryandstatsfix' 2018-01-18 14:26:04 +00:00
Finn
7a44797a56 Merge branch 'Hotfix-categoryandstatsfix' 2018-01-18 14:26:04 +00:00
Finn
759d9615b9 fixed to admin interface categories & stats 2018-01-18 14:25:45 +00:00
Finn
65a4447478 fixed to admin interface categories & stats 2018-01-18 14:25:45 +00:00
Finn
e524f1d421 fixed to admin interface categories & stats 2018-01-18 14:24:47 +00:00
Finn
e64e4bcbc8 fixed to admin interface categories & stats 2018-01-18 14:24:47 +00:00
Finn
b542db2c0b Merge pull request #97 from Pear-Trading/development
Release of category API and admin interface
2018-01-18 12:24:05 +00:00
Finn
cab32fbf92
Merge pull request #97 from Pear-Trading/development
Release of category API and admin interface
2018-01-18 12:24:05 +00:00
Finn
1730592afb Updated changelog 2018-01-18 12:21:47 +00:00
Finn
8c8da1f795 Updated changelog 2018-01-18 12:21:47 +00:00
Finn
99887926db Added version to changelog 2018-01-18 12:06:07 +00:00
Finn
39549d257f Added version to changelog 2018-01-18 12:06:07 +00:00
Finn
8ec32e3b3c Changed logic for transaction list API 2018-01-17 17:38:24 +00:00
Finn
b247183914 Changed logic for transaction list API 2018-01-17 17:38:24 +00:00
Finn
8c9bcbf85c added further fix 2018-01-17 17:38:07 +00:00
Finn
de9d70432f added further fix 2018-01-17 17:38:07 +00:00