Commit graph

617 commits

Author SHA1 Message Date
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
piratefinn
838c1a1821 fixed icon errors 2018-06-04 15:26:46 +01:00
piratefinn
fa7108bcdf removed icon list for sectors 2018-06-04 15:26:41 +01:00
piratefinn
9b56cf77f9 Removed sector stuff on dashboard
To be moved to organisation dashboard at later time
2018-06-04 15:26:36 +01:00
piratefinn
4d56dcb233 Added category all time purchase list 2018-06-04 15:26:31 +01:00
piratefinn
543bd120fd layout fixes 2018-06-04 15:26:10 +01:00
piratefinn
05c4d2284e made submit message on add more logical 2018-06-04 15:25:54 +01:00
piratefinn
718b5bc8b0 extraneous console logs removed 2018-06-04 15:25:24 +01:00
piratefinn
47524ef91f extraneous login console logs removed 2018-06-04 15:24:59 +01:00
piratefinn
d0625eb557 moved to angular 6 2018-06-04 15:23:16 +01:00
Tom Bloor
0c2e9762dc Merge pull request #79 from Pear-Trading/master
Master
2018-05-24 13:31:52 +01:00
Tom Bloor
f6b5f4273d Merge pull request #78 from Pear-Trading/Release-v0.1.10
Release v0.1.10
2018-05-24 13:02:43 +01:00
Thomas Bloor
a81437b0c6 Updated Changelog 2018-05-24 12:39:10 +01:00
Tom Bloor
543520c5f5 Merge pull request #76 from Pear-Trading/THelsby/Analytics
Analytics
2018-05-24 12:35:36 +01:00
Thomas Bloor
dd01de142c Fix missing commas in environments files 2018-05-24 12:27:06 +01:00
Thomas Bloor
304647daac Update environment files 2018-05-24 12:15:39 +01:00
Thomas Bloor
f2d767d29d Fix http -> https error 2018-05-24 12:14:26 +01:00
Unknown
5bf608585e Analytics 2018-05-24 12:08:27 +01:00
Finn
c69fcb1bc1 Merge pull request #75 from Pear-Trading/finn/yearlysubmit
added yearly submit
2018-05-15 17:04:28 +01:00
piratefinn
cad75f122a added yearly submit 2018-05-15 16:48:51 +01:00
piratefinn
673d481cac Merge branch 'master' into development 2018-04-17 14:22:03 +01:00
piratefinn
bcfd6b0a54 Merge branch 'Release-0.1.9' 2018-04-17 14:20:46 +01:00
piratefinn
2297cc4221 version bumps and changelog 2018-04-17 14:20:26 +01:00
piratefinn
d07faaf8ca Merge branch 'finn/fixes' into development 2018-04-17 14:19:07 +01:00
piratefinn
2ee930f69f made fixes 2018-04-17 14:17:57 +01:00
piratefinn
4f1bd1c495 fixed layout on dashboard 2018-04-17 12:16:22 +01:00
piratefinn
0d3dc85195 Merge branch 'master' into development 2018-04-16 16:46:50 +01:00
Finn
0e8a74d4f5 Merge pull request #74 from Pear-Trading/Release-0.07
0.1.8 Release
2018-04-16 16:27:44 +01:00
piratefinn
f2aeb00cf9 changelog and version bumps 2018-04-16 16:06:00 +01:00
piratefinn
3463a323c9 Merge branch 'finn/UIfixes' into development 2018-04-16 15:42:02 +01:00
piratefinn
ff9079e331 Amended for possible undefined error 2018-04-16 15:41:45 +01:00
Finn
bf5bfd66fe Merge pull request #73 from Pear-Trading/finn/UIfixes
Amended close button
2018-04-16 15:09:58 +01:00
piratefinn
2ca7fd458a Fixed instruction for close menu button 2018-04-16 15:08:23 +01:00
piratefinn
5f49a738b1 Added hint for closing menu 2018-04-16 14:52:19 +01:00
Finn
6df87adb7b Merge pull request #72 from Pear-Trading/finn/graphs
Adding new graph views and fixes
2018-04-13 18:19:12 +01:00
piratefinn
80fc9f330f various fixes 2018-04-13 16:37:26 +01:00
piratefinn
66ed89ffc5 transferred stuff from pie panel to dashboard 2018-04-13 16:07:26 +01:00
piratefinn
a50cb1bac0 fixed view of charts to show currency where relevant 2018-04-12 14:12:34 +01:00
piratefinn
823a1d398f fixed bar chart 2018-04-11 19:19:34 +01:00
piratefinn
96b4e0f382 weekly view fixed, broken category bar chart
Chart needs fixing and currencies should pipe to show currency
2018-04-11 19:10:03 +01:00
piratefinn
80daa2d771 working essential bar chart 2018-04-09 19:19:06 +01:00
piratefinn
d485001fb3 added preliminary pie dashboard 2018-03-26 15:47:21 +01:00