CodeCatz / TrackCat

A tool for tracking the progress of the kittens (and cat{s,z}) in our CodeCatz meetup group
MIT License
5 stars 14 forks source link

Navigation bar "folding" fixed by making the content smaller #127

Closed mojcas closed 9 years ago

mojcas commented 9 years ago

Address issue #75 (and to start adding dynamic members contents, a little bit addressing #112 .. or is it #115 ?)

anuschka commented 9 years ago

@mojcas : I believe on our meetup two weeks ago we agreed to address each issue in separate pull request (PR) and that we would create a branch for each issue we are addressing.

mojcas commented 9 years ago

@anuschka thanks for your comment. I have seen that, but didn't know how to create a branch, and I have no issues assigned, so I only did a couple of some small changes, as you can see. Some help please? :thought_balloon:

anuschka commented 9 years ago

@mojcas : You could just open an issue and get a hash number for it. Then on your local repository you first fetch and merge your master branch and after that create a new branch "git checkout -b hash-number-description". Make sure you are on the new branch by checking git branch and make the required change. When you are happy with the result locally you push your change to your gihub repository (git push origin hash-number-description) and you are all set for the PR. From this point you know it all :smile:

goranche commented 9 years ago

just open an issue and get a hash number for it

@anuschka why? there obviously already are issues for the stuff in this PR, they are referenced in the first comment (even if @mojcas isn't sure which issue she's solving :stuck_out_tongue: ) also, "hash number"? :smile: No! :angel: that is not a hash number

you can create branches with any name you want, in some cases it might be useful to use the issue number, in others (like in this case) it might not...

mojcas commented 9 years ago

@goranche so.. pull request complete? :wink:

anuschka commented 9 years ago

I though we reference our branches using the issue number :smile:

goranche commented 9 years ago

our branches

emphasis on "our"... the name of the branch affects only you, nobody else... yes, one way of doing it is adding the issue number to it, although I'm not a fan of it... as an example, I work on several projects, not all of which use github as an issue tracker (or even for source control), and remembering all issues by their number? ain't gonna happen

ok, you might say I'm a special case, sure... but then again, without looking(!), do you know what #55 is? what if you're working on several issues at once? or you're working on something that isn't an issue at all? ...

you can name your branches whatever you want, it affects only you and nobody else

mojcas commented 9 years ago

@ialja Happy to do it. there is something I'm not clear about it though. How will finally the members be created, ie. via Admin page, or self register, ..? The model is a bit strange, or it may not have the right Form yet. I tried populate data using admin, but there's a wee problem with that, for example the member picture gets placed in an incorrect directory. So if there is going to be some other way, it'd be great to have that first, before finally finalizing the member page. Also, waiting for @anuschka to complete her login/authorized pages, along with the navigation, to see what we will be showing to the public, and what will be for logged in users only. Cheers! :smile_cat:

ialja commented 9 years ago

Once TrackCat is finalized, we'll be registering/logging in with GitHub; while in development, just add users and their profiles through Admin (and yes, it is possible there are still bugs to be fixed :wink:).

Limiting page visibility is another issue that we'll be adding soon, but you can ignore it for now, as the app isn't published anywhere.

By the way, this is a good link to learn more about branches: https://www.atlassian.com/git/tutorials/using-branches/git-branch

mojcas commented 9 years ago

Now.. do I need to wait for this to be completed, or I should close this PR, and then create a new PR? :thought_balloon:

ialja commented 9 years ago

GitHub authentication doesn't affect the display of members. To keep things clean, it might be best to remove member stuff from this PR, and then create a new branch and a new PR with dynamic member listing.

mojcas commented 9 years ago

@ialja I'm on it.. thinking to close this PR, and create new one, for each of these issues..

mojcas commented 9 years ago

Will close this, and create a new clean PR