Commit graph

696 commits

Author SHA1 Message Date
Finn
a02c74d830 customer stats test fixed 2018-03-21 16:01:46 +00:00
Finn
be0571f90b fixed category list on postgres 2018-03-21 15:52:00 +00:00
Finn
4f703cb019 Amended changelog 2018-03-20 19:24:04 +00:00
Finn
ad95b32113 Merge pull request #110 from Pear-Trading/finn/recurring
added recurring transaction editing and deletion
2018-03-20 19:19:15 +00:00
Finn
b63adc590c fixed transaction test for updating and deleting 2018-03-20 18:54:55 +00:00
Finn
5faca4d792 made tests sane 2018-03-20 18:46:50 +00:00
Finn
504fec5207 added deleting and updating transactions 2018-03-20 18:43:00 +00:00
Finn
4affc1bd54 fixed to category viewing and recurring transaction data 2018-03-20 12:19:04 +00:00
Finn
6849f12415 Merge branch 'master' into finn/recurring 2018-03-19 16:17:24 +00:00
Finn
37deb7f52c Fix to add org submission 2018-03-19 13:36:51 +00:00
Finn
da8eb2864e Merge remote-tracking branch 'origin/master' into development 2018-03-15 17:09:56 +00:00
Finn
a1dd14f1d5 Merge pull request #109 from Pear-Trading/Release-v0.10.5
v0.10.5
2018-03-15 16:54:02 +00:00
Finn
8f7af64ba9 Merge pull request #108 from Pear-Trading/finn/translistchange
Revamped transaction view on admin interface
2018-03-15 16:27:17 +00:00
Finn
5958f5edde Merge branch 'finn/translistchange' into finn/recurring 2018-03-15 16:05:44 +00:00
Finn
8f2b8c163b Changelog amended 2018-03-15 16:04:21 +00:00
Finn
3341053ca4 revamped transaction list view 2018-03-15 16:02:17 +00:00
Finn
b13081faa7 made changes to still have status view from delete 2018-03-15 13:38:06 +00:00
Finn
a446e62939 amended user info view to accordion 2018-03-15 13:28:31 +00:00
Finn
9229f6ec92 removed transaction list code 2018-03-15 13:07:29 +00:00
Finn
e75cc907f9 amended transactionlist code 2018-03-15 13:06:50 +00:00
Finn
dfdf4b8104 fixed critical bugs introduced earlier and changed category viewing 2018-03-14 19:38:05 +00:00
Finn
bd36405fa8 amended api for recurring transaction list 2018-03-14 17:55:24 +00:00
Finn
37ffd53054 amended upload to allow for validation changes 2018-03-13 12:55:13 +00:00
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