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 |
|
piratefinn
|
7215a31262
|
Merge branch 'Release-0.1.9'
|
2018-04-17 14:20:46 +01:00 |
|
piratefinn
|
2ac7244605
|
version bumps and changelog
|
2018-04-17 14:20:26 +01:00 |
|
piratefinn
|
77972adcbf
|
Merge branch 'finn/fixes' into development
|
2018-04-17 14:19:07 +01:00 |
|
piratefinn
|
4867a1ecaa
|
made fixes
|
2018-04-17 14:17:57 +01:00 |
|
piratefinn
|
cc08f622af
|
fixed layout on dashboard
|
2018-04-17 12:16:22 +01:00 |
|
piratefinn
|
a4e4158d7f
|
Merge branch 'master' into development
|
2018-04-16 16:46:50 +01:00 |
|
Finn
|
c244eb8735
|
Merge pull request #74 from Pear-Trading/Release-0.07
0.1.8 Release
|
2018-04-16 16:27:44 +01:00 |
|
piratefinn
|
1cb3985778
|
changelog and version bumps
|
2018-04-16 16:06:00 +01:00 |
|
piratefinn
|
48fd3114b2
|
Merge branch 'finn/UIfixes' into development
|
2018-04-16 15:42:02 +01:00 |
|
piratefinn
|
4f3e0aa22d
|
Amended for possible undefined error
|
2018-04-16 15:41:45 +01:00 |
|
Finn
|
735b2de28a
|
Merge pull request #73 from Pear-Trading/finn/UIfixes
Amended close button
|
2018-04-16 15:09:58 +01:00 |
|
piratefinn
|
daff33657f
|
Fixed instruction for close menu button
|
2018-04-16 15:08:23 +01:00 |
|
piratefinn
|
3d5d20e419
|
Added hint for closing menu
|
2018-04-16 14:52:19 +01:00 |
|