Skip to content

D3 color upstream merge #2053

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
maxgrossman wants to merge 5,360 commits into
base: d3-color
Choose a base branch
from
Open

D3 color upstream merge #2053

maxgrossman wants to merge 5,360 commits into from

Conversation

@maxgrossman
Copy link
Contributor

@maxgrossman maxgrossman commented Apr 14, 2023

merges iD tag v2.25.1 into the d3-color pr. worked up to point that ui will compile and load. issues still left to resolve

  • work through the sass->css compiling. while the esbuild sass plugin introduced seems to succeed i don't know if the sass is actually being bundled in the iD.css file. maybe there's a separate css file our sass historically was bundled into that i'm not seeing because the merging overwrote the reference in the index.html?
  • to deal with resolving the runtime errors I would see when I first got the app to load in my browser, i commented out a number of svg imports we added in the _icons.scss file. if you uncomment them the esbuild will start to fail so we'll need to work this out
  • smoke test all of our hoot customizations.

tyrasd and others added 30 commits June 24, 2022 11:45
@tyrasd
refactor uiSections to not inject html
28eae9e
@tyrasd
refactor panels to not inject html
6626ea0
@tyrasd
refactor validation modules to not inject html
8bb1d39
@faebebin
Fix connect features when crossing with pedestrian signals
9dcc6d1
@tyrasd
don't inject html code in preset names
209cc23
@tyrasd
refactor further modules to not rely on html injection
7d546a8
@dependabot
Bump d3 from 7.4.5 to 7.6.1 (#9194)
7a4f02a 
Bumps [d3](https://github.com/d3/d3) from 7.4.5 to 7.6.1.
- [Release notes](https://github.com/d3/d3/releases)
- [Changelog](https://github.com/d3/d3/blob/main/CHANGES.md)
- [Commits](d3/d3@v7.4.5...v7.6.1)

---
updated-dependencies:
- dependency-name: d3
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@k-yle
fix rendering of proposed bridges (#9172)
027fc1e
@tyrasd
add #9172 to changelog
379faf8
@tyrasd
Merge branch 'label-rendering' into develop
b61dfe7
@tyrasd
fix typo in flash module, make linter happy
7c9b47e
@tyrasd
fix some boundaries not hidden by the filter, closes #9171
03d6bb0
@HolgerJeromin
Fix link to discussion tab (#9204)
ce89fd6
@dependabot
Bump @mapbox/maki from 7.2.0 to 8.0.0 (#9199)
0b02108 
Bumps [@mapbox/maki](https://github.com/mapbox/maki) from 7.2.0 to 8.0.0.
- [Release notes](https://github.com/mapbox/maki/releases)
- [Changelog](https://github.com/mapbox/maki/blob/main/CHANGELOG.md)
- [Commits](mapbox/maki@v7.2.0...v8.0.0)

---
updated-dependencies:
- dependency-name: "@mapbox/maki"
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@tyrasd
update changlog with upgraded libraries
fe91e9a
@naveensrinivasan
chore: Set permissions for GitHub actions (#9177)
2bf047f 
Restrict the GitHub token permissions only to the required ones; this way, even if the attackers will succeed in compromising your workflow, they won’t be able to do much.

- Included permissions for the action. https://github.com/ossf/scorecard/blob/main/docs/checks.md#token-permissions

https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#permissions

https://docs.github.com/en/actions/using-jobs/assigning-permissions-to-jobs

[Keeping your GitHub Actions and workflows secure Part 1: Preventing pwn requests](https://securitylab.github.com/research/github-actions-preventing-pwn-requests/)

Signed-off-by: naveen <[email protected]>
@tyrasd
Bump @tmcw/togeojson from 4.7.0 to 5.2.1, closes #9170
42a985b 
Bumps [@tmcw/togeojson](https://github.com/placemarkio/togeojson) from 4.7.0 to 5.2.1.
- [Release notes](https://github.com/placemarkio/togeojson/releases)
- [Commits](https://github.com/placemarkio/togeojson/commits)

---
updated-dependencies:
- dependency-name: "@tmcw/togeojson"
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
@CorruptComputer
Update issue template for Bug reports (#9162)
0904178
@k-yle
support incrementing cardinal directions with the 🔼/🔽 buttons (#9141)
81f3b06
@tyrasd
add changelog entry for #9141
ad22c45
@dependabot @tyrasd
Bump mocha from 9.2.2 to 10.0.0, closes #9132
fc77a56 
Bumps [mocha](https://github.com/mochajs/mocha) from 9.2.2 to 10.0.0.
- [Release notes](https://github.com/mochajs/mocha/releases)
- [Changelog](https://github.com/mochajs/mocha/blob/master/CHANGELOG.md)
- [Commits](mochajs/mocha@v9.2.2...v10.0.0)

---
updated-dependencies:
- dependency-name: mocha
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
@renancleyson-dev @tyrasd
Fix iD using invalid user selected imagery
1313e4b
@renancleyson-dev @tyrasd
Fixes CHANGELOG.md
ce67f53
@tyrasd
apply "is background valid" on "last used" instead of "requested" layer
eee346e
@tyrasd
Merge pull request #9076 from renancleyson-dev/fix-imagery-unselected
c2a54f0 
Fix iD using invalid user selected imagery
@tiziodcaio @tyrasd
Update Workflows (#9057)
8a7b0cf 
Co-authored-by: Daniele Basso <[email protected]>
Co-authored-by: Martin Raifer <[email protected]>
@hodigabi
Remove double spaces and fix links in Architecture.md (#8996)
71a7739
@tyrasd
Merge remote-tracking branch 'k-yle/render-ref-as-label' into develop
645d73a
@tyrasd
Merge remote-tracking branch 'bvercelli99/remember-location-hash' int…
981628b 
…o develop
@tyrasd
simplify map location restore, see #9146
67c6588
tyrasd and others added 29 commits January 26, 2023 18:29
@tyrasd
mention Röntgen icon set in bundled resources list
8e046be
@tyrasd
replace mapbox imagery with dedicated api tokens
afa4d4d
@tyrasd
implement date field, for #9477
adcbdae
@tyrasd
fix linter issues
3238d34
@tyrasd
show 'set to today' button also on 'survey:date' field
fc5b78b
@tyrasd
switch to tagging schema v6 release candidate (#9477)
61087e4
@tyrasd
fix max zoom supplied in manual_imagery
f29344b
@tyrasd
rotate maxar imagery token
de7d278
@tyrasd
resubmit changelog entry for v2.24.2
a0f3df3
@tyrasd
allow to specify presets cdn via env variable or dotenv file
243c7fd
@tyrasd
fix variable name in previous commit
574cba9
@tyrasd
make OSM API connection details configurable via env vars
050c164
@tyrasd
also make other CDNs and services configurable via env vars
45c746e
@tyrasd
upgrade id-tagging-schema to v6.0.0
9ed6567
@tyrasd
npm run imagery
f06f4f8
@tyrasd
npm run translations
ec20ead
@tyrasd
v2.25.0
5ebb8d2
@tyrasd
Check in build
b382bae
@tyrasd
v2.25.1 patch
bae9702
@maxgrossman
adding d3_event to more callbacks ya!
7fe487f
@maxgrossman
Merge tag 'v2.25.1' into d3-color-upstream-merge
62ea1fe
@maxgrossman
merge fixing
ad535f7
@maxgrossman
more merge resolving
9c25c24
@maxgrossman
more work to get frontend to compile
dbcc00c
@maxgrossman
get development server running and start working through runtime errors
0cfb451
@maxgrossman
do not commit gitignored/symlinked img files
90ecdc6
@maxgrossman
ignore esbuild generated pngs, remove globals with favor for envs.mjs
6682f69
@maxgrossman
ignore button dark extend
5023d5b
@maxgrossman
getting the application to load
7ea1b7e
@maxgrossman maxgrossman mentioned this pull request Apr 14, 2023
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.