Commit graph

652 commits

Author SHA1 Message Date
Finn
d58a6ac031 Merge pull request #103 from Pear-Trading/finn/medalschema
added essential purchase option, fixed category view and added initial medal schema
2018-03-02 18:04:41 +00:00
Finn
8aacc32c71 Fixed code to ensure tests passed 2018-03-02 17:33:57 +00:00
Finn
5c73aa917d category test fixed 2018-03-02 17:00:01 +00:00
Finn
4ebe99f6ad removed debug line and unneeded code 2018-03-02 16:42:30 +00:00
Finn
8db595c43b added fixes for budget view and working essential 2018-03-02 16:32:28 +00:00
Finn
61aa73a486 added viewing of purchase being essential in transaction read 2018-03-01 17:20:50 +00:00
Finn
18edad5f42 amended upload code to allow for essential purchases 2018-03-01 17:08:44 +00:00
Finn
f966c1a5a1 added essential flag to transactions in schema 2018-03-01 17:08:30 +00:00
Finn
9563851941 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
5171a88db2 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
46a2727ef8 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
8a48dc571b 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
4e82e0ec98 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
fb3582d2a9 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
2daef6c36a 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
4aae7fb3ea 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
5ebbb492f3 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
759d9615b9 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
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
1730592afb 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
8ec32e3b3c 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
25f9d818f8 Fixed transaction ID edit 2018-01-17 17:36:55 +00:00
Finn
06e4345927 Added ability to change ID 2018-01-17 17:23:12 +00:00
Finn
005388b27e fixed api and quantised statement code 2018-01-17 17:14:50 +00:00
Finn
d3f0ebb62f Added initial ability to get transaction category list from month 2018-01-17 16:47:05 +00:00
Finn
0d221d9f08 Merge branch 'finn/transactioncategory' into development 2018-01-16 16:43:17 +00:00
Finn
5eb25efa5b updated changelog 2018-01-16 16:42:50 +00:00
Finn
ffc9712268 Merge pull request #96 from Pear-Trading/finn/transactioncategory
Added categories API and backend
2018-01-16 16:40:46 +00:00
Finn
ace66d0447 Tests fixed adding for category 2018-01-16 15:55:19 +00:00
Finn
85a9647294 fixed delete checking for category on transaction 2018-01-16 14:52:16 +00:00
Finn
5ad83795bd fixed reading transactions and category deletion 2018-01-16 14:47:17 +00:00
Finn
f79ec09782 redid relationships of transactions/categories 2018-01-16 13:07:12 +00:00
Finn
670d770d84 Fixed upload and added category read to transaction 2018-01-15 17:14:16 +00:00
Finn
4e9312148c Fixed upload code 2018-01-15 17:01:59 +00:00
Finn
93de8fdf9e functional category loading and category in upload 2018-01-15 16:57:19 +00:00
Finn
f4cd25dd68 fixed faulty syntax 2018-01-15 14:34:02 +00:00
Finn
5a88c283d5 added category API 2018-01-15 14:18:27 +00:00
Finn
b12cd3fcfc Categories admin interface fully implemented 2018-01-11 16:23:42 +00:00