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 |
|
|
Tom Bloor
|
0f9a3eadd8
|
Added error dump on failing test for debugging
|
2018-01-02 21:40:41 +00:00 |
|
|
Tom Bloor
|
e0d3035929
|
Added testing with postgres to travis
|
2018-01-02 20:05:27 +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
|
d4ff855251
|
Added is_fair column for fairly trading organisations
|
2018-01-02 19:56:48 +00:00 |
|
|
Tom Bloor
|
d6d4121cb3
|
Fix booleans on sqlite ddl
|
2018-01-02 19:56:10 +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
|
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
|
3346dbd0d4
|
updated changelog
|
2017-12-21 15:39:34 +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 |
|
|
Finn
|
2bbc1d508e
|
Merge pull request #89 from Pear-Trading/finn/loopdashboard
frontpage stats amended for sectors and weeks
|
2017-12-20 13:25:22 +00:00 |
|
|
Finn
|
bb254cb278
|
frontpage stats amended for sectors and weeks
|
2017-12-19 18:03:15 +00:00 |
|
|
Finn
|
12364c2a17
|
Merge pull request #88 from Pear-Trading/finn/sectorU
added new sector
|
2017-12-19 18:01:55 +00:00 |
|
|
Finn
|
cdde2f5ca8
|
added new sector
|
2017-12-18 16:19:10 +00:00 |
|
|
Finn
|
38f8883ab1
|
Merge pull request #87 from Pear-Trading/finn/applegacy
reverted fix and did different fix to order_by
|
2017-12-18 15:50:17 +00:00 |
|