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 |
|
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 |
|