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

[WIP] initial recent activity page #76

Open
wants to merge 7 commits into
base: master
Choose a base branch
from

Conversation

gjaldon
Copy link
Contributor

@gjaldon gjaldon commented Nov 8, 2016

refs: #72

  • get diff of new content and old content in modified articles
  • style recent activity page (only display modified lines and their line number for modified articles)
  • get author information from commit (or should I get that from article?)

@hannesm
Copy link
Collaborator

hannesm commented Nov 8, 2016

this looks good to me for a start... can we have the commit timestamp and the author information (and a diff of the content) -- and not only the uri which was modified/added...

deletion: well, using this strategy it is hard to detect, I thought that we might be able to fold over the commits and extract the information of removed/added/modified files from the commit...

atom output should be pretty straightforward (but let's first make the html page and see what metadata we can get there)!

@gjaldon
Copy link
Contributor Author

gjaldon commented Nov 16, 2016

Latest push gets all changes to files (updates, deletes, creations) for every commit. I'll have to filter files that aren't articles (files with no article metadata) and limit the recent changes that would be displayed in the page. Then I'll move on to fixing how the context is displayed.

@hannesm
Copy link
Collaborator

hannesm commented Nov 22, 2016

I'm sorry, I'm currently lacking time to look into this very nice PR. Hopefully soon.

@gjaldon
Copy link
Contributor Author

gjaldon commented Nov 24, 2016 via email

@gjaldon
Copy link
Contributor Author

gjaldon commented Dec 8, 2016

@hannesm I'm still keen on finishing up this PR. Latest push includes a diff algo that I ported from https://github.com/paulgb/simplediff/. It uses arrays and a lot of side-effects.

diffs in recent activity page
Edited articles now show lines that are deleted (prefixed with '-') and lines that are added (prefixed with '+'). Will need to work on styling next and refactoring that really long get_diff function. I'm thinking of moving it to its own module.

@hannesm
Copy link
Collaborator

hannesm commented Dec 10, 2016

nice! :) yes, a custom module (maybe even a custom library, since this might be useful in other contexts, and as you mentioned there is no standalone small library providing such functionality (apart from patdiff which depends on core)).

@hannesm
Copy link
Collaborator

hannesm commented Mar 6, 2017

Could you rebase this on master (there are merge cinflicts)

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

2 participants