Commit graph

661 commits

Author SHA1 Message Date
piratefinn
df9ea2436c working graph widgets and local doughnut chart 2017-12-14 16:44:23 +00:00
piratefinn
846c21f967 Added working snippets and placeholder pie chart 2017-12-13 12:37:11 +00:00
piratefinn
a2ad5dc1a0 More placeholder code for customer dashboard 2017-12-12 15:10:44 +00:00
Finn
c0e25c7467 Merge pull request #47 from Pear-Trading/finn/trailchoicechange
Changed from dropdown to modal
2017-12-08 20:39:33 +00:00
piratefinn
d617e6464a changelog updated 2017-12-08 20:35:50 +00:00
piratefinn
155a32a9ad Changed from dropdown to modal 2017-12-08 20:34:58 +00:00
Tom Bloor
d3b8cc8b97 Merge pull request #46 from Pear-Trading/master
Master merge for v0.0.7
2017-12-08 16:30:23 +00:00
Tom Bloor
81f934a441 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
8bbfb1374a Update Changelog and bump version numbers 2017-12-08 16:13:50 +00:00
Finn
503f3aef8d 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
82761bbc27 changelog, esta pin and naming updated 2017-12-08 15:30:16 +00:00
Finn
c53d1e969d Merge pull request #43 from Pear-Trading/finn/trailchange
Added Esta
2017-12-08 14:20:08 +00:00
piratefinn
9e77bd072a image url naming sanitised 2017-12-08 14:13:47 +00:00
piratefinn
88d4c52915 renamed LIS to trail and added esta logo 2017-12-08 14:01:46 +00:00
piratefinn
e3db378396 changed code for trail map 2017-12-08 13:26:18 +00:00
Finn
9be8326d42 Merge pull request #42 from Pear-Trading/finn/alignmentfix
fixed navbar alignment
2017-11-29 18:12:49 +00:00
piratefinn
da39e228da Merge branch 'development' into finn/alignmentfix 2017-11-29 18:10:39 +00:00
Tom Bloor
ec1c6d358e Merge pull request #41 from Pear-Trading/master
Master merge for v0.0.6
2017-11-29 18:07:38 +00:00
piratefinn
abc72ec950 fixed navbar alignment 2017-11-29 18:07:37 +00:00
Tom Bloor
f90d2fdcde 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
beebc1399d Travis can only manage one file for decryption it seems 2017-11-29 17:24:16 +00:00
Thomas Bloor
08503f15d7 Setup Travis to auto build releases when a tag is created 2017-11-29 17:12:18 +00:00
Thomas Bloor
53fc51b255 Updated changelog and bumped version number in all packages 2017-11-29 16:52:31 +00:00
Finn
9324bbfea3 Merge pull request #39 from Pear-Trading/finn/typocorrection
fixed typo
2017-11-29 16:24:53 +00:00
Finn
3f3b248760 Merge pull request #38 from Pear-Trading/master
Master merge for v0.0.5
2017-11-29 16:24:42 +00:00
piratefinn
aef35b24b4 fixed typo 2017-11-29 16:19:38 +00:00
Tom Bloor
dc21fedee7 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
a87ddca785 Updated Changelog and bumped version number in package files 2017-11-29 15:40:00 +00:00
Tom Bloor
c150e36a74 Merge pull request #35 from Pear-Trading/master
Master merge for v0.0.4
2017-11-29 15:32:14 +00:00
Finn
11b25c063a 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
6bdd880156 Renamed some text for Lancaster Independent Story 2017-11-29 15:23:03 +00:00
Thomas Bloor
281404b946 Fixed error on building 2017-11-28 18:14:15 +00:00
Tom Bloor
def79a7148 Merge pull request #34 from Pear-Trading/Release-v0.0.4
v0.0.4
2017-11-28 18:03:07 +00:00
Thomas Bloor
50e76cf0ef Bumped version number in package.json and CHANGELOG 2017-11-28 17:59:06 +00:00
Finn
18dc4b0647 Merge pull request #33 from Pear-Trading/finn/logocorrection
fixed logo on main map
2017-11-28 12:51:44 +00:00
piratefinn
f9f6f52405 fixed logo on main map 2017-11-28 12:44:53 +00:00
Finn
52551e3f6e Merge pull request #32 from Pear-Trading/finn/storytrail
story markers and package updates
2017-11-27 17:30:42 +00:00
piratefinn
84b128c7ed fix made to modaldirective import 2017-11-27 17:20:22 +00:00
piratefinn
58d1b394ed changelog updated 2017-11-27 16:56:58 +00:00
piratefinn
7b897640b5 Fixes made and info window usage revamped with modals 2017-11-27 16:56:09 +00:00
piratefinn
129f953389 changelog updated 2017-11-23 17:21:52 +00:00
piratefinn
051c0b3340 changelog updated and redundant dependency removed 2017-11-23 17:21:00 +00:00
piratefinn
fdd14c2fae fixed modals to use new endpoint and scrapped old pages 2017-11-23 17:16:46 +00:00
piratefinn
f261fce7f5 working modals added 2017-11-15 15:36:45 +00:00
piratefinn
98d683612c fixed HTTP posts 2017-11-15 14:46:04 +00:00
piratefinn
5be33896b2 fixed packaging and rewrote http 2017-11-15 14:16:05 +00:00
piratefinn
738b77ff1a removed unused imports and packages 2017-11-15 14:12:28 +00:00
piratefinn
65f149c0f8 currencyPipe fixed 2017-11-15 13:46:34 +00:00
piratefinn
3a0cf4c8dc updated packages 2017-11-15 13:40:57 +00:00
piratefinn
249ed6b413 locked all of package.json 2017-11-15 13:26:35 +00:00