-
Notifications
You must be signed in to change notification settings - Fork 281
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
Conversation
* js code in archive.html extracted into .js
Hi @Tammy-Ajoko, can you resolve the merge conflicts? Thanks! |
@TildaDares I have resolved the conflicts |
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. |
@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. |
Ok, agreed!!
…On Tue, Oct 25, 2022, 1:03 PM Tilda Udufo ***@***.***> wrote:
@jywarren <https://github.com/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.
—
Reply to this email directly, view it on GitHub
<#1206 (comment)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/AAAF6J542L54PRYK5KYXBGLWFAHGPANCNFSM6AAAAAARKGNJ4Q>
.
You are receiving this because you were mentioned.Message ID:
***@***.***>
|
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! |
Fixes #1182
Make sure these boxes are checked before your pull request (PR) is ready to be reviewed and merged. Thanks!
grunt test
Please be sure you've reviewed our contribution guidelines at https://publiclab.org/contributing-to-public-lab-software
Thanks!