Activities page #53

Merged
merged 3 commits into from Apr 18, 2013

Conversation

Projects
None yet
3 participants
Member

kgrz commented Apr 4, 2013

Seperated this commit to a different branch in my local repo. Closed previous PRs.

Owner

zzak commented Apr 4, 2013

@kgrz Thanks, sorry I haven't had time to check this out yet, been distracted by 🐱s mostly

Member

kgrz commented Apr 4, 2013

On Thursday, April 4, 2013, Zachary Scott wrote:

@kgrz https://github.com/kgrz Thanks, sorry I haven't had time to check
this out yet, been distracted by [image: 🐱]s mostly

No problem. Sorry for the PR spam. Had to split this commit into a
different branch so that the asset management section can be merged to the
master and I had to figure out how to do it :)

Kashyap KMBC

Owner

zzak commented Apr 5, 2013

@kgrz I can't seem to figure out how to get this to work when checking it out locally.

I tried going to /p/activity but get an error for missing ./activity/README.md

There's also a puts in the helper that seems misplaced.

Owner

zzak commented Apr 5, 2013

@kgrz I'd also like to see this integrated in the site somehow, how should users access this page?

Member

kgrz commented Apr 5, 2013

On Friday, April 5, 2013, Zachary Scott wrote:

@kgrz https://github.com/kgrz I'd also like to see this integrated in
the site somehow, how should users access this page?

Through the sidebar. I added the link into the dropdown but made sure it
goes to the end of the list rather than the beginning since alphabetically
it ends up at the beginning.

Kashyap KMBC

Owner

zzak commented Apr 5, 2013

I don't see it in the list

Member

kgrz commented Apr 5, 2013

That is odd. I'll recheck.

On Friday, April 5, 2013, Zachary Scott wrote:

I don't see it in the list recipes activity


Reply to this email directly or view it on GitHubhttps://github.com/sinatra/sinatra-recipes/pull/53#issuecomment-15935182
.

Kashyap KMBC

Member

kgrz commented Apr 5, 2013

Hmm: http://cl.ly/image/3F060q030413 Perhaps you're on the master branch? My "activity_log" branch is still working and shows the activity log page as a menu item. Is there something else I can do?

Owner

zzak commented Apr 5, 2013

i checked out your branch on my machine:

Why am I being copied on these emails?

-Dave Thomas

On Apr 5, 2013, at 2:12 PM, Zachary Scott wrote:

i checked out your branch on my machine:


Reply to this email directly or view it on GitHub.

Member

kgrz commented Apr 7, 2013

Couldn't figure out the problem. So, launched a copy here: http://glacial-stream-7891.herokuapp.com/ Note that the "bin" folder in the dropdown is a heroku-specific thing.

I'm planning to add << previous and next >> buttons to the page and show only ~20 commits. Right now, this shows 100.

Owner

zzak commented Apr 7, 2013

@kgrz This looks good, I have a few requests:

  • Give this it's own route, using topic route you see the Did we miss something? part in the view. Let's skip that
  • Gravatars, let's show the users avatar along with their commit.
  • Move it out of sidebar nav, I think it deserves a first-class link somewhere on the site.

Your other ideas for pagination would also be good.

Thanks for working on this!

Member

kgrz commented Apr 16, 2013

@zzak Right. Made the changes you specified...and more. Check them here: http://glacial-stream-7891.herokuapp.com/activity

Note: Ignore the old commits that are showing up here. The last three commits are the relevant ones.

Owner

zzak commented Apr 16, 2013

Can you rebase and squash?

kgrz added some commits Mar 27, 2013

@kgrz kgrz Activities page 536382a
@kgrz kgrz Activity log
* Refactored code a little bit
* The display of commits is grouped on a per-author mode on a daily
* basis.
* For every day, all the commits under one author are listed under a
* single group in order to avoid repetition of avatars.
* Now has a separate link and it is tucked away under "Contributors"
* part.
* Shows 50 commits by default.
* Shows gravatars of the committers.
* No longer inside the side-nav element
* Spacing changes
8d071f0
@kgrz kgrz added gemfile.lock for heroku push 9cd540c
Member

kgrz commented Apr 16, 2013

@zzak Done

Member

kgrz commented Apr 16, 2013

Earlier, I did not have my fork's activity_log branch synced with master and so, wasn't able to rebase properly. I thought to keep it that way but got rid the idea since this will be merged with master anyway :)

Owner

zzak commented Apr 16, 2013

@kgrz Thanks, I'll merge this in in the next day or two.

It looks good, thank you for working on this!

Member

kgrz commented Apr 16, 2013

Or, I can merge it to master directly if you want me to. I opened a PR to get feedback :)

@zzak zzak merged commit 9cd540c into sinatra:master Apr 18, 2013

Owner

zzak commented Apr 18, 2013

@kgrz Thanks! Next step might be to extract the helpers to an extension.

What do you think?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment