Commit graph

658 commits

Author SHA1 Message Date
Finn
a3522bd902 Added meta data to transaction list 2019-07-12 20:47:01 +01:00
Finn
17fc5b006b made fixes to imports and supplier list 2019-07-12 20:18:28 +01:00
Finn
682cebef53 Amended supplier list 2019-07-12 20:05:06 +01:00
Finn
85f91f0d4b Added proper supplier table 2019-07-12 18:50:59 +01:00
Finn
8dbdcbb481 Fixed suppliers 2019-07-12 17:45:43 +01:00
Finn
f668f1f7ae Fixed errors when there is no data available 2019-07-12 17:38:19 +01:00
Finn
05506ed1b6 various fixes to dashboard stuff 2019-07-12 17:12:01 +01:00
Finn
c0570cddf8 fixed bugs 2019-07-12 15:49:06 +01:00
Finn
ee10240169 Adding new chart and fixing stuff 2019-07-12 13:40:21 +01:00
Finn
a4268360f7 FIxing a lot of issues and adding org data 2019-07-11 16:12:46 +01:00
Tom Slater
4350a24132 Unfished Graph sections
Part 2
2019-07-11 15:18:33 +01:00
Tom Slater
c13acc6ce3 Unfinished Company Component 2019-07-11 15:17:50 +01:00
Tom Slater
c1e2ce73e7 Merge remote-tracking branch 'origin/felix/newSection-testing' into tom/minorfixes 2019-07-10 14:00:25 +01:00
Felix
4ec29531d5 Real bubble chart works, just need data now! 2019-07-10 13:04:07 +01:00
Felix
38536ab097 Added sample bubble chart 2019-07-10 12:49:36 +01:00
Felix
ccf6adad4b Updating/removing some old files, preparing to add bubble chart 2019-07-10 12:22:26 +01:00
Felix
43a6b5b4cd added a necessary import 2019-07-09 14:24:59 +01:00
Felix
885925ab77 added renaming instructions..? 2019-07-09 14:24:23 +01:00
Felix
a7a150e07c Made a new section as per TomS's request :-) 2019-07-09 14:22:19 +01:00
Felix
0e49e947a1 Corrected grammar lol 2019-07-09 12:59:56 +01:00
Felix
c46891cd32 Merge commit '2998f0b3da1a7189fcd35b5b76bbeb42e7ed41e9' into felix/newSection-testing 2019-07-09 12:50:45 +01:00
Tom Slater
984d1a987a Minor changes for Felix 2019-07-09 12:41:17 +01:00
Felix
4caf605287 required packages updated 2019-07-09 12:22:03 +01:00
Felix
faeac6b360 Changed name of new-section to suppliers 2019-07-04 16:36:06 +01:00
Felix
db5d9495e2 Real table added to new section with sample data, dashboard 'total spend' is still broken - I can't figure out how I broke it in the first place :( 2019-07-04 16:10:50 +01:00
Felix
085667c74a Removed 'stacked-bar' reference from Dashboard, added table to New Section 2019-07-04 15:49:14 +01:00
Felix
e44227f34a package-lock.json and package.json added 2019-07-04 15:37:13 +01:00
Felix
471b56f2a8 New graph types added (not all working unfortunately), new section added for table views and probably a lot of messy code too! 2019-07-04 15:34:42 +01:00
Finn
6376d570af Properly fixed categories showing 2019-07-03 15:11:02 +01:00
Finn
c6fc58ed1f fixed showTotalCategoryList 2019-07-03 15:04:03 +01:00
Finn
c3e260c43e updated modules to work properly locally 2019-07-03 13:46:28 +01:00
Finn
12aae16f53 updated dependencies 2019-07-03 13:04:17 +01:00
Finn
05c209e2c5 Updated versions 2019-07-02 16:46:20 +01:00
Finn
d4b90309dd Merge pull request #84 from Pear-Trading/hotfix-index
Icons and colours properly added for category list
2018-06-18 12:15:38 +01:00
piratefinn
6a82c1fe62 fixed icon colours and icons 2018-06-18 12:08:50 +01:00
piratefinn
07af03cb51 removed production overrides on local 2018-06-18 12:08:12 +01:00
Finn
566eadeb5d Merge pull request #83 from Pear-Trading/master
Master
2018-06-06 14:35:12 +01:00
piratefinn
5eb3bb18fe Merge branch 'hotfix-index' 2018-06-06 14:25:11 +01:00
piratefinn
e57346e6e5 updated changelog 2018-06-06 14:24:47 +01:00
piratefinn
ab043586c9 fixed pasta'd app-root 2018-06-06 14:23:38 +01:00
Finn
2fba977636 Merge pull request #82 from Pear-Trading/v0.1.11
v0.1.11 release
2018-06-06 14:15:53 +01:00
piratefinn
1924a8da95 updated changelog 2018-06-05 14:11:56 +01:00
piratefinn
15a3a3fc7c version bumps and proper naming 2018-06-05 14:08:27 +01:00
Finn
0ce83ed23b Merge pull request #81 from Pear-Trading/finn/angular-6
Move to Angular 6
2018-06-05 13:58:50 +01:00
piratefinn
763ff3c974 removed unused config in ng test and cleaned angular.json 2018-06-05 13:47:02 +01:00
piratefinn
39689ae015 added local and ci configuration to e2e 2018-06-05 12:51:05 +01:00
piratefinn
aa2d2537cc cleaned up code
keep eye on ngx-bootstrap for when it removes rxjs-compat requirement
2018-06-05 12:25:18 +01:00
piratefinn
f997acb2fb package updates 2018-06-04 18:05:59 +01:00
piratefinn
b38b3dc150 Merge remote-tracking branch 'origin/development' into finn/angular-6 2018-06-04 15:50:07 +01:00
Finn
670c9bdd20 Merge pull request #80 from Pear-Trading/finn/dashboard-fixes
Added fixes to dashboard
2018-06-04 15:49:33 +01:00