Commit graph

1171 commits

Author SHA1 Message Date
Finn
85a9647294 fixed delete checking for category on transaction 2018-01-16 14:52:16 +00:00
Finn
dddbb04023 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
ad30cf9cd9 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
8a0f933f07 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
1f70f9b40a 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
c4f68332b9 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
175026e37e 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
53b63aa655 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
4369a95054 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
Finn
4e74c871a2 Categories admin interface fully implemented 2018-01-11 16:23:42 +00:00
Finn
8531d73930 Added transaction categories tables 2018-01-11 14:00:20 +00:00
Finn
c2a099c3e2 Added transaction categories tables 2018-01-11 14:00:20 +00:00
Tom Bloor
2f9673edcd Merge pull request #95 from Pear-Trading/master
Master merge for v0.10.2
2018-01-03 15:41:07 +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
b405d3a5ed Merge pull request #94 from Pear-Trading/Release-v0.10.2
Release v0.10.2
2018-01-03 14:24:11 +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
4c50bfaf63 Updated Changelog 2018-01-03 14:23:26 +00:00
Thomas Bloor
40dfa1c102
Updated Changelog 2018-01-03 14:23:26 +00:00
Tom Bloor
30a49baad4 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
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
6dd574e046 Add missed location updating in organisation edit on admin backend 2018-01-02 22:12:38 +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
60a41c9645 Disable postgres tests while investigating unrelated issue to current
branch
2018-01-02 21:58:20 +00:00
Tom Bloor
500b61928b
Disable postgres tests while investigating unrelated issue to current
branch
2018-01-02 21:58:20 +00:00
Tom Bloor
44ade264c9 Added error dump on failing test for debugging 2018-01-02 21:40:41 +00:00
Tom Bloor
0f9a3eadd8
Added error dump on failing test for debugging 2018-01-02 21:40:41 +00:00
Tom Bloor
d331fe41fe Added testing with postgres to travis 2018-01-02 20:05:27 +00:00
Tom Bloor
e0d3035929
Added testing with postgres to travis 2018-01-02 20:05:27 +00:00
Tom Bloor
725bebb00b Added fairly trading org field and change org transactions to show
purchases not sales
2018-01-02 19:57:12 +00:00
Tom Bloor
8be16867bb
Added fairly trading org field and change org transactions to show
purchases not sales
2018-01-02 19:57:12 +00:00
Tom Bloor
e29badb59d Added is_fair column for fairly trading organisations 2018-01-02 19:56:48 +00:00
Tom Bloor
d4ff855251
Added is_fair column for fairly trading organisations 2018-01-02 19:56:48 +00:00
Tom Bloor
69811229c8 Fix booleans on sqlite ddl 2018-01-02 19:56:10 +00:00
Tom Bloor
d6d4121cb3
Fix booleans on sqlite ddl 2018-01-02 19:56:10 +00:00
Finn
c4a99e9ec5 Merge pull request #92 from Pear-Trading/master
Master merge to develop
2017-12-21 16:14:46 +00:00
Finn
67394ce8fa
Merge pull request #92 from Pear-Trading/master
Master merge to develop
2017-12-21 16:14:46 +00:00
Finn
0c42ad0fe2 Merge pull request #91 from Pear-Trading/Release-v0.10.1
Release v0.10.1
2017-12-21 15:51:10 +00:00
Finn
0214ad4558
Merge pull request #91 from Pear-Trading/Release-v0.10.1
Release v0.10.1
2017-12-21 15:51:10 +00:00
Finn
44155cd33e updated changelog 2017-12-21 15:39:34 +00:00
Finn
3346dbd0d4 updated changelog 2017-12-21 15:39:34 +00:00
Finn
cca147a8e1 Merge pull request #90 from Pear-Trading/master
Master merge for v0.10.0
2017-12-21 15:37:53 +00:00
Finn
2673f79f98
Merge pull request #90 from Pear-Trading/master
Master merge for v0.10.0
2017-12-21 15:37:53 +00:00