Finn
|
15fe827f85
|
Merge branch 'master' into development
|
2018-03-09 17:45:19 +00:00 |
|
Finn
|
bc3574561e
|
fix DDL
|
2018-03-09 17:44:47 +00:00 |
|
Finn
|
d0411dcd25
|
Merge branch 'master' into development
|
2018-03-09 17:39:26 +00:00 |
|
Finn
|
43f17596fe
|
Merge branch 'finn/medalhotfix'
|
2018-03-09 17:39:11 +00:00 |
|
Finn
|
8c885000a5
|
hotfix to medal schema data types
|
2018-03-09 17:38:12 +00:00 |
|
Finn
|
94f381592c
|
Merge pull request #107 from Pear-Trading/master
merge to dev
|
2018-03-09 17:28:41 +00:00 |
|
Finn
|
ba847a690e
|
Merge pull request #106 from Pear-Trading/Release-v0.10.4
Release 0.10.4
|
2018-03-09 17:11:35 +00:00 |
|
Finn
|
b5ca01faa7
|
Version bump
|
2018-03-09 16:54:03 +00:00 |
|
Finn
|
b92afdfaa8
|
Merge branch 'finn/changelog' into development
|
2018-03-09 13:53:08 +00:00 |
|
Finn
|
358ce8a5a8
|
changelog amended
|
2018-03-09 13:52:46 +00:00 |
|
Finn
|
fa7baa7047
|
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
|
87a03c1e40
|
changed logic of start time for transaction and submitted time
|
2018-03-08 16:41:45 +00:00 |
|
Finn
|
0dfa3a8aa9
|
fully operational and functioning recurring script + changes to schema
|
2018-03-08 15:31:44 +00:00 |
|
Finn
|
f69a6266fe
|
whitespace fix and created initial recurring transaction script
|
2018-03-07 18:08:11 +00:00 |
|
Finn
|
39c47a4983
|
Changed logic of storing recurring transactions
|
2018-03-07 15:34:41 +00:00 |
|
Finn
|
dc0efdcf68
|
Merge pull request #104 from Pear-Trading/finn/recurring
added uploading and viewing recurring purchases
|
2018-03-07 13:05:46 +00:00 |
|
Finn
|
f5122630ea
|
amended test to include a recurring period
|
2018-03-07 12:50:36 +00:00 |
|
Finn
|
a7f2f7576e
|
Fixed recurring purchase entry
|
2018-03-07 12:46:50 +00:00 |
|
Finn
|
b2dfa36d35
|
Upgraded schema and made fixes
|
2018-03-05 16:18:17 +00:00 |
|
Finn
|
26aba2cd9e
|
added initial possible schema and ability to submit on transaction
|
2018-03-05 15:49:30 +00:00 |
|
Finn
|
d029bba1a9
|
Added initial for upload to accept recurring type
|
2018-03-05 15:37:01 +00:00 |
|
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 |
|