Felix
|
2ded74f63c
|
Merge commit '2998f0b3da1a7189fcd35b5b76bbeb42e7ed41e9' into felix/newSection-testing
|
2019-07-09 12:50:45 +01:00 |
|
Tom Slater
|
2998f0b3da
|
Minor changes for Felix
|
2019-07-09 12:41:17 +01:00 |
|
Felix
|
d150441aa1
|
required packages updated
|
2019-07-09 12:22:03 +01:00 |
|
Felix
|
ee636b87fa
|
Changed name of new-section to suppliers
|
2019-07-04 16:36:06 +01:00 |
|
Felix
|
1b56d6e95c
|
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
|
55f3f50576
|
Removed 'stacked-bar' reference from Dashboard, added table to New Section
|
2019-07-04 15:49:14 +01:00 |
|
Felix
|
ec1655a5ca
|
package-lock.json and package.json added
|
2019-07-04 15:37:13 +01:00 |
|
Felix
|
68cf9ee049
|
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
|
6649888876
|
Properly fixed categories showing
|
2019-07-03 15:11:02 +01:00 |
|
Finn
|
bc8f024d41
|
fixed showTotalCategoryList
|
2019-07-03 15:04:03 +01:00 |
|
Finn
|
700287fc32
|
updated modules to work properly locally
|
2019-07-03 13:46:28 +01:00 |
|
Finn
|
5bb0669204
|
updated dependencies
|
2019-07-03 13:04:17 +01:00 |
|
Finn
|
0c43962f47
|
Updated versions
|
2019-07-02 16:46:20 +01:00 |
|
Finn
|
e7d2038041
|
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
|
090b3a65cb
|
fixed icon colours and icons
|
2018-06-18 12:08:50 +01:00 |
|
piratefinn
|
54f2ad832d
|
removed production overrides on local
|
2018-06-18 12:08:12 +01:00 |
|
Finn
|
f018e72e3a
|
Merge pull request #83 from Pear-Trading/master
Master
|
2018-06-06 14:35:12 +01:00 |
|
piratefinn
|
a751cf393e
|
Merge branch 'hotfix-index'
|
2018-06-06 14:25:11 +01:00 |
|
piratefinn
|
63475b45b4
|
updated changelog
|
2018-06-06 14:24:47 +01:00 |
|
piratefinn
|
02be5e78d0
|
fixed pasta'd app-root
|
2018-06-06 14:23:38 +01:00 |
|
Finn
|
8510c539f7
|
Merge pull request #82 from Pear-Trading/v0.1.11
v0.1.11 release
|
2018-06-06 14:15:53 +01:00 |
|
piratefinn
|
18340a61f9
|
updated changelog
|
2018-06-05 14:11:56 +01:00 |
|
piratefinn
|
df30ab88c4
|
version bumps and proper naming
|
2018-06-05 14:08:27 +01:00 |
|
Finn
|
fb606016ee
|
Merge pull request #81 from Pear-Trading/finn/angular-6
Move to Angular 6
|
2018-06-05 13:58:50 +01:00 |
|
piratefinn
|
ee0daa2d57
|
removed unused config in ng test and cleaned angular.json
|
2018-06-05 13:47:02 +01:00 |
|
piratefinn
|
4d34e5c0f2
|
added local and ci configuration to e2e
|
2018-06-05 12:51:05 +01:00 |
|
piratefinn
|
478429b3c9
|
cleaned up code
keep eye on ngx-bootstrap for when it removes rxjs-compat requirement
|
2018-06-05 12:25:18 +01:00 |
|
piratefinn
|
21e163fda2
|
package updates
|
2018-06-04 18:05:59 +01:00 |
|
piratefinn
|
f7d2faea54
|
Merge remote-tracking branch 'origin/development' into finn/angular-6
|
2018-06-04 15:50:07 +01:00 |
|
Finn
|
e7e3f90739
|
Merge pull request #80 from Pear-Trading/finn/dashboard-fixes
Added fixes to dashboard
|
2018-06-04 15:49:33 +01:00 |
|
piratefinn
|
10622204b7
|
fixed icon errors
|
2018-06-04 15:26:46 +01:00 |
|
piratefinn
|
c9f786eaee
|
removed icon list for sectors
|
2018-06-04 15:26:41 +01:00 |
|
piratefinn
|
e9b659a4bb
|
Removed sector stuff on dashboard
To be moved to organisation dashboard at later time
|
2018-06-04 15:26:36 +01:00 |
|
piratefinn
|
adc0a1a7db
|
Added category all time purchase list
|
2018-06-04 15:26:31 +01:00 |
|
piratefinn
|
ca95f8d10d
|
layout fixes
|
2018-06-04 15:26:10 +01:00 |
|
piratefinn
|
fa2180f603
|
made submit message on add more logical
|
2018-06-04 15:25:54 +01:00 |
|
piratefinn
|
a388e2629d
|
extraneous console logs removed
|
2018-06-04 15:25:24 +01:00 |
|
piratefinn
|
32b6dc810f
|
extraneous login console logs removed
|
2018-06-04 15:24:59 +01:00 |
|
piratefinn
|
6abe0ec6f6
|
moved to angular 6
|
2018-06-04 15:23:16 +01:00 |
|
Tom Bloor
|
ebdd0354f5
|
Merge pull request #79 from Pear-Trading/master
Master
|
2018-05-24 13:31:52 +01:00 |
|
Tom Bloor
|
e19102a457
|
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
|
e6658aeccb
|
Updated Changelog
|
2018-05-24 12:39:10 +01:00 |
|
Tom Bloor
|
334ed6b411
|
Merge pull request #76 from Pear-Trading/THelsby/Analytics
Analytics
|
2018-05-24 12:35:36 +01:00 |
|
Thomas Bloor
|
a6e5412e40
|
Fix missing commas in environments files
|
2018-05-24 12:27:06 +01:00 |
|
Thomas Bloor
|
f05a5816e4
|
Update environment files
|
2018-05-24 12:15:39 +01:00 |
|
Thomas Bloor
|
5ef8f9471c
|
Fix http -> https error
|
2018-05-24 12:14:26 +01:00 |
|
Unknown
|
6bf111a3be
|
Analytics
|
2018-05-24 12:08:27 +01:00 |
|
Finn
|
7811806903
|
Merge pull request #75 from Pear-Trading/finn/yearlysubmit
added yearly submit
|
2018-05-15 17:04:28 +01:00 |
|
piratefinn
|
b373d4e63f
|
added yearly submit
|
2018-05-15 16:48:51 +01:00 |
|
piratefinn
|
233c523353
|
Merge branch 'master' into development
|
2018-04-17 14:22:03 +01:00 |
|