Merge commit '4a178f19bdd0ca8cafdff9f622dcc8b142b2c77f'

# Conflicts: # frontend/pd-editor # frontend/src/assets/styles/_osmus.scss # frontend/src/assets/styles/_variables.scss # frontend/src/components/header/index.js # frontend/src/components/messages.js # frontend/src/components/pdEditor.js # frontend/src/config/index.js # frontend/src/views/project.js # frontend/yarn.lock
osmus · Dec 4, 2024 · 5a0bac6 · 5a0bac6
2 parents ade9c6c + 4a178f1
commit 5a0bac6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/frontend/pd-editor b/frontend/pd-editor
diff --git a/frontend/src/components/pdEditor.js b/frontend/src/components/pdEditor.js
@@ -92,7 +92,7 @@ export default function PDEditor({ setDisable, comment, presets, imagery, apiUrl
         url: apiUrl,
         client_id: PD_CLIENT_ID,
         client_secret: PD_CLIENT_SECRET,
-        //redirect_uri: BASE_URL + '/static/id/land.html',
+        redirect_uri_base: BASE_URL + '/static/pdeditor/',
       });
 
       const thereAreChanges = (changes) =>
+6 −3		dist/iD.js
+2 −2		dist/iD.js.map
+29 −29		dist/iD.min.js
+3 −3		dist/iD.min.js.map
+7 −3		modules/services/osm.js