Commit graph

665 commits

Author SHA1 Message Date
Finn
12bde771b2 Merge branch 'finn/changelog' into development 2018-03-09 13:53:08 +00:00
Finn
ea18e467f4 changelog amended 2018-03-09 13:52:46 +00:00
Finn
a3dcd57fea
Merge pull request #105 from Pear-Trading/finn/recurring
Added script for recurring transactions and changed recurring logic
2018-03-08 16:58:41 +00:00
Finn
d4d1b841d7 changed logic of start time for transaction and submitted time 2018-03-08 16:41:45 +00:00
Finn
bdf23b2f3d fully operational and functioning recurring script + changes to schema 2018-03-08 15:31:44 +00:00
Finn
813cbb82a5 whitespace fix and created initial recurring transaction script 2018-03-07 18:08:11 +00:00
Finn
98cd134d84 Changed logic of storing recurring transactions 2018-03-07 15:34:41 +00:00
Finn
3cf73aca37
Merge pull request #104 from Pear-Trading/finn/recurring
added uploading and viewing recurring purchases
2018-03-07 13:05:46 +00:00
Finn
38dc29f4a1 amended test to include a recurring period 2018-03-07 12:50:36 +00:00
Finn
d937e64663 Fixed recurring purchase entry 2018-03-07 12:46:50 +00:00
Finn
79324ff5f7 Upgraded schema and made fixes 2018-03-05 16:18:17 +00:00
Finn
786cd1618a added initial possible schema and ability to submit on transaction 2018-03-05 15:49:30 +00:00
Finn
7aa93bf380 Added initial for upload to accept recurring type 2018-03-05 15:37:01 +00:00
Finn
ab88755b00
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
712959c37e Fixed code to ensure tests passed 2018-03-02 17:33:57 +00:00
Finn
23185985b8 category test fixed 2018-03-02 17:00:01 +00:00
Finn
1377742acd removed debug line and unneeded code 2018-03-02 16:42:30 +00:00
Finn
ebcc79fd36 added fixes for budget view and working essential 2018-03-02 16:32:28 +00:00
Finn
af6d198c8f added viewing of purchase being essential in transaction read 2018-03-01 17:20:50 +00:00
Finn
396cb3c8f6 amended upload code to allow for essential purchases 2018-03-01 17:08:44 +00:00
Finn
28a33cf27f added essential flag to transactions in schema 2018-03-01 17:08:30 +00:00
Finn
f519bb9f2f Fixed schema and added update for sql 2018-02-21 12:51:43 +00:00
Finn
413479b94f fixed table name and added initial org medal schema 2018-02-20 17:44:22 +00:00
Finn
940d96921c Added initial schema for medals 2018-02-20 17:20:51 +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
156af841c2 Added placeholder API for user points 2018-02-05 14:58:55 +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
6879a8b3b8 made placeholder more obvious 2018-01-31 12:54:14 +00:00
Finn
613272f413 Added routing and placeholder for medal data 2018-01-31 12:52:52 +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
a4706ef05e Updated changelog 2018-01-26 10:09:47 +00:00
Finn
1b74931248 Updated data view 2018-01-26 09:51:28 +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
3ea79ad8de Working test added 2018-01-24 16:08:20 +00:00
Finn
ecbcd205fe category purchase list fully grouped 2018-01-24 13:19:35 +00:00
Finn
6cd7df1259 working API with arrays 2018-01-22 16:26:45 +00:00
Finn
6e970de92c Merge branch 'development' into finn/categorylist 2018-01-19 12:31:32 +00:00
Finn
41928e1ff6 Merge branch 'master' into development 2018-01-18 14:26:18 +00:00
Finn
7a44797a56 Merge branch 'Hotfix-categoryandstatsfix' 2018-01-18 14:26:04 +00:00
Finn
65a4447478 fixed to admin interface categories & stats 2018-01-18 14:25:45 +00:00
Finn
e64e4bcbc8 fixed to admin interface categories & stats 2018-01-18 14:24:47 +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
8c8da1f795 Updated changelog 2018-01-18 12:21:47 +00:00
Finn
39549d257f Added version to changelog 2018-01-18 12:06:07 +00:00
Finn
b247183914 Changed logic for transaction list API 2018-01-17 17:38:24 +00:00
Finn
de9d70432f added further fix 2018-01-17 17:38:07 +00:00
Finn
cd4f13bf8c Fixed transaction ID edit 2018-01-17 17:36:55 +00:00
Finn
3e9746ca22 Added ability to change ID 2018-01-17 17:23:12 +00:00
Finn
6fe4cd9a31 fixed api and quantised statement code 2018-01-17 17:14:50 +00:00
Finn
b383284519 Added initial ability to get transaction category list from month 2018-01-17 16:47:05 +00:00