Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
371 commits
Select commit Hold shift + click to select a range
92d9ad9
Merge pull request #425 from TerriaJS/mobx-ui-variables
soyarsauce Mar 2, 2020
f82a3ae
Remove yarn.lock
soyarsauce Mar 2, 2020
af8ad20
Update node version
soyarsauce Mar 2, 2020
c88119b
Add lockfile reasoning
soyarsauce Mar 2, 2020
f9ff090
Fix adr0001 title
soyarsauce Mar 2, 2020
f3cc5e9
Update decision
soyarsauce Mar 5, 2020
96d4ead
Force npm instead of yarn
soyarsauce Mar 5, 2020
00cf31f
Revert "Remove yarn.lock"
soyarsauce Mar 5, 2020
3054732
Merge branch 'mobx-node-version' into mobx-remove-yarnlock
soyarsauce Mar 5, 2020
c7328ff
Update decision notes
soyarsauce Mar 5, 2020
547ed1f
Merge pull request #426 from TerriaJS/mobx-remove-yarnlock
soyarsauce Mar 5, 2020
c7b206c
Bump versions, update analytics
soyarsauce Mar 31, 2020
53d6a59
Update button layout
soyarsauce Apr 2, 2020
893d9ff
Merge pull request #436 from TerriaJS/mobx-button-layout
soyarsauce Apr 2, 2020
27816fb
Merge remote-tracking branch 'origin/mobx' into mobx-update-manifest
soyarsauce Apr 6, 2020
4d99df6
Fix changelog merge
soyarsauce Apr 6, 2020
f431d41
Merge pull request #420 from TerriaJS/mobx-update-manifest
rowanwins Apr 6, 2020
630c9e9
Merge branch 'mobx' into mobx-analytics
tephenavies Apr 7, 2020
160b2bc
Merge pull request #435 from TerriaJS/mobx-analytics
tephenavies Apr 7, 2020
097ad1a
Merge pull request #387 from TerriaJS/mobx-time-series-catalog
tephenavies Apr 15, 2020
c28dc07
Bump tjs mobx version to 27
soyarsauce May 4, 2020
8221170
Merge pull request #443 from TerriaJS/mobx-bump-tjs
rowanwins May 4, 2020
402cb63
Bump tjs mobx version to 28
soyarsauce May 5, 2020
10f8644
Merge pull request #444 from TerriaJS/mobx-bump-tjs28
soyarsauce May 5, 2020
e4f21bd
Add help content to config.json
reginapramesti May 11, 2020
e189929
Merge pull request #445 from TerriaJS/help-content-configurable
soyarsauce May 11, 2020
d69cba9
Add translation override mechanism in TerriaMap
soyarsauce May 11, 2020
22ff0e7
Update changelog
soyarsauce May 11, 2020
efddd96
Merge pull request #446 from TerriaJS/mobx-translations
soyarsauce May 11, 2020
06bcb50
Bump terriajs mobx dep
soyarsauce May 12, 2020
c7aad23
Add option to enable welcome message
reginapramesti May 13, 2020
81b4693
Merge pull request #448 from TerriaJS/config-welcome-msg
soyarsauce May 13, 2020
b908be8
Update npm lockfile
soyarsauce May 13, 2020
299dc4b
Merge pull request #449 from TerriaJS/mobx-fix-lock
soyarsauce May 13, 2020
dd5e596
Settings for disclaimer
reginapramesti May 13, 2020
4c555be
Make it as close to original as possible
reginapramesti May 13, 2020
0a62334
Rename default confirm button to OK
reginapramesti May 13, 2020
3ea089d
Add comma to resolve error
reginapramesti May 13, 2020
634f017
Merge pull request #451 from TerriaJS/mobx-fix-bad-merge
reginapramesti May 13, 2020
d2d45ed
Leave globalDisclaimer commented
soyarsauce May 13, 2020
c9b2db8
Update changelog
soyarsauce May 13, 2020
d65a840
Merge pull request #450 from TerriaJS/config-disclaimer
soyarsauce May 13, 2020
82e8a60
Add measure tool & inappguides config doc
soyarsauce May 19, 2020
cf0cce8
Merge pull request #453 from TerriaJS/mobx-measure-tool
reginapramesti May 20, 2020
c377b5a
Make sure husky is hoisted so that prettier runs in terriajs
tephenavies May 27, 2020
149e83e
Disable sourcemaps for "resolve-url-loader" in SASS loading
tephenavies Jun 12, 2020
18d69b8
Upgrade terriajs and sync dependencies
tephenavies Jun 12, 2020
fe072b1
Merge pull request #459 from TerriaJS/mobx-fix-release
tephenavies Jun 12, 2020
96fbeba
Update package-lock.json
tephenavies Jun 12, 2020
8a6b2f0
Update config.json to include welcome message video settings
reginapramesti Jun 26, 2020
1a98860
Merge pull request #461 from TerriaJS/mobx-welcome-video-config
soyarsauce Jun 29, 2020
1f50c00
Add video title to configParameters
reginapramesti Jun 30, 2020
af48421
Merge pull request #462 from TerriaJS/mobx-welcomemsg-video-title
soyarsauce Jul 1, 2020
3da983e
i18nify help content, traniner, and help terms
zoran995 Jul 8, 2020
23064da
Update babel to compile terriajs without ts-loader
soyarsauce Jul 15, 2020
55469ae
Fix comments & sync preset env
soyarsauce Jul 15, 2020
8f364fa
Update changelog
soyarsauce Jul 21, 2020
0a928ab
Update terriajs dep & lockfile
soyarsauce Jul 21, 2020
afd0946
Upgrade terriajs and sync dependencies
tephenavies Jul 21, 2020
6d00373
Merge pull request #468 from TerriaJS/use-terriajs-7-11-6
soyarsauce Jul 22, 2020
476cd2d
Use proper terriajs
soyarsauce Jul 22, 2020
0d5e9d2
Merge pull request #467 from TerriaJS/mobx-tm-no-tsloader
tephenavies Jul 22, 2020
6bcd9fe
Upgrade terriajs and sync dependencies
tephenavies Aug 7, 2020
82f9249
Merge pull request #472 from TerriaJS/use-terriajs-7-11-8
tephenavies Aug 7, 2020
72b5181
Update config.json
zoran995 Aug 14, 2020
f4bad87
Rename wwwroot/Language/en/languageOverrides.json to wwwroot/language…
zoran995 Aug 14, 2020
1f0d6f6
Remove confusing `enabled` flag, add more examples
soyarsauce Aug 19, 2020
e851964
Merge branch 'next' into pr/465
soyarsauce Aug 19, 2020
12ae8a3
Update changelog
soyarsauce Aug 19, 2020
f4aea0b
Fix help content test strings & misplaced property
soyarsauce Aug 19, 2020
ecab430
Merge pull request #475 from TerriaJS/pr/465
nf-s Aug 19, 2020
49534bc
Upgrade terriajs and sync dependencies
tephenavies Aug 20, 2020
198bcb7
Update yarn.lock
tephenavies Aug 20, 2020
6d3cc39
Merge pull request #476 from TerriaJS/use-terriajs-7-11-10
KeyboardSounds Aug 20, 2020
ebb4b34
Merge remote-tracking branch 'origin/1757-tm-new-routing' into 1757-m…
soyarsauce Aug 28, 2020
146ed81
safer entry
soyarsauce Aug 28, 2020
815258a
Bump prerendering fixes
soyarsauce Aug 28, 2020
e6874f3
Upgrade terriajs and sync dependencies
tephenavies Sep 2, 2020
925a833
Run npm dedupe to fix npm package lock forcing duplication of terriaj…
tephenavies Sep 2, 2020
cf14452
Fix npm package lock file broken by npm dedupe
tephenavies Sep 2, 2020
db33f1c
Merge pull request #478 from TerriaJS/terriajs-next-46
soyarsauce Sep 2, 2020
8193609
Update package-lock.json
reginapramesti Sep 9, 2020
74d3e56
Merge pull request #480 from TerriaJS/fix-npm-lockfile
tephenavies Sep 9, 2020
a58e8aa
Update versions in package.json and update yarn lockfile
reginapramesti Sep 24, 2020
0bdb71e
Update versions in package.json and update yarn lockfile
reginapramesti Sep 24, 2020
2f292be
Update lockfiles
reginapramesti Sep 29, 2020
b46337d
Update lockfile
reginapramesti Sep 29, 2020
e42be32
Merge pull request #483 from TerriaJS/upgrade-cesium-1.73
soyarsauce Sep 29, 2020
811cf78
Update package.json and corresponding lockfile
reginapramesti Sep 29, 2020
9abb24f
Merge pull request #482 from TerriaJS/mobx-cesium-upgrade-1.73
soyarsauce Sep 29, 2020
4952b2d
Add non-i18n story migration
soyarsauce Sep 29, 2020
ee9f6aa
Merge pull request #486 from TerriaJS/soyarsauce-patch-1
nf-s Sep 29, 2020
b9b5b9a
Add a new getting started terria trainer and disable trainers for sat…
na9da Oct 1, 2020
6d5eb4a
Merge branch 'next' into next-add-gettingstarted-trainer
na9da Oct 1, 2020
30a2898
Update default h2s
soyarsauce Oct 1, 2020
e4b91d2
Merge pull request #487 from TerriaJS/next-add-gettingstarted-trainer
soyarsauce Oct 1, 2020
f2f2ef3
Upgrade terriajs and sync dependencies
tephenavies Oct 14, 2020
f01cec7
Run tests on both node 8 & 14
tephenavies Oct 16, 2020
6004695
Upgrade terriajs and sync dependencies
tephenavies Oct 16, 2020
8f4f81a
Run CI on node 14
tephenavies Oct 16, 2020
e1a673f
Merge remote-tracking branch 'origin/steve9164-patch-1' into tjs-7-11-14
tephenavies Oct 16, 2020
dfd2bf1
Merge pull request #488 from TerriaJS/tjs-7-11-14
soyarsauce Oct 19, 2020
a143963
Merge pull request #491 from TerriaJS/next-alpha-55
soyarsauce Oct 19, 2020
c76159d
Enable post message
mwu2018 Oct 20, 2020
e612ed9
Enable processing message from parent window.
mwu2018 Oct 27, 2020
32efcca
Update CHANGES.md
mwu2018 Oct 27, 2020
9fb597f
Update terriajs version
mwu2018 Oct 27, 2020
0c7b2fa
Turn off CSSOM for styled-components when pre-rendering.
na9da Oct 28, 2020
0b9769e
Proxy URLs through our locally running server.
na9da Oct 28, 2020
9092477
Hide any errors or other modals in the rendered output.
na9da Oct 28, 2020
f8bb459
Parameterise webpack, bump versions
soyarsauce Oct 28, 2020
112efc3
Merge pull request #496 from TerriaJS/1757-fixes
soyarsauce Oct 28, 2020
0fe0573
Merge remote-tracking branch 'origin/next' into 1757-mobx-tm-new-routing
soyarsauce Oct 28, 2020
8bf9176
Update changelog, comment webpack for prerendering
soyarsauce Oct 28, 2020
cbfc339
Properly traverse v8 catalog for routes
soyarsauce Oct 29, 2020
81f0588
Add timeout fallback
soyarsauce Oct 29, 2020
3d8d6ba
Streamline various entry.js element removals
soyarsauce Oct 29, 2020
37306f5
Guard element
soyarsauce Oct 29, 2020
bdfb39d
Bump versions for prerendering, revert to opt-in
soyarsauce Oct 30, 2020
381319c
Merge pull request #497 from TerriaJS/1757-mobx-tm-new-routing
soyarsauce Oct 30, 2020
86cfe39
Revert "1757 mobx TerriaMap new routing"
nf-s Nov 2, 2020
5fb135d
Merge pull request #500 from TerriaJS/revert-497-1757-mobx-tm-new-rou…
tephenavies Nov 2, 2020
0413865
Upgrade terriajs
tephenavies Nov 3, 2020
6c19aac
Merge pull request #501 from TerriaJS/next-up-terriajs
nf-s Nov 4, 2020
3074a0c
Merge next branch and resolve conflicts.
mwu2018 Nov 4, 2020
f2a5304
Merge pull request #495 from TerriaJS/enable-post-message
tephenavies Nov 5, 2020
ed43aa0
Fixes the "All generation types" catalog item in simple.json.
na9da Nov 26, 2020
3e91de3
Update youtube urls to nocookie version
zoran995 Dec 7, 2020
f7d7340
update changes.md
zoran995 Dec 7, 2020
13c6ffd
new map navigation system
zoran995 Dec 7, 2020
2613b52
Merge pull request #504 from zoran995/update-youtube-urls
tephenavies Dec 14, 2020
4269a44
Upgrade terriajs
tephenavies Dec 17, 2020
c9b20d1
Update lockfiles
tephenavies Dec 17, 2020
71530cc
Create ci.yml
tephenavies Dec 17, 2020
bdfe8a2
Test only on 10.x and 14.x
tephenavies Dec 17, 2020
0e3f3c4
Merge pull request #507 from TerriaJS/next-up-terriajs
tephenavies Dec 17, 2020
0454831
Merge pull request #508 from TerriaJS/steve9164-patch-2
tephenavies Dec 17, 2020
165941a
Add GitHub Actions CI
tephenavies Dec 17, 2020
284f510
Switch to GitHub Actions
tephenavies Dec 17, 2020
ace0d36
Switch to GitHub Actions
tephenavies Dec 17, 2020
100f4f2
Upgrade terriajs
tephenavies Dec 17, 2020
29c4dad
remove deleted functions references from index.js
zoran995 Jan 17, 2021
03d5331
add default baseMapId and previewBaseMapId to simple.json to reflect …
zoran995 Jan 17, 2021
1902229
add basemap images
zoran995 Jan 17, 2021
dd183a3
add image for positron basemap
zoran995 Jan 17, 2021
daa215f
upgrade babel and eslint
zoran995 Feb 17, 2021
78c38c4
update package-lock.json
zoran995 Feb 17, 2021
3ebc796
Update Deployment for k8s 1.16
peterhassall Feb 23, 2021
22e1abf
Update Deployment for k8s 1.16
peterhassall Feb 23, 2021
0832ec6
Merge pull request #521 from TerriaJS/fix-ci-next
na9da Feb 23, 2021
04d342e
Merge pull request #520 from TerriaJS/fix-ci
na9da Feb 23, 2021
4f37da5
Merge pull request #519 from zoran995/babel-upgrade
nf-s Feb 24, 2021
14ee5c6
Merge remote-tracking branch 'upstream/next' into navigation-model
zoran995 Mar 8, 2021
48348b2
Merge pull request #514 from zoran995/configurable-basemaps
nf-s Mar 22, 2021
b66e92c
bump terriajs and cesium version
nf-s Mar 22, 2021
10f60aa
Merge pull request #524 from TerriaJS/bump-69
tephenavies Mar 22, 2021
179eb49
prettier config file
Apr 14, 2021
c52e395
enabling translations and adding french option to terriamap
Apr 14, 2021
1a909a5
update terriajs
nf-s Apr 22, 2021
c132ebb
enable language switcher on terriamap
Apr 22, 2021
032f2af
yarn lock
nf-s Apr 26, 2021
64012ff
Update package-lock.json
tephenavies Apr 26, 2021
ac03c25
Merge pull request #526 from TerriaJS/new-terria-error
tephenavies Apr 26, 2021
6de90ee
Merge remote-tracking branch 'origin/next' into add-translations
nf-s May 3, 2021
4f22171
bump terriajs + lockfiles
nf-s May 3, 2021
a3524c1
Merge pull request #527 from TerriaJS/add-translations
nf-s May 3, 2021
d108091
update terriajs version
KeyboardSounds May 6, 2021
bb2bddc
restore yarn workspaces config
KeyboardSounds May 6, 2021
37ef414
Update npm lockfile
tephenavies May 6, 2021
d650402
Merge pull request #528 from TerriaJS/terriajs-8.0.0-alpha.79
tephenavies May 6, 2021
057738b
Make TerriaMap deafult to one-button disclaimer
tephenavies May 6, 2021
4f01ec9
Fix CI
tephenavies May 6, 2021
567d115
Add changelog entry
tephenavies May 6, 2021
b019741
Update terriajs
tephenavies May 10, 2021
2e311b1
Merge pull request #529 from TerriaJS/disclaimer-no-cancel
tephenavies May 11, 2021
a5c621a
Add ASRIS CLUM 2018 as test data to catalogue
tephenavies Jun 9, 2021
cc008db
Merge pull request #531 from TerriaJS/add_clum_default_data
tephenavies Jun 10, 2021
520d433
Merge remote-tracking branch 'terriamap/next' into navigation-model
zoran995 Jun 30, 2021
844bd43
add translate# in front of translation keys in config.json
zoran995 Jul 5, 2021
8122e76
Update README.md
Jul 22, 2021
a904579
Merge pull request #535 from TerriaJS/wc-v8-notice
Jul 23, 2021
46b20cf
Merge remote-tracking branch 'origin/master' into next
tephenavies Aug 3, 2021
6c11c27
add gulp:watch task
wibily Aug 5, 2021
fd564a0
Merge pull request #540 from TerriaJS/wc-convenience
tephenavies Aug 5, 2021
471e2ac
Merge pull request #538 from TerriaJS/merge-master
tephenavies Aug 6, 2021
9321e2e
v8 release
nf-s Aug 9, 2021
3958f5d
fix after organise models
nf-s Aug 10, 2021
667b829
Merge pull request #534 from zoran995/use-translation
tephenavies Aug 13, 2021
1b5871a
Update README for branch switching and v8
tephenavies Aug 13, 2021
9167816
Merge pull request #543 from TerriaJS/prep-master-to-terriajs7
tephenavies Aug 13, 2021
473561f
Update to terriajs 7.11.17 and bump terriajs-server to ^3.3.3
tephenavies Aug 13, 2021
6378548
Update README for next -> main branch renaming
tephenavies Aug 13, 2021
95fe4b1
Fix readme of terriajs7
tephenavies Aug 13, 2021
143ff86
Merge pull request #545 from TerriaJS/fix-readme-7
tephenavies Aug 13, 2021
8002629
Update lockfiles
tephenavies Aug 13, 2021
99490e4
Add migration guide to readme
tephenavies Aug 13, 2021
3ee0337
Bump terriajs-server version to ^3.3.3
tephenavies Aug 13, 2021
0890548
Recreate npm lockfile to avoid build error
tephenavies Aug 13, 2021
79cd45a
Merge pull request #542 from TerriaJS/v8-release
tephenavies Aug 13, 2021
dbddfe3
Update lockfiles
tephenavies Aug 13, 2021
62615a7
Bump elliptic from 6.5.2 to 6.5.4
dependabot[bot] Aug 13, 2021
470c594
Merge pull request #544 from TerriaJS/prep-master-to-terriajs7
tephenavies Aug 13, 2021
38d0afb
Merge remote-tracking branch 'origin/next' into terriajs7
tephenavies Aug 13, 2021
f13e754
Merge pull request #503 from TerriaJS/fix-power-generation-catalog
tephenavies Aug 16, 2021
2050cbf
Merge pull request #523 from TerriaJS/dependabot/npm_and_yarn/ellipti…
tephenavies Aug 16, 2021
c4ab766
Merge branch 'origin/main' into navigation-model
zoran995 Sep 2, 2021
d477cc5
Use terriajs 8.1.0
tephenavies Sep 8, 2021
3826021
Update lockfiles
tephenavies Sep 8, 2021
ad0689e
Merge pull request #505 from zoran995/navigation-model
tephenavies Sep 8, 2021
6b28706
Disable sourcemaps on production builds
tephenavies Sep 27, 2021
73675f1
Merge pull request #554 from TerriaJS/no-prod-sourcemaps
tephenavies Oct 5, 2021
36fdb74
update terriajs to 8.1.4
nf-s Oct 20, 2021
0e5046f
remove package-lock and update yarn.lock
nf-s Oct 20, 2021
267fd69
fix ci script
nf-s Oct 20, 2021
4ee13af
Merge pull request #558 from TerriaJS/bump-tjs-8-1-4
nf-s Oct 20, 2021
d567b50
change npm usage to yarn
nf-s Oct 21, 2021
f188cec
Update docker file to use node 10
t83714 Oct 28, 2021
c9aa062
Merge pull request #561 from TerriaJS/upgrade-to-node-10
tephenavies Oct 28, 2021
b069420
Merge pull request #560 from TerriaJS/more-npm-yarn
nf-s Nov 1, 2021
478dce9
bump tjs + sync babel deps
nf-s Nov 15, 2021
9251ee8
update yarn lock
nf-s Nov 15, 2021
a6a4099
bump terriajs to 8.1.10
nf-s Nov 15, 2021
2c36294
bump lock
nf-s Nov 15, 2021
e9d81b3
update yarn.lock
nf-s Nov 15, 2021
78c8e7a
bump version to 8.1.11
nf-s Nov 15, 2021
25833cb
Merge pull request #565 from TerriaJS/sync-deps
nf-s Nov 15, 2021
7fb283c
Update superGet replacement for newer babel generated code
tephenavies Nov 17, 2021
bcc99a0
Merge pull request #566 from TerriaJS/new-babel-super-get
tephenavies Nov 17, 2021
d2affc6
update node-sass
nf-s Nov 25, 2021
43f64d9
fix bad version
nf-s Nov 25, 2021
6a4fe95
set terriajs to commit
nf-s Nov 25, 2021
fde47b0
swap node 10 to 12
nf-s Nov 25, 2021
1ec7f26
try node 16 in Dockerfile
nf-s Nov 25, 2021
398e8cd
update cesium version, update terriajs version
KeyboardSounds Jan 10, 2022
2086fe3
add yarnrc to force yarn 1.18 to avoid issues with workspaces
KeyboardSounds Jan 10, 2022
2349419
whoops get rid of yarn 3 in package.json
KeyboardSounds Jan 10, 2022
59ce216
manually install yarn in ci, change minimum node version to 12
KeyboardSounds Jan 10, 2022
3c784dc
fix manually install yarn in ci
KeyboardSounds Jan 10, 2022
d5d5cd1
wait no my bad we don't need to change the ci script, we can install …
KeyboardSounds Jan 10, 2022
86970ae
so those ggggggs should probably not be there
KeyboardSounds Jan 10, 2022
d5c181c
update lockfile
KeyboardSounds Jan 10, 2022
6d2fa76
update terriajs to 8.1.17
nf-s Jan 12, 2022
b538945
re-add workspaces
nf-s Jan 12, 2022
f5655df
Merge pull request #567 from TerriaJS/update-node-sass
nf-s Jan 12, 2022
7d2bf0c
downgrade Dockerfile node to 14
nf-s Jan 20, 2022
aaf18bc
Merge pull request #570 from TerriaJS/docker-node-14
nf-s Jan 20, 2022
d154770
add fontImports to index.js
nf-s Jan 20, 2022
8182f27
Merge pull request #571 from TerriaJS/add-font-imports
nf-s Jan 21, 2022
0c0c26f
terriajs upgrade initial version WIP
ss-bhat Feb 1, 2022
bdc6b22
resolve conflic
ss-bhat Feb 1, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions

name: CI

on: [push, pull_request]

jobs:
build:
runs-on: ubuntu-latest

strategy:
matrix:
node-version: [12.x, 14.x, 16.x]

steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- run: rm -rf node_modules && yarn install --frozen-lockfile
- run: yarn gulp lint release
env:
NODE_OPTIONS: --max_old_space_size=4096
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,7 @@ wwwroot/privateconfig.json
deploy/packages/
deploy/work/
packages/
pancake/
yarn-error.log

package-lock.json
9 changes: 0 additions & 9 deletions .travis.yml

This file was deleted.

Loading