search

DjangoGirlsSeoul / lightandleadership

Non-profit web project using python and django
Apache License 2.0
5 stars 6 forks source link

Helpertext #25

Closed RachellCalhoun closed 8 years ago

RachellCalhoun commented 8 years ago

added helper text to model for ourstory. Also changed order = charfield so I can save.order as a title in admin page. Also added customization in admin as well to show order/color?

RachellCalhoun commented 8 years ago

@hassanabidpk or @jinpark can you check it out?

RachellCalhoun commented 8 years ago

i think i did everything @jinpark asked. let me know if i missed something.

RachellCalhoun commented 8 years ago

So, merge? or is there something else I should do?

jinpark commented 8 years ago

still reviewing :D

I'll comment if it seems fine

jinpark commented 8 years ago

Oh yes, you should merge master INTO this branch.

RachellCalhoun commented 8 years ago

git checkout helpertext git rebase master ? or just git merge master and it's not master because it's fork. SO...i don't know.

jinpark commented 8 years ago

If you forked from the djangogirlsseoul repo

git fetch upstream git checkout master git merge upstream/master git checkout helpertext git merge master

Copied from https://help.github.com/articles/syncing-a-fork/

jinpark commented 8 years ago

I'm not a big fan of rebasing. I would suggest reading https://www.atlassian.com/git/tutorials/merging-vs-rebasing/workflow-walkthrough on why I don't think we should do rebase on our public projects

RachellCalhoun commented 8 years ago

I did something, it didn't work. I'm lost.

jinpark commented 8 years ago

Lets hold off on this PR until next time we meet

RachellCalhoun commented 8 years ago

Well, all my PRs are kinda weird now. My master is correct but my branch won't merge, it says its up to date with master but i can't see the tinymce changes reflected in the helpertext branch.

jinpark commented 8 years ago

why would all your PRs be weird? Looks like all the other ones are fine.

This one undos the mce PR you had before probably due to incorrect merging