Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
413 commits
Select commit Hold shift + click to select a range
d8a9ea0
refactor(project): get version status filters working
evansiroky Mar 21, 2019
9b56409
feat(project): add ability to pin a deployment
evansiroky Mar 22, 2019
48009d4
test(project): deployment flow typing, add test for a util function
evansiroky Mar 25, 2019
0e675f4
refactor(gtfs+): handle table level validation issues
landonreed Mar 25, 2019
04ca6d0
build(yarn): bump bootstrap to fix xss vulnerability
landonreed Mar 25, 2019
0344a7f
fix: use route_type to set follow streets
landonreed Mar 25, 2019
5ce074f
refactor(pattern-editor): address PR comments
landonreed Mar 25, 2019
62c6402
Merge branch 'dev' into container-refactor-fixes
Mar 25, 2019
495e31c
refactor: address PR comments
landonreed Mar 25, 2019
b69eb9c
Merge pull request #433 from conveyal/bump-bootstrap-3.4.1
Mar 27, 2019
7c95ddc
refactor(user): improve updateUserData action
evansiroky Mar 29, 2019
ad6a2d2
Merge pull request #409 from conveyal/update-user-fix
Mar 29, 2019
7028f01
test(project): add test for rendering newly created project
evansiroky Mar 29, 2019
87d2331
test(project): refactor and test FeedSourceTable and DeploymentsPanel
evansiroky Mar 31, 2019
735973a
Merge branch 'dev' into feed-source-table-refactor
evansiroky Mar 31, 2019
dc2cb44
test(package): use specific timezone when running client tests
evansiroky Mar 31, 2019
e826a63
fix(lint):
landonreed Apr 1, 2019
a64701d
test(project): add test of onProjectViewerMount action
evansiroky Apr 1, 2019
554a281
fix(lint): fix lint errors (indentations, unused imports)
landonreed Apr 1, 2019
cf708a5
refactor: add more comments in various places
evansiroky Apr 1, 2019
772f37c
refactor(editor): add comment about sorting trips
evansiroky Apr 1, 2019
73bc136
test(recalculateShape): re-enable tests for pattern shape map util
landonreed Apr 2, 2019
234bbaa
refactor(recalculateShape): remove unused pattern arg
landonreed Apr 2, 2019
c287b5a
test(fixtures): replace mapzen fixtures w graphhopper
landonreed Apr 2, 2019
d06b813
test(snapshots): check in snaps for map.js
landonreed Apr 2, 2019
111f418
Merge pull request #427 from conveyal/sortandfiltertrips-fix
Apr 2, 2019
a719861
test(pattern-editor): clean up fixtures/snapshots
landonreed Apr 3, 2019
6a2b797
refactor(normalize-stop-times): add confirm modal
landonreed Apr 3, 2019
d728a61
fix(normalize-stop-times): add missing files
landonreed Apr 3, 2019
08f08e4
test(pattern): add geojson.io link to test logs for debugging
landonreed Apr 4, 2019
4160f00
Merge branch 'container-refactor-fixes' into mtc-2019-all
landonreed Apr 4, 2019
00bdbb1
Merge branch 'feed-source-table-refactor' into mtc-2019-all
landonreed Apr 4, 2019
097f34d
feat(merge-feed-versions): add MTC merge feeds type
landonreed Apr 4, 2019
1978e7d
Merge pull request #401 from conveyal/container-refactor-fixes
Apr 4, 2019
ddfb298
Merge branch 'mtc-enhancements-2019' into mtc-2019-all
landonreed Apr 4, 2019
94ffb2f
refactor(sidebar): remove unneeded container props
evansiroky Apr 5, 2019
33baa0f
style(project): add checkmark next to active sort method
evansiroky Apr 5, 2019
8808598
refactor(project): use new publishedValidationSummary field in project
evansiroky Apr 6, 2019
18646b5
Merge branch 'dev' into feed-source-table-refactor
evansiroky Apr 6, 2019
61b3130
Merge branch 'feed-source-table-refactor' into mtc-2019-all
landonreed Apr 8, 2019
14ba97d
refactor(merge-feeds): comment out start date check and fix styling
landonreed Apr 15, 2019
cc1db9f
feat(project): add ability to download csv of feed source table
evansiroky Apr 25, 2019
65b38e7
ci(semantic-release): make semantic-release publish to only github
evansiroky Apr 27, 2019
a4830d1
refactor(pattern-editor): show toast notification when pattern stops …
landonreed Apr 29, 2019
7aae916
refactor(validation): prevent MTC feed publication on blocking issues
landonreed Apr 29, 2019
9745baf
Merge branch 'mtc-enhancements-2019v2' into mtc-2019-all
landonreed Apr 29, 2019
8b3f4e4
Merge branch 'feed-source-table-refactor' into mtc-2019-all
landonreed Apr 29, 2019
d609dfb
Merge pull request #437 from conveyal/semantic-release-to-github-only
landonreed May 2, 2019
f51b9b5
feat(export-gis): add shapefile export for feed versions
landonreed May 7, 2019
1f886f5
fix: fix lint and flow
landonreed May 7, 2019
05077f8
fix(alerts): fix css for stop popup to prevent overflow issues
landonreed May 7, 2019
99debcb
fix(version-publish): fix checks for blocking publication
landonreed May 7, 2019
efcade6
Merge branch 'mtc-enhancements-2019v2' into mtc-2019-all
landonreed May 7, 2019
842a946
refactor: clean up fetch validation issues code
landonreed May 7, 2019
77e462d
Merge branch 'mtc-enhancements-2019v2' into mtc-2019-all
landonreed May 7, 2019
f2a12f7
fix(validation-issues): fix fetch issues with validation issue count
landonreed May 7, 2019
b3e59ec
Merge branch 'mtc-enhancements-2019v2' into mtc-2019-all
landonreed May 7, 2019
3007189
refactor: rename 'Number of Errors' -> 'Number of Issues'
landonreed May 7, 2019
1d1c9de
Merge branch 'feed-source-table-refactor' into mtc-2019-all
landonreed May 7, 2019
42d9728
refactor: address PR comments
landonreed May 9, 2019
b75e7d2
Merge pull request #438 from conveyal/export-gis
landonreed May 9, 2019
2519902
fix(merge-feeds): fix success message for modal
landonreed May 9, 2019
95337cc
Merge branch 'mtc-enhancements-2019v2' into mtc-2019-all
landonreed May 9, 2019
eb07c09
refactor(messages): change Soonest -> Earliest
landonreed May 10, 2019
80bf96a
refactor(publish-feed): fix block feed publication
landonreed May 13, 2019
03c5dcd
Merge branch 'mtc-enhancements-2019v2' into mtc-2019-all
landonreed May 13, 2019
725bbdd
Merge branch 'feed-source-table-refactor' into mtc-2019-all
landonreed May 13, 2019
1b3c709
fix(status): clear status modal details on mount
landonreed May 21, 2019
63c7f77
Merge branch 'mtc-enhancements-2019v2' into mtc-2019-all
landonreed May 21, 2019
b059c6d
refactor(publish-feed): fix block feed publication
landonreed May 13, 2019
64658b4
Merge branch 'mtc-enhancements-2019v2' into mtc-2019-all
landonreed May 21, 2019
b546d55
fix(status): handle clearing of status modal content on close
landonreed May 21, 2019
8cd0bc1
Merge branch 'mtc-enhancements-2019v2' into mtc-2019-all
landonreed May 21, 2019
59c4f6d
Merge branch 'mtc-2019-all' of https://github.com/conveyal/datatools-…
landonreed May 21, 2019
d6f59ff
Merge branch 'dev' into mtc-2019-all
landonreed May 23, 2019
9f2e15e
fix(lint): fix lint issues resulting from merge
landonreed May 23, 2019
f2db240
fix(flow): fix flow issues following merge
landonreed May 23, 2019
bbd49ac
fix(FeedVersionDetails): only show publication message for MTC
landonreed May 23, 2019
a9de9a9
fix(GTFS+): add warnings about table- and column-level issues
landonreed Jun 7, 2019
3fa6a31
Merge branch 'mtc-enhancements-2019v2' into mtc-2019-all
landonreed Jun 7, 2019
0a3ce4f
feat(gtfs+): block publication if GTFS+ errors exist
landonreed Jun 14, 2019
f48ac75
Merge branch 'mtc-enhancements-2019v2' into mtc-2019-all
landonreed Jun 14, 2019
7560f30
fix bad merge flow types
landonreed Jun 14, 2019
55a5e4f
fix(gtfs+): clear gtfs+ state on version change
landonreed Jun 14, 2019
f38fad0
Merge branch 'mtc-enhancements-2019v2' into mtc-2019-all
landonreed Jun 14, 2019
cc839cb
chore(mastarm): bump to v5.0.1 to resolve security vuln.
landonreed Jun 20, 2019
8e5f09f
ci(travis): bump node to v12 for mastarm 5
landonreed Jun 20, 2019
f5b5332
Merge branch 'dev' into feed-source-table-refactor
landonreed Jul 1, 2019
412af78
Merge branch 'dev' into e2e-coverage
evansiroky Jul 1, 2019
56c1b11
test(e2e): better debugging
evansiroky Jul 2, 2019
c74872d
build(mastarm): bump to 5.0.2
landonreed Jul 2, 2019
839342c
build: update to latest mastarm
evansiroky Jul 3, 2019
0adcb17
test(e2e): upload e2e logs to s3 and send message to MS Teams
evansiroky Jul 3, 2019
70b5729
test(e2e): use correct jest json output file
evansiroky Jul 3, 2019
9770956
ci: bump node to v12
evansiroky Jul 3, 2019
904f5b6
ci: temporarily run e2e tests on this branch
evansiroky Jul 3, 2019
a9dec1f
test(flow): fix flow errors
evansiroky Jul 3, 2019
f444546
test(e2e): synchronously recreate the test results directory
evansiroky Jul 3, 2019
f5600e6
test(e2e): add more logging for MS Team log uploader
evansiroky Jul 3, 2019
11dda32
ci(e2e): some fixes for environment variable possibilities with MS Teams
evansiroky Jul 4, 2019
7fbbe1d
ci(e2e): properly upload logs
evansiroky Jul 4, 2019
4387a20
ci(e2e): properly exit log uploader if not configured properly
evansiroky Jul 4, 2019
75c2fb2
ci(e2e): fix aws logs link
evansiroky Jul 4, 2019
d9b7306
test(e2e): update log results folder for zipping
evansiroky Jul 4, 2019
e0a7577
test(e2e): write detached process logs to correct folder
evansiroky Jul 4, 2019
8763b5b
ci: rename a few things from Conveyal to ibi-group
evansiroky Jul 4, 2019
16e3a2c
build(deps): bump lodash.merge from 4.6.1 to 4.6.2
dependabot[bot] Jul 12, 2019
65fba73
build(deps): bump lodash-es from 4.17.11 to 4.17.14
dependabot[bot] Jul 12, 2019
1d00138
build(deps): bump lodash.template from 4.4.0 to 4.5.0
dependabot[bot] Jul 12, 2019
f1ddc9a
build(deps-dev): bump js-yaml from 3.12.0 to 3.13.1
dependabot[bot] Jul 12, 2019
40dfc02
build(deps): bump handlebars from 4.0.12 to 4.1.2
dependabot[bot] Jul 12, 2019
e4dfb26
Merge pull request #444 from ibi-group/dependabot/npm_and_yarn/lodash…
landonreed Jul 12, 2019
c00f6ad
Merge pull request #448 from ibi-group/dependabot/npm_and_yarn/js-yam…
landonreed Jul 12, 2019
b2ac62b
Merge pull request #447 from ibi-group/dependabot/npm_and_yarn/handle…
landonreed Jul 12, 2019
6b263c6
Merge pull request #446 from ibi-group/dependabot/npm_and_yarn/lodash…
landonreed Jul 12, 2019
0b07fdb
Merge pull request #445 from ibi-group/dependabot/npm_and_yarn/lodash…
landonreed Jul 12, 2019
7ac66dc
refactor(flow): add fixme for flow react-redux issues
landonreed Jul 16, 2019
9aca216
Merge branch 'dev' into mastarm5
landonreed Jul 17, 2019
ff6f01c
test(flow): fix flow errors
evansiroky Jul 3, 2019
ff2fb83
fix(deps): update auth0 in script dependencies for lodash fix
landonreed Jul 17, 2019
3613245
Merge pull request #429 from ibi-group/feed-source-table-refactor
landonreed Jul 17, 2019
2b8b8fd
build(deps): bump lodash from 4.17.11 to 4.17.13
dependabot[bot] Jul 17, 2019
a01c80d
Merge pull request #450 from ibi-group/dependabot/npm_and_yarn/lodash…
landonreed Jul 17, 2019
3b7ed18
Merge pull request #451 from ibi-group/update-scripts-lodash
landonreed Jul 17, 2019
526e761
Merge branch 'dev' into mastarm5
landonreed Jul 17, 2019
5f95dd3
Merge pull request #442 from ibi-group/mastarm5
landonreed Jul 17, 2019
550c9a4
refactor(gtfsplus): only request gtfs+ validation if module enabled
landonreed Jul 18, 2019
209e315
Merge branch 'mtc-enhancements-2019v2' into mtc-2019-all
landonreed Jul 18, 2019
ceac8f6
Merge branch 'dev' into e2e-coverage
evansiroky Jul 22, 2019
ea3a9d8
test(e2e): get e2e tests working with refactor feed source table
evansiroky Jul 23, 2019
26066ee
ci(e2e): make sure backend server uses s3 storage for e2e tests
evansiroky Jul 23, 2019
41762b6
build(deps): bump sshpk from 1.13.1 to 1.16.1 in /scripts
dependabot[bot] Jul 23, 2019
0df58d7
Merge pull request #453 from ibi-group/dependabot/npm_and_yarn/script…
landonreed Jul 23, 2019
db637ea
refactor: address PR comments
landonreed Jul 24, 2019
648a296
Merge branch 'mtc-enhancements-2019v2' into mtc-2019-all
landonreed Jul 24, 2019
abbfe52
Merge branch 'dev' into mtc-2019-all
landonreed Jul 24, 2019
6d5830b
test(flow): fix flow def for FeedVersion
landonreed Jul 25, 2019
de5614b
test(snapshots): update snapshots
landonreed Jul 25, 2019
b7e9163
refactor(gtfs+): add message if blocking issue is GTFS+ related
landonreed Jul 25, 2019
1e77700
ci(e2e): auto-create gtfsplus folder on travis for datatools-server
evansiroky Jul 26, 2019
9723250
test(e2e): add a slight pause to wait for feed dropdown menu render
evansiroky Jul 26, 2019
2edad94
refactor(UserAccount): only fetch deployments if module is enabled
landonreed Jul 26, 2019
e034d4e
fix(alerts): fix issue with alert ID type mismatch
landonreed Jul 29, 2019
02500e6
test(flow): fix flow issues
landonreed Jul 29, 2019
3c635ff
refactor(branding): replace Conveyal with IBI
landonreed Jul 30, 2019
202e72e
refactor(branding): fix IBI url
landonreed Jul 30, 2019
b88cfc4
refactor(branding): replace auth0 logo and favicon
landonreed Jul 30, 2019
bdb26f4
refactor(validation): remove redundant fetches for validation data
landonreed Jul 30, 2019
5460d3d
build(mastarm): bump to 5.1.3
landonreed Jul 30, 2019
9924675
refactor(gtfs+): minor fixes for GTFS+
landonreed Aug 1, 2019
2bc6a33
test: fix lint and update snapshot
landonreed Aug 1, 2019
b40e655
test: update snapshots
landonreed Aug 1, 2019
af62dd1
ci(travis): set timezone for jest snapshot consistency
landonreed Aug 1, 2019
23d7fda
Revert "ci(travis): set timezone for jest snapshot consistency"
landonreed Aug 1, 2019
7ed1449
Merge pull request #456 from ibi-group/mtc-2019-all
landonreed Aug 1, 2019
2a39bc8
Merge branch 'dev' into e2e-coverage
evansiroky Aug 2, 2019
7804a81
test: update snapshots to reflect latest changes to dev
evansiroky Aug 5, 2019
bbedad2
build: do not deploy releases to github, only deploy to github
evansiroky Aug 5, 2019
4075e7a
ci: add comment about releasing
evansiroky Aug 5, 2019
15aabfa
Merge pull request #462 from ibi-group/semantic-release-to-github-only
evansiroky Aug 5, 2019
4dc7651
Add a script for migrating auth0 users from one auth0 tenant to another
evansiroky Aug 8, 2019
5adca64
refactor: add more comments and ignore some config files
evansiroky Aug 8, 2019
e163161
refactor: reword comments on how to run script
evansiroky Aug 8, 2019
c008e77
ci: attempt to run preinstalled python on Travis
evansiroky Aug 8, 2019
be11e63
Merge pull request #464 from ibi-group/migrate-auth0-users-script
landonreed Aug 8, 2019
ed3aac4
docs(readme): add shoutout to Browserstack
evansiroky Aug 9, 2019
1807058
Merge pull request #465 from ibi-group/browserstack
landonreed Aug 12, 2019
d31c76f
refactor(signs): remove code related to eTID (aka signs)
landonreed Aug 12, 2019
7e8b286
refactor(signs): remove refs to signs code
landonreed Aug 12, 2019
ab8fbfa
Merge branch 'dev' into remove-signs
landonreed Aug 13, 2019
6b8e544
refactor(signs): remove reducer import
landonreed Aug 13, 2019
ed2e6e3
refactor(signs): remove remaining refs to signs module
landonreed Aug 8, 2019
4df82d3
Merge pull request #466 from ibi-group/remove-signs
landonreed Aug 14, 2019
3f7b903
Merge branch 'dev' into e2e-coverage
evansiroky Aug 15, 2019
682a171
ci: remove unneeded codecov script
evansiroky Aug 15, 2019
4eb4942
test(e2e): improve local setup error reporting
evansiroky Aug 15, 2019
418be49
test(e2e): get delete feed source test working again
evansiroky Aug 15, 2019
e3a2afe
test(e2e): make filenames without special characters and curtail erro…
evansiroky Aug 16, 2019
63b0715
test(e2e): update to latest version of archiver and add all files to …
evansiroky Aug 16, 2019
bab4126
ci(e2e): update to using otp 1.4.0 in e2e tests
evansiroky Aug 16, 2019
13c753c
ci: reconfigure travis to use a java-based container
evansiroky Aug 16, 2019
1f7b3a1
ci: manually install yarn
evansiroky Aug 16, 2019
83f2beb
ci: install node 12
evansiroky Aug 16, 2019
1d8a269
refactor(e2e): refactor e2e setup/teardown to use promises wherever p…
evansiroky Aug 17, 2019
0cc55c3
refactor(e2e): use fs-extra remove method instead of unlink
evansiroky Aug 17, 2019
193c109
refactor(e2e): go back to using fs.unlink and properly import fs-extr…
evansiroky Aug 17, 2019
19783a4
refactor(e2e): execute functions to upload logs
evansiroky Aug 17, 2019
a878b3d
refactor(e2e): use latest auth0 management API keys
evansiroky Aug 19, 2019
8e3398e
refactor(e2e): add more logging and error handling
evansiroky Aug 19, 2019
cdd4cdb
refactor(e2e): rename incorrect env var
evansiroky Aug 19, 2019
13ad94f
refactor(e2e): add some extra wait time for loading stuff upon new fe…
evansiroky Aug 19, 2019
417c170
refactor: address various PR comments in #394
evansiroky Aug 20, 2019
97140b1
refactor(scripts): improve migrate users script
evansiroky Aug 21, 2019
30981f0
docs(scripts): add some more code comments
evansiroky Aug 21, 2019
85024d9
refactor(html): use same black favicon as the one on ibigroup.com web…
evansiroky Aug 21, 2019
7707471
docs(travis): add some more comments re Java to travis config
evansiroky Aug 22, 2019
1ddf44e
tests(e2e): only run e2e tests on Travis on dev or master branches
evansiroky Aug 22, 2019
b3da52c
feat(config): Use the config provided by the back end server
landonreed Aug 22, 2019
05410d4
docs(auth0): add more comments to migrate user script
evansiroky Aug 22, 2019
3056057
refactor: fix lint
landonreed Aug 22, 2019
58507ce
Merge pull request #467 from ibi-group/migrate-user-2
landonreed Aug 22, 2019
da323cf
refactor(flow): fix flow type for PageNotFound
landonreed Aug 22, 2019
1e20cb0
ci(e2e): enable E2E tests again, because something broke
evansiroky Aug 22, 2019
14a1c7d
refactor(editor): add more information re lack of GTFS edit permissions
evansiroky Aug 22, 2019
4ff8b3a
refactor(editor): correct editing disable code
evansiroky Aug 22, 2019
d2a2fae
ci(e2e): remove code activating e2e tests at all times
evansiroky Aug 23, 2019
9cfd491
ci(e2e): update travis PR check to look for false
evansiroky Aug 23, 2019
0f2a2b0
Merge pull request #394 from ibi-group/e2e-coverage
evansiroky Aug 23, 2019
901c917
refactor: create better wording for bounds placeholders
evansiroky Aug 23, 2019
d95188b
fix(project): use common bounds parser and fix DeploymentSettings bounds
evansiroky Aug 23, 2019
db79d0b
Merge pull request #468 from ibi-group/favicon-change
landonreed Aug 23, 2019
d9a31e6
refactor(flow): fix type def for PageNotFound props
landonreed Aug 26, 2019
cdfb924
fix(trips-per-hour): fix frequency processing for trips per hour hist…
landonreed Aug 26, 2019
a0abda2
refactor(trips-per-hour): refactor functions in selector
landonreed Aug 26, 2019
6b8f414
refactor: change jsdoc
landonreed Aug 26, 2019
13df707
refactor(PageNotFound): fix default props
landonreed Aug 26, 2019
2fa69ad
refactor(flow): add flow type to wrapComponentInAuthStrategy
landonreed Aug 26, 2019
2b7dc52
test(jest): update snapshot
landonreed Aug 26, 2019
2c53993
refactor(config): update config files
landonreed Aug 26, 2019
64753b1
refactor: fix lint
landonreed Aug 26, 2019
c3dcba4
refactor(flow): add flow type for DT_CONFIG
landonreed Aug 29, 2019
b7eed85
refactor(fetchAppInfo): add DataToolsConfig flow type
landonreed Aug 29, 2019
20e855e
refactor(flow): add info to flowfixme
landonreed Aug 29, 2019
60c38c8
refactor(util): move around stuff to indent less
evansiroky Aug 30, 2019
222e546
Merge pull request #470 from ibi-group/bounding-box-placeholder-clari…
evansiroky Aug 30, 2019
5b7b9cd
refactor(trips-per-hour): add comment
landonreed Sep 3, 2019
6faa3b8
refactor(config): address PR comments
landonreed Sep 3, 2019
d64a5a2
refactor(flow): fix flow type for config
landonreed Sep 3, 2019
faa14a4
refactor: fix lint
landonreed Sep 3, 2019
971db3a
refactor(config): update docs and e2e setup to reflect changes to cli…
evansiroky Sep 3, 2019
c079458
Merge pull request #474 from ibi-group/client-assets-url
evansiroky Sep 3, 2019
08492e9
refactor(flow): minor change to DT config type
landonreed Sep 4, 2019
384f24b
Merge pull request #473 from ibi-group/frequency-trips-per-hour
landonreed Sep 4, 2019
4af00b7
Merge pull request #469 from ibi-group/use-server-config
landonreed Sep 4, 2019
7d90ce6
docs(README): add GraphHopper attribution
landonreed Sep 17, 2019
17ea531
Merge pull request #478 from ibi-group/graphhopper-attribution
evansiroky Sep 17, 2019
7f75723
fix(auth0): ensure user_id is set in user profile
evansiroky Sep 18, 2019
20fe8b5
Merge pull request #481 from ibi-group/watch-project-fix
landonreed Sep 18, 2019
a25153b
ci: fix some e2e configuration for Travis environment
evansiroky Sep 23, 2019
e80ba92
fix(GTFS+): always require GTFS+ yml on config init
landonreed Sep 23, 2019
ee479ac
ci(e2e): peg dt-server jar to a specific commit
evansiroky Sep 23, 2019
f1b1b53
ci(e2e): make dt-server commit not be from ec2-deploy branch
evansiroky Sep 23, 2019
41b151a
ci(e2e): remove temporary activation of e2e testing on all CI runs
evansiroky Sep 23, 2019
ef6966a
Merge pull request #488 from catalogueglobal/master
landonreed Sep 24, 2019
a2f0b12
Merge pull request #487 from ibi-group/fix-gtfs+-config
evansiroky Sep 24, 2019
d3dda33
ci(e2e): change back to using latest dev branch jar file
evansiroky Sep 24, 2019
0736af8
Merge pull request #489 from ibi-group/e2e-updates
landonreed Sep 24, 2019
0a7eb64
fix(user-admin): remove eTID; filter permissions on module
landonreed Sep 25, 2019
e2a9ff4
refactor(lint): fix whitespace
landonreed Sep 30, 2019
8ac42ef
Merge pull request #491 from ibi-group/fix-user-permissions
evansiroky Oct 4, 2019
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
4 changes: 4 additions & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# See https://help.github.com/articles/about-codeowners/

