Skip to content
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.

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

Transfer js code in archive.html into separate .js file #1206

Closed
wants to merge 5 commits into from

Conversation

Tammy-Ajoko
Copy link
Contributor

@Tammy-Ajoko Tammy-Ajoko commented Oct 20, 2022

Fixes #1182

Make sure these boxes are checked before your pull request (PR) is ready to be reviewed and merged. Thanks!

  • PR is descriptively titled 📑 and links the original issue above 🔗
  • tests pass -- look for a green checkbox ✔️ a few minutes after opening your PR -- or run tests locally with grunt test
  • code is in uniquely-named feature branch and has no merge conflicts 📁
  • screenshots/GIFs are attached 📎 in case of UI updates
  • [@TildaDares @jywarren ]

Please be sure you've reviewed our contribution guidelines at https://publiclab.org/contributing-to-public-lab-software

Thanks!

@gitpod-io
Copy link

gitpod-io bot commented Oct 20, 2022

@TildaDares
Copy link
Member

TildaDares commented Oct 25, 2022

Hi @Tammy-Ajoko, can you resolve the merge conflicts? Thanks!

@Tammy-Ajoko
Copy link
Contributor Author

@TildaDares I have resolved the conflicts

@jywarren
Copy link
Member

Hello, this looks good but I am a bit worried about conflicts with other PRs which are creating code within this file. @TildaDares how should we proceed? It looks ready to merge now, but this will create some disruption with other PRs.

@TildaDares
Copy link
Member

@jywarren I propose that we postpone merging this PR so that the migration can take place in just one PR considering that some of the other PRs are modifying JS code.

@jywarren
Copy link
Member

jywarren commented Oct 25, 2022 via email

@jywarren
Copy link
Member

Hello, thank you for your contribution! We've ended up making the change in another PR, my apologies for the poor ordering of these changes, as we ran into some conflicts and it was not your fault at all. Your code here is perfect, just closing since the process is now complete. Many thanks!

@jywarren jywarren closed this Dec 12, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Transfer js code in archive.html into separate .js file
3 participants