Commit graph

509 commits

Author SHA1 Message Date
piratefinn
6eb6425fb8 More placeholder code for customer dashboard 2017-12-12 15:10:44 +00:00
Finn
7e69c111e7
Merge pull request #47 from Pear-Trading/finn/trailchoicechange
Changed from dropdown to modal
2017-12-08 20:39:33 +00:00
piratefinn
ef84c7fa68 changelog updated 2017-12-08 20:35:50 +00:00
piratefinn
44740d5dd4 Changed from dropdown to modal 2017-12-08 20:34:58 +00:00
Tom Bloor
d469bc2c7d
Merge pull request #46 from Pear-Trading/master
Master merge for v0.0.7
2017-12-08 16:30:23 +00:00
Tom Bloor
2092716b95
Merge pull request #45 from Pear-Trading/Release-v0.0.7
Release v0.0.7
2017-12-08 16:17:54 +00:00
Thomas Bloor
dd891486ae
Update Changelog and bump version numbers 2017-12-08 16:13:50 +00:00
Finn
aa7d17522e
Merge pull request #44 from Pear-Trading/finn/trailchange
Changes made to ESTA and trail map
2017-12-08 15:38:11 +00:00
piratefinn
e104b2c4d2 changelog, esta pin and naming updated 2017-12-08 15:30:16 +00:00
Finn
0829f8d71b
Merge pull request #43 from Pear-Trading/finn/trailchange
Added Esta
2017-12-08 14:20:08 +00:00
piratefinn
644c097f0b image url naming sanitised 2017-12-08 14:13:47 +00:00
piratefinn
100a3c71a8 renamed LIS to trail and added esta logo 2017-12-08 14:01:46 +00:00
piratefinn
0cc3a473cf changed code for trail map 2017-12-08 13:26:18 +00:00
Finn
4428cd6fcd
Merge pull request #42 from Pear-Trading/finn/alignmentfix
fixed navbar alignment
2017-11-29 18:12:49 +00:00
piratefinn
03ec811c6c Merge branch 'development' into finn/alignmentfix 2017-11-29 18:10:39 +00:00
Tom Bloor
a44975b879
Merge pull request #41 from Pear-Trading/master
Master merge for v0.0.6
2017-11-29 18:07:38 +00:00
piratefinn
830b4b3c4f fixed navbar alignment 2017-11-29 18:07:37 +00:00
Tom Bloor
f39c192a2b
Merge pull request #40 from Pear-Trading/Release-v0.0.6
Release v0.0.6
2017-11-29 17:30:07 +00:00
Thomas Bloor
d9b8ebfc50
Travis can only manage one file for decryption it seems 2017-11-29 17:24:16 +00:00
Thomas Bloor
0ce452233d
Setup Travis to auto build releases when a tag is created 2017-11-29 17:12:18 +00:00
Thomas Bloor
f5ee21d067
Updated changelog and bumped version number in all packages 2017-11-29 16:52:31 +00:00
Finn
53fb48e819
Merge pull request #39 from Pear-Trading/finn/typocorrection
fixed typo
2017-11-29 16:24:53 +00:00
Finn
614b353686
Merge pull request #38 from Pear-Trading/master
Master merge for v0.0.5
2017-11-29 16:24:42 +00:00
piratefinn
16ef46972e fixed typo 2017-11-29 16:19:38 +00:00
Tom Bloor
cc04b9eb11
Merge pull request #37 from Pear-Trading/Release-v0.0.5
Release v0.0.5
2017-11-29 16:01:21 +00:00
Thomas Bloor
dd63a4ee4a
Updated Changelog and bumped version number in package files 2017-11-29 15:40:00 +00:00
Tom Bloor
bf191a7c06
Merge pull request #35 from Pear-Trading/master
Master merge for v0.0.4
2017-11-29 15:32:14 +00:00
Finn
ae2fc74d2e
Merge pull request #36 from Pear-Trading/finn/liscorrection
Renamed some text for Lancaster Independent Story
2017-11-29 15:28:20 +00:00
piratefinn
2af4cd8adf Renamed some text for Lancaster Independent Story 2017-11-29 15:23:03 +00:00
Thomas Bloor
7968493fe3 Fixed error on building 2017-11-28 18:14:15 +00:00
Tom Bloor
f13546a6fe
Merge pull request #34 from Pear-Trading/Release-v0.0.4
v0.0.4
2017-11-28 18:03:07 +00:00
Thomas Bloor
007ddd294a Bumped version number in package.json and CHANGELOG 2017-11-28 17:59:06 +00:00
Finn
2b92d02346
Merge pull request #33 from Pear-Trading/finn/logocorrection
fixed logo on main map
2017-11-28 12:51:44 +00:00
piratefinn
4670e10c2f fixed logo on main map 2017-11-28 12:44:53 +00:00
Finn
c2ee94f82a
Merge pull request #32 from Pear-Trading/finn/storytrail
story markers and package updates
2017-11-27 17:30:42 +00:00
piratefinn
961d8eafe3 fix made to modaldirective import 2017-11-27 17:20:22 +00:00
piratefinn
0af35cd787 changelog updated 2017-11-27 16:56:58 +00:00
piratefinn
0fb3f51748 Fixes made and info window usage revamped with modals 2017-11-27 16:56:09 +00:00
piratefinn
5ca44cedf3 changelog updated 2017-11-23 17:21:52 +00:00
piratefinn
b7cbbcc23a changelog updated and redundant dependency removed 2017-11-23 17:21:00 +00:00
piratefinn
4a331a3475 fixed modals to use new endpoint and scrapped old pages 2017-11-23 17:16:46 +00:00
piratefinn
7843a87fd6 working modals added 2017-11-15 15:36:45 +00:00
piratefinn
5ed6bfe7f3 fixed HTTP posts 2017-11-15 14:46:04 +00:00
piratefinn
b8775e2e45 fixed packaging and rewrote http 2017-11-15 14:16:05 +00:00
piratefinn
d34fdb58ca removed unused imports and packages 2017-11-15 14:12:28 +00:00
piratefinn
840d0aabb1 currencyPipe fixed 2017-11-15 13:46:34 +00:00
piratefinn
3bde7aed3f updated packages 2017-11-15 13:40:57 +00:00
piratefinn
b46ab1d8a2 locked all of package.json 2017-11-15 13:26:35 +00:00
piratefinn
9fa0c16250 packages updated 2017-11-15 13:20:35 +00:00
piratefinn
694a65f0ee ngx-bootstrap upgraded 2017-11-15 13:05:35 +00:00