Commit graph

296 commits

Author SHA1 Message Date
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
piratefinn
d6ac4905c6 packages updated 2017-11-15 13:20:35 +00:00
piratefinn
00af9b5e0e ngx-bootstrap upgraded 2017-11-15 13:05:35 +00:00
piratefinn
5d48bd1539 got clicks logging 2017-11-14 18:31:05 +00:00
piratefinn
bad44f7d06 map page html layout fix 2017-11-14 17:13:34 +00:00
piratefinn
70ec99690f test page added 2017-11-14 17:12:19 +00:00
piratefinn
8ede382799 snazzy info added, logo added 2017-11-14 17:12:07 +00:00
piratefinn
f6a6e4c964 Initial commit with modules and routing 2017-11-14 12:47:28 +00:00
Tom Bloor
25e7e74309 Merge pull request #31 from Pear-Trading/master
Master merge for v0.0.3
2017-11-14 11:33:29 +00:00
Tom Bloor
c41351cfd5 Merge pull request #30 from Pear-Trading/Release-v0.0.3
Release v0.0.3
2017-11-14 11:25:12 +00:00
Tom Bloor
86bb0ca830 Bump package version number 2017-11-14 11:18:34 +00:00
Tom Bloor
6689f2a767 Bump version number in Changelog 2017-11-14 11:13:25 +00:00
Tom Bloor
28ef88cd3d Fix build-release script to put stuff in a folder 2017-11-14 11:12:29 +00:00
Finn
46d5eef360 Merge pull request #29 from Pear-Trading/finn/moremaps
Added zoom level to map
2017-11-14 11:11:01 +00:00
piratefinn
d587ddd339 Changelog updated 2017-11-14 11:08:17 +00:00
piratefinn
7a73cb3e3e Fixed and working zoom level change 2017-11-14 11:03:19 +00:00