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 |
|
Finn
|
1730592afb
|
Updated changelog
|
2018-01-18 12:21:47 +00:00 |
|
Finn
|
99887926db
|
Added version to changelog
|
2018-01-18 12:06:07 +00:00 |
|
Finn
|
8ec32e3b3c
|
Changed logic for transaction list API
|
2018-01-17 17:38:24 +00:00 |
|
Finn
|
8c9bcbf85c
|
added further fix
|
2018-01-17 17:38:07 +00:00 |
|
Finn
|
25f9d818f8
|
Fixed transaction ID edit
|
2018-01-17 17:36:55 +00:00 |
|
Finn
|
06e4345927
|
Added ability to change ID
|
2018-01-17 17:23:12 +00:00 |
|
Finn
|
005388b27e
|
fixed api and quantised statement code
|
2018-01-17 17:14:50 +00:00 |
|
Finn
|
d3f0ebb62f
|
Added initial ability to get transaction category list from month
|
2018-01-17 16:47:05 +00:00 |
|
Finn
|
0d221d9f08
|
Merge branch 'finn/transactioncategory' into development
|
2018-01-16 16:43:17 +00:00 |
|
Finn
|
5eb25efa5b
|
updated changelog
|
2018-01-16 16:42:50 +00:00 |
|
Finn
|
ffc9712268
|
Merge pull request #96 from Pear-Trading/finn/transactioncategory
Added categories API and backend
|
2018-01-16 16:40:46 +00:00 |
|
Finn
|
ace66d0447
|
Tests fixed adding for category
|
2018-01-16 15:55:19 +00:00 |
|
Finn
|
85a9647294
|
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
|
f79ec09782
|
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
|
4e9312148c
|
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
|
f4cd25dd68
|
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
|
b12cd3fcfc
|
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 |
|
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
|
b405d3a5ed
|
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 |
|
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
|
6dd574e046
|
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
|
44ade264c9
|
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
|
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
|
e29badb59d
|
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 |
|
Finn
|
c4a99e9ec5
|
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
|
44155cd33e
|
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
|
cd9420da42
|
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
|
17ba1e75fd
|
frontpage stats amended for sectors and weeks
|
2017-12-19 18:03:15 +00:00 |
|
Finn
|
86184cfbdb
|
Merge pull request #88 from Pear-Trading/finn/sectorU
added new sector
|
2017-12-19 18:01:55 +00:00 |
|
Finn
|
201594d331
|
added new sector
|
2017-12-18 16:19:10 +00:00 |
|
Finn
|
6484ef277a
|
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 |
|