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

Implementing Inline commenting #1438 #1571

Merged

Conversation

aspriya
Copy link
Collaborator

@aspriya aspriya commented Aug 8, 2017

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

  • all tests pass -- rake test:all
  • code is in uniquely-named feature branch, and has been rebased on top of latest master (especially if you've been asked to make additional changes)
  • pull request is descriptively named with #number reference back to original issue

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

We have a loose schedule of reviewing and pulling in changes every Tuesday and Friday, and publishing changes on Fridays. Please alert developers on plots-dev@googlegroups.com when your request is ready or if you need assistance.

Thanks!

@ananyo2012
Copy link
Member

@aspriya Good job! Is this ready ? You can make a research note at https://publiclab.org/post to showcase your Work.

@aspriya
Copy link
Collaborator Author

aspriya commented Aug 22, 2017

@jywarren and @ananyo2012, Following link is a video discription for the things I have implemented above.
https://youtu.be/GjsVmNXftFk

@aspriya
Copy link
Collaborator Author

aspriya commented Aug 23, 2017

@ananyo2012, yes I think this is good to go and I have written a research note about this feature to introduce it.
link for the research note: https://publiclab.org/notes/Ashan/08-23-2017/introducing-inline-commenting-for-wiki-pages

Thanks

@jywarren
Copy link
Member

@icarito can we test this on the new unstable branch to see how it works? Would you mind deploying it over there? Thanks!

@icarito
Copy link
Member

icarito commented Aug 25, 2017

Okay I missed this but let's push this to unstable and see how it goes.

@icarito icarito changed the base branch from master to unstable August 25, 2017 13:07
@icarito icarito merged commit a008567 into publiclab:unstable Aug 25, 2017
@jywarren
Copy link
Member

Whoa i didn't know you could switch branches in GitHub... so we'd open a new one to merge to master if this works? Thanks!

@jywarren
Copy link
Member

And what is the link for unstable's instance? so we can try it out?

@jywarren
Copy link
Member

Hm, next time maybe we should update stable from master first, because this PR now includes Aspriya's changes plus all previous PRs back to the last time stable was synced from master. That's OK -- i can open a new PR with the original intent?

@aspriya -- you can still push to this feature branch, so that's fine. Can you think about writing functional tests for create_inline_comment and inline_comments in the comment controller?

@jywarren
Copy link
Member

@icarito shall we open a new PR for the original => master merge, or can this one be switched back now that unstable is updated?

@aspriya
Copy link
Collaborator Author

aspriya commented Aug 25, 2017

@jywarren, sure I will start writing tests for those. Thanks 😃

@icarito
Copy link
Member

icarito commented Aug 25, 2017

Guys earlier today I went ahead and merged this into unstable branch from the Github interface. A few minutes later, voilá: http://unstable.publiclab.org/
I did not have to intervene.
The build log is at http://jenkins.laboratoriopublico.org/job/Plots-Unstable/lastBuild/ including the migration.
Hope it's useful!

@jywarren
Copy link
Member

jywarren commented Aug 25, 2017 via email

@icarito
Copy link
Member

icarito commented Aug 25, 2017 via email

@icarito
Copy link
Member

icarito commented Aug 25, 2017

image

@icarito
Copy link
Member

icarito commented Aug 25, 2017

See the pull-down menu to pick the base under the editbox

@icarito
Copy link
Member

icarito commented Aug 25, 2017 via email

@icarito
Copy link
Member

icarito commented Aug 25, 2017 via email

@icarito
Copy link
Member

icarito commented Aug 25, 2017 via email

@jywarren
Copy link
Member

jywarren commented Aug 25, 2017 via email

@jywarren
Copy link
Member

jywarren commented Aug 25, 2017 via email

@jywarren
Copy link
Member

I was able to open an inline comment box, but nothing happened when I pressed publish.

Should the button become "depressed" like in the regular comment box?

Also, instead of the page title appearing in the inline comment box, maybe just "Comment"?

Looking good though!

@jywarren
Copy link
Member

And yes, @aspriya, please open a new PR - though it can be from the same branch!

@ananyo2012
Copy link
Member

I tested this too. There must be some error in submission as I too don't see the comment being published when I publish the comment button. Also I see when I try to edit the line in inline-markdown-editor the line is not updated immediately. I see it updated only when I refresh the page. The Ajax style implementation is not working.

@jywarren
Copy link
Member

jywarren commented Aug 29, 2017 via email

@aspriya
Copy link
Collaborator Author

aspriya commented Aug 29, 2017 via email

@jywarren
Copy link
Member

Hm, ok - (also you can't upload images by email but only on Github.com)

@icarito is unstable really quite slow and might this be working but really slowly? Is there any way to improve responsiveness on unstable? I've noticed slowness myself.

@icarito
Copy link
Member

icarito commented Aug 30, 2017 via email

@aspriya aspriya mentioned this pull request Aug 31, 2017
3 tasks
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.

None yet

5 participants