Unknown
|
f96dd0bfe2
|
WIP
|
2018-05-14 16:52:33 +01:00 |
|
Unknown
|
5fb33cffbf
|
amended package lock json
|
2018-03-13 16:37:57 +00:00 |
|
Unknown
|
dc1e740889
|
Merge remote-tracking branch 'origin/theslby/pushapi' into theslby/pushapi
|
2018-03-13 16:37:03 +00:00 |
|
Unknown
|
9997cf7ee5
|
Merge remote-tracking branch 'origin/development' into theslby/pushapi
|
2018-03-13 16:33:59 +00:00 |
|
piratefinn
|
0b27aa43e4
|
Merge branch 'master' into development
|
2018-03-12 17:36:27 +00:00 |
|
piratefinn
|
c8c52d33c4
|
emergency fix for category viewing on purchase
|
2018-03-12 17:35:18 +00:00 |
|
Finn
|
c62e74e07a
|
Merge pull request #69 from Pear-Trading/master
merge to dev
|
2018-03-09 17:28:53 +00:00 |
|
Finn
|
675f319993
|
Merge pull request #68 from Pear-Trading/Release-v0.1.4
0.1.4 Release
|
2018-03-09 17:11:47 +00:00 |
|
piratefinn
|
eee50b9073
|
version bumps
|
2018-03-09 16:51:58 +00:00 |
|
piratefinn
|
c37b30bea5
|
Updated angular CLI to solve security dependency issue
|
2018-03-09 15:48:04 +00:00 |
|
piratefinn
|
db8d27a888
|
Merge branch 'finn/changelog' into development
|
2018-03-09 14:29:05 +00:00 |
|
piratefinn
|
247e38e680
|
updated changelog
|
2018-03-09 14:28:55 +00:00 |
|
piratefinn
|
f7697178fd
|
emergency fix to upload for category
|
2018-03-08 15:09:35 +00:00 |
|
piratefinn
|
aa8763d5a6
|
Merge branch 'development' into theslby/pushapi
|
2018-03-07 13:09:14 +00:00 |
|
Finn
|
b4f3f754c2
|
Merge pull request #67 from Pear-Trading/finn/recurring
fixed views and added recurring purchase input
|
2018-03-07 13:06:07 +00:00 |
|
piratefinn
|
d97c21caf8
|
updated moment to fix known vulnerability
|
2018-03-07 13:02:42 +00:00 |
|
piratefinn
|
f6ef50f686
|
added fixes to category viewing
|
2018-03-07 12:58:01 +00:00 |
|
piratefinn
|
700ee3c155
|
fixes
|
2018-03-07 12:27:16 +00:00 |
|
Unknown
|
ff0fe0202f
|
/pushapi: Auto stash before merge of "theslby/pushapi" and "development"
Push Frontend
|
2018-03-06 15:41:13 +00:00 |
|
piratefinn
|
450b63620f
|
added fixes for input
|
2018-03-06 15:19:35 +00:00 |
|
Unknown
|
59cbc920c2
|
Merge branch 'development' into theslby/pushapi
|
2018-03-06 12:25:58 +00:00 |
|
piratefinn
|
6e9f4133d2
|
amended upload for recurring
|
2018-03-05 15:35:26 +00:00 |
|
piratefinn
|
f5c0a76032
|
amended if code and validation
|
2018-03-05 13:42:28 +00:00 |
|
piratefinn
|
45d016c897
|
added recurring purchase inputs
|
2018-03-05 13:33:26 +00:00 |
|
Finn
|
db5a712a5d
|
Merge pull request #66 from Pear-Trading/finn/essentialpurchase
added essential purchase
|
2018-03-02 17:00:17 +00:00 |
|
piratefinn
|
8b7b5e50be
|
fixed display with essential and categories
|
2018-03-02 16:31:14 +00:00 |
|
piratefinn
|
5762b35fbe
|
removed unnecessary console logs and cleaned essential input
|
2018-03-01 17:07:25 +00:00 |
|
piratefinn
|
f6dd18bfc8
|
added initial essential branch checkbox
|
2018-02-28 12:02:01 +00:00 |
|
Finn
|
46e2efeaba
|
Merge pull request #65 from Pear-Trading/finn/categories
Budget view amended
|
2018-01-25 16:25:19 +00:00 |
|
piratefinn
|
9bbf7a5c2e
|
updated changelog
|
2018-01-25 16:21:52 +00:00 |
|
piratefinn
|
bf965448c5
|
made input two columns if wide enough
|
2018-01-25 16:19:02 +00:00 |
|
piratefinn
|
d11fbcb4e6
|
removed unnecessary console logging
|
2018-01-25 15:56:23 +00:00 |
|
piratefinn
|
5d112ff4a6
|
Changed percentages on budget view screen
|
2018-01-25 11:18:31 +00:00 |
|
piratefinn
|
ec1aef6627
|
Changed to radio buttons on transaction category input
|
2018-01-25 11:18:13 +00:00 |
|
Finn
|
6c16b7aee0
|
Merge pull request #64 from Pear-Trading/finn/categories
Categorised purchase list fully added
|
2018-01-24 16:09:55 +00:00 |
|
piratefinn
|
d674c5b59b
|
list fully finished
|
2018-01-24 13:18:51 +00:00 |
|
piratefinn
|
ca2cf0fdab
|
No longer throwing errors and proper limit & slice
|
2018-01-24 12:51:03 +00:00 |
|
piratefinn
|
9446ef11d4
|
properly viewing category list
|
2018-01-24 12:38:58 +00:00 |
|
piratefinn
|
5f2eee81ba
|
Placeholder and date math
|
2018-01-22 17:23:56 +00:00 |
|
Unknown
|
175c2decdd
|
Merge remote-tracking branch 'origin/master' into theslby/pushapi
|
2018-01-19 13:40:17 +00:00 |
|
Unknown
|
6e0b059241
|
push stuff
|
2018-01-19 13:39:54 +00:00 |
|
piratefinn
|
6cca97cc68
|
changed category list size
|
2018-01-19 13:22:18 +00:00 |
|
piratefinn
|
fae6b7ce31
|
Merge branch 'master' into finn/categories
|
2018-01-19 13:22:00 +00:00 |
|
Finn
|
2cc087a295
|
Merge pull request #63 from Pear-Trading/Release-v0.1.3
Release of v0.1.3
|
2018-01-18 13:08:01 +00:00 |
|
piratefinn
|
43144da9fc
|
updated changelog
|
2018-01-18 13:04:32 +00:00 |
|
Tom Bloor
|
d27d18e729
|
Merge pull request #62 from Pear-Trading/TBSliver/Travis-Temp-Fix
Update .travis.yml
|
2018-01-18 13:00:26 +00:00 |
|
Tom Bloor
|
40973b87ff
|
Update .travis.yml
Setting sudo mode for the travis builds
|
2018-01-18 12:57:38 +00:00 |
|
Finn
|
9e122bf4bc
|
Merge pull request #61 from Pear-Trading/development
Release of categories
|
2018-01-18 12:41:34 +00:00 |
|
Finn
|
4a388a4c3e
|
Merge pull request #60 from Pear-Trading/finn/categoryrelease
Amended category change for release
|
2018-01-18 12:23:20 +00:00 |
|
piratefinn
|
22b3e00eaa
|
updated changelog
|
2018-01-18 12:20:26 +00:00 |
|