# A Conveyal employee is required to approve PR merges
* @conveyal/employees
21 changes: 21 additions & 0 deletions .github/issue_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
_**NOTE:** This issue system is intended for reporting bugs and tracking progress in software development. Although this software is licensed with an open-source license, any issue opened here may not be responded to in a timely manner. [Conveyal](https://www.conveyal.com) is unable to provide technical support for custom deployments of this software unless your company has a support contract with us. Please remove this note when creating the issue._

## Observed behavior (please include a screenshot if possible)

Please explain what is being observed within the application here.

## Expected behavior

Please explain what should happen instead.

## Steps to reproduce the problem

Please be as specific as possible.

## Any special notes on configuration used

Please describe any applicable config files that were used

## Version of datatools-ui and datatools-server if applicable (exact commit hash or branch name)

This info can be found by clicking on the gear icon on the sidebar
14 changes: 14 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
### Checklist

- [ ] Appropriate branch selected _(all PRs must first be merged to `dev` before they can be merged to `master`)_
- [ ] Any modified or new methods or classes have helpful JSDoc and code is thoroughly commented
- [ ] The description lists all applicable issues this PR seeks to resolve
- [ ] The description lists any configuration setting(s) that differ from the default settings
- [ ] All tests and CI builds passing
- [ ] The description lists all relevant PRs included in this release _(remove this if not merging to master)_
- [ ] e2e tests are all passing _(remove this if not merging to master)_
- [ ] Code coverage does not significantly worsen (ideally it improves) _(remove this if not merging to master)_

### Description

Please explain the changes you made here and, if not immediately obvious from the code, how they resolve any referenced issues (and PRs if merging to master). Be sure to include all issues being resolved and any special configuration settings that are need for the software to run properly with these changes.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@ node_modules/
dist
*.log
coverage*
e2e-test-results
tmp/
.tags
*.pid

# Optional npm cache directory
.npm
Expand All @@ -25,3 +27,4 @@ env.yml
env.yml-original
.env
!configurations/test/env.yml
scripts/*client.json
52 changes: 38 additions & 14 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,25 +1,49 @@
language: node_js
# although this is a node.js project, specify the use of Java in order for OTP
# and datatools-server to run as expected on Java 8 specifically. Although not
# confirmed in any way, another thought with using a Java-specific image is that
# some things may be more optimized for Java thus making for more expedient and
# reliable execution of Java code.
dist: trusty # jdk 8 not available on xenial
language: java
java:
- oraclejdk8
install: true
notifications:
email: false
slack: conveyal:WQxmWiu8PdmujwLw4ziW72Gc
node_js:
- '8'
services:
# needed for e2e tests to start datatools-server
- mongodb
- postgresql
addons:
postgresql: 9.6
cache:
yarn: true
directories:
- $HOME/.cache/yarn
- $HOME/.cache/pip
before_install:
- npm i -g codecov
# Use updated python to avoid SSL insecure warnings:
# https://urllib3.readthedocs.io/en/latest/advanced-usage.html#ssl-warnings
- python --version
- pyenv versions
- pyenv global 2.7.14
# install node 12
- nvm install 12
# install yarn
- curl -o- -L https://yarnpkg.com/install.sh | bash
- pip install --user mkdocs
- source ./scripts/check-if-e2e-should-run-on-travis.sh
# create database for e2e tests
- if [ "$SHOULD_RUN_E2E" = "true" ]; then psql -U postgres -c 'CREATE DATABASE catalogue;'; fi
# add aws credentials for datatools-server
- if [ "$SHOULD_RUN_E2E" = "true" ]; then mkdir ~/.aws && printf '%s\n' '[default]' 'aws_access_key_id=${AWS_ACCESS_KEY_ID}' 'aws_secret_access_key=${AWS_SECRET_ACCESS_KEY}' 'region=us-east-1' > ~/.aws/config; else mkdir ~/.aws && printf '%s\n' '[default]' 'aws_access_key_id=foo' 'aws_secret_access_key=bar' 'region=us-east-1' > ~/.aws/config; fi
script:
- yarn
- yarn run lint
- yarn run lint-messages
- yarn run flow
- yarn run cover-client
- codecov
# upload coverage results from unit tests and then delete coverage reports to
# avoid uploading the same coverage results twice
- bash <(curl -s https://codecov.io/bash) -c -F unit_tests
- if [ "$SHOULD_RUN_E2E" = "true" ]; then yarn run cover-end-to-end; fi
# upload coverage results from e2e tests and then delete coverage reports to
# avoid uploading the same coverage results twice
- if [ "$SHOULD_RUN_E2E" = "true" ]; then bash <(curl -s https://codecov.io/bash) -c -F end_to_end_tests; fi
- yarn run build -- --minify
- mkdocs build

Expand All @@ -28,5 +52,5 @@ sudo: false

# Push results to codecov.io
after_success:
- bash <(curl -s https://codecov.io/bash)
- yarn run semantic-release
# only deploy the release to github as the package is not needed on npm
- semantic-release --prepare false --publish @semantic-release/github --verify-conditions @semantic-release/github
10 changes: 10 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,13 @@ This repository serves as the front end UI for the Data Manager application. It
View the [latest release documentation](http://conveyal-data-tools.readthedocs.org/en/latest/) at ReadTheDocs for more info on deployment and development as well as a user guide.

Note: `dev` branch docs can be found [here](http://conveyal-data-tools.readthedocs.org/en/dev/).

## Shoutouts 🙏

<img src="browserstack-logo-600x315.png" height="80" title="BrowserStack Logo" alt="BrowserStack Logo" />

Big thanks to [BrowserStack](https://www.browserstack.com) for letting the maintainers use their service to debug browser issues.

<img src="https://www.graphhopper.com/wp-content/uploads/2018/03/graphhopper-logo-small.png" height="25" alt="GraphHopper Logo" />

Street snapping powered by the <a href="https://www.graphhopper.com/">GraphHopper API</a>.
Loading