Finn
|
cc6ea41ce5
|
Merge remote-tracking branch 'origin/master' into development
|
2018-03-15 17:09:56 +00:00 |
|
|
Finn
|
58ae5b5250
|
Merge pull request #109 from Pear-Trading/Release-v0.10.5
v0.10.5
|
2018-03-15 16:54:02 +00:00 |
|
|
Finn
|
44f2a321b2
|
Merge pull request #108 from Pear-Trading/finn/translistchange
Revamped transaction view on admin interface
|
2018-03-15 16:27:17 +00:00 |
|
|
Finn
|
4fb85b9094
|
Changelog amended
|
2018-03-15 16:04:21 +00:00 |
|
|
Finn
|
b157ba0843
|
revamped transaction list view
|
2018-03-15 16:02:17 +00:00 |
|
|
Finn
|
b233acfd64
|
made changes to still have status view from delete
|
2018-03-15 13:38:06 +00:00 |
|
|
Finn
|
cea9e62073
|
amended user info view to accordion
|
2018-03-15 13:28:31 +00:00 |
|
|
Finn
|
3ceb926cd4
|
removed transaction list code
|
2018-03-15 13:07:29 +00:00 |
|
|
Finn
|
29eaa291c5
|
Merge branch 'master' into development
|
2018-03-09 17:45:19 +00:00 |
|
|
Finn
|
fdea4be36f
|
fix DDL
|
2018-03-09 17:44:47 +00:00 |
|
|
Finn
|
ca389a1788
|
Merge branch 'master' into development
|
2018-03-09 17:39:26 +00:00 |
|
|
Finn
|
371cf1ea42
|
Merge branch 'finn/medalhotfix'
|
2018-03-09 17:39:11 +00:00 |
|
|
Finn
|
af43a3ce9f
|
hotfix to medal schema data types
|
2018-03-09 17:38:12 +00:00 |
|
|
Finn
|
2edc45a22e
|
Merge pull request #107 from Pear-Trading/master
merge to dev
|
2018-03-09 17:28:41 +00:00 |
|
|
Finn
|
241fe26f26
|
Merge pull request #106 from Pear-Trading/Release-v0.10.4
Release 0.10.4
|
2018-03-09 17:11:35 +00:00 |
|
|
Finn
|
0441128023
|
Version bump
|
2018-03-09 16:54:03 +00:00 |
|
|
Finn
|
12bde771b2
|
Merge branch 'finn/changelog' into development
|
2018-03-09 13:53:08 +00:00 |
|
|
Finn
|
ea18e467f4
|
changelog amended
|
2018-03-09 13:52:46 +00:00 |
|
|
Finn
|
a3dcd57fea
|
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
|
d4d1b841d7
|
changed logic of start time for transaction and submitted time
|
2018-03-08 16:41:45 +00:00 |
|
|
Finn
|
bdf23b2f3d
|
fully operational and functioning recurring script + changes to schema
|
2018-03-08 15:31:44 +00:00 |
|
|
Finn
|
813cbb82a5
|
whitespace fix and created initial recurring transaction script
|
2018-03-07 18:08:11 +00:00 |
|
|
Finn
|
98cd134d84
|
Changed logic of storing recurring transactions
|
2018-03-07 15:34:41 +00:00 |
|
|
Finn
|
3cf73aca37
|
Merge pull request #104 from Pear-Trading/finn/recurring
added uploading and viewing recurring purchases
|
2018-03-07 13:05:46 +00:00 |
|
|
Finn
|
38dc29f4a1
|
amended test to include a recurring period
|
2018-03-07 12:50:36 +00:00 |
|
|
Finn
|
d937e64663
|
Fixed recurring purchase entry
|
2018-03-07 12:46:50 +00:00 |
|
|
Finn
|
79324ff5f7
|
Upgraded schema and made fixes
|
2018-03-05 16:18:17 +00:00 |
|
|
Finn
|
786cd1618a
|
added initial possible schema and ability to submit on transaction
|
2018-03-05 15:49:30 +00:00 |
|
|
Finn
|
7aa93bf380
|
Added initial for upload to accept recurring type
|
2018-03-05 15:37:01 +00:00 |
|
|
Finn
|
ab88755b00
|
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
|
712959c37e
|
Fixed code to ensure tests passed
|
2018-03-02 17:33:57 +00:00 |
|
|
Finn
|
23185985b8
|
category test fixed
|
2018-03-02 17:00:01 +00:00 |
|
|
Finn
|
1377742acd
|
removed debug line and unneeded code
|
2018-03-02 16:42:30 +00:00 |
|
|
Finn
|
ebcc79fd36
|
added fixes for budget view and working essential
|
2018-03-02 16:32:28 +00:00 |
|
|
Finn
|
af6d198c8f
|
added viewing of purchase being essential in transaction read
|
2018-03-01 17:20:50 +00:00 |
|
|
Finn
|
396cb3c8f6
|
amended upload code to allow for essential purchases
|
2018-03-01 17:08:44 +00:00 |
|
|
Finn
|
28a33cf27f
|
added essential flag to transactions in schema
|
2018-03-01 17:08:30 +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 |
|