Merge remote-tracking branch 'upstream/pull/2914' into master

tomhughes · Oct 27, 2020 · d41737c · d41737c
2 parents 10c4529 + b1694ce
commit d41737c
Show file tree

Hide file tree

Showing 124 changed files with 89,211 additions and 106,526 deletions.
diff --git a/app/assets/javascripts/edit/id.js.erb b/app/assets/javascripts/edit/id.js.erb
@@ -27,7 +27,10 @@ $(document).ready(function () {
     if (hashParams.locale) params.locale = hashParams.locale;
     if (hashParams.maprules) params.maprules = hashParams.maprules;
     if (hashParams.offset) params.offset = hashParams.offset;
+    if (hashParams.photo) params.photo = hashParams.photo;
+    if (hashParams.photo_dates) params.photo_dates = hashParams.photo_dates;
     if (hashParams.photo_overlay) params.photo_overlay = hashParams.photo_overlay;
+    if (hashParams.photo_username) params.photo_username = hashParams.photo_username;
     if (hashParams.presets) params.presets = hashParams.presets;
     if (hashParams.source) params.source = hashParams.source;
     if (hashParams.walkthrough) params.walkthrough = hashParams.walkthrough;