-
Notifications
You must be signed in to change notification settings - Fork 0
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
Integrate django-messages #12
Comments
http://django-messages.readthedocs.io/en/latest/index.html Follow through that... it shouldn't take you long. But the final result is pretty much as I stated above. To clarify:
Remember, if you create and push branches, and commit to them regularly, I can follow your work even if it's only partially complete and not ready for master. |
I made changes but they went into master instead of creating a new messages branch. How do I undo the changes in master? |
Git says branch messages exists, and I changed to the messages branch but when I pushed it went into master and messages branch does not exist on Github. I'm not sure if I typed something wrong or there is an issue with Github? But the messages changes got put into master. |
Like you learned in #14. Anyway, don't worry about it... let's just tidy up the messages branch, merge it into master, and push it to prod! Try not to do that in the future though: YOU BROKE THE BUILD! (master should run easy as!) |
Now, the problems I've noticed so far:
But there are other problems! |
There is an incompatibility with Django 1.1 and django-messages: arneb/django-messages#69 We need to use an earlier version of django, or find a fixed django-messages branch, or wait for them to fix it... got any ideas? |
I think django-messages is fucked up enough that it will be worth forking it, and merging in some changes from other people's forks? So, look into that too! |
Let's close this once you've merged in messages-fixed into messages... |
I think they should have fixed it by now. I copied the modified files in messages-fixed into messages. |
Always merge, but I think you've got all that now...
No they haven't, it's broken with the latest build without pip unzip, which is deprecated... we will fork django-messages and use our own version and bring in the fixes from other forks that have fixed the issue... is no biggie and is good practice when we make our own modules.
Well, if you're happy you can close this issue... or you can merge messages into master if you like first. |
Actually, I checked it, it looks good... merge it into master then close this issue. Also delete the messages-fixed branch after that... no need for it. |
Alright... kind of failed to merge it into master, because you tried to back out the broken master. So, merge master back into messages, then fix up messages again, then merge messages back into master. so, before you merge anything into master, make sure you merge master into the branch first... so you are working with the latest master, no matter what. These are teething problems. |
Pretty sure this is done, right? |
Depends: #8
Branch: messages
We're going to integrate django-messages so users can PM each other!
First steps:
- add django-messages to setup.py
- add django-messages to k666/settings.py
- add django-messages to k666/urls.py
- add link to inbox somewhere.
The text was updated successfully, but these errors were encountered: