Unknown
|
e3969fe222
|
All test data added, with comments
|
2018-03-21 12:32:41 +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 |
|
|
Finn
|
36947bfeab
|
Merge branch 'finn/transactioncategory' into development
|
2018-01-16 16:43:17 +00:00 |
|
|
Finn
|
a9ca2efe9a
|
updated changelog
|
2018-01-16 16:42:50 +00:00 |
|
|
Finn
|
7f9c53aa5a
|
Merge pull request #96 from Pear-Trading/finn/transactioncategory
Added categories API and backend
|
2018-01-16 16:40:46 +00:00 |
|
|
Finn
|
8e00135390
|
Tests fixed adding for category
|
2018-01-16 15:55:19 +00:00 |
|
|
Finn
|
dddbb04023
|
fixed delete checking for category on transaction
|
2018-01-16 14:52:16 +00:00 |
|
|
Finn
|
ad30cf9cd9
|
fixed reading transactions and category deletion
|
2018-01-16 14:47:17 +00:00 |
|
|
Finn
|
8a0f933f07
|
redid relationships of transactions/categories
|
2018-01-16 13:07:12 +00:00 |
|
|
Finn
|
1f70f9b40a
|
Fixed upload and added category read to transaction
|
2018-01-15 17:14:16 +00:00 |
|
|
Finn
|
c4f68332b9
|
Fixed upload code
|
2018-01-15 17:01:59 +00:00 |
|
|
Finn
|
175026e37e
|
functional category loading and category in upload
|
2018-01-15 16:57:19 +00:00 |
|
|
Finn
|
53b63aa655
|
fixed faulty syntax
|
2018-01-15 14:34:02 +00:00 |
|
|
Finn
|
4369a95054
|
added category API
|
2018-01-15 14:18:27 +00:00 |
|
|
Finn
|
4e74c871a2
|
Categories admin interface fully implemented
|
2018-01-11 16:23:42 +00:00 |
|
|
Finn
|
c2a099c3e2
|
Added transaction categories tables
|
2018-01-11 14:00:20 +00:00 |
|
Tom Bloor
|
7ea96a74d0
|
Merge pull request #95 from Pear-Trading/master
Master merge for v0.10.2
|
2018-01-03 15:41:07 +00:00 |
|
|
Tom Bloor
|
4ee40b0732
|
Merge pull request #94 from Pear-Trading/Release-v0.10.2
Release v0.10.2
|
2018-01-03 14:24:11 +00:00 |
|
|
Thomas Bloor
|
40dfa1c102
|
Updated Changelog
|
2018-01-03 14:23:26 +00:00 |
|
|
Tom Bloor
|
bef55a85d5
|
Merge pull request #93 from Pear-Trading/TBSliver/Org-Fairly-Trading
Added fairly trading for Organisations
|
2018-01-03 14:21:58 +00:00 |
|
|
Tom Bloor
|
cc2360ab22
|
Add missed location updating in organisation edit on admin backend
|
2018-01-02 22:12:38 +00:00 |
|
|
Tom Bloor
|
500b61928b
|
Disable postgres tests while investigating unrelated issue to current
branch
|
2018-01-02 21:58:20 +00:00 |
|