-
Notifications
You must be signed in to change notification settings - Fork 27
Conversation
There seems to be a lot in this pull request which isn't specific to the site, and generic playdoh stuff. Is it possible to split it into two? |
Shoot, I apologize if I'm not setting this up correctly. I've been operating with firefox-flicks as the example of how to set up a Playdoh app (https://github.com/mozilla/firefox-flicks), and thought all this was supposed to be there. Or do you mean split into two pull requests? Ryan Pitts On Tuesday, June 12, 2012 at 11:05 AM, davidascher wrote:
|
Yeah I'm thinking that it'd be good to see the app specific stuff in its |
OK, closing this one then. |
It doesn't look like I can split the pull request in two, because everything was pushed to my fork in the same commit. I think the only way to make that happen would be to destroy my fork and create a new one, and then commit in two parts. Unless I'm missing an alternate method. Any thoughts? |
You can use git rebase --interactive to split your commits into smaller commits; if you'd like some help with this, feel free to ask |
Ah! That's really good to know. Thank you. On Jun 14, 2012, at 2:27 PM, Jon Buckleyreply@reply.github.com wrote:
|
The diff is big, so it's hard to do in-line comments. Instead, I have a series of bullets...
All in all, it's a good app, pretty straight forward. I don't see anything to be worried about. |
Awesome, great comments. I'll check that pull request. Caching and tests are definitely on my task list, I just needed to get something workable up and running quickly for a demo deadline. That's what I was thinking re: the sqlite db as well, but now that you mention it, I don't know why I didn't just include fixtures. I split the apps into those categories because initially I was thinking there might be a lot more to each one of them. Feels like they could pretty easily be pulled back together into one master app, though, especially with how tightly intertwined those content types are. Did you have a different though on how you might organize those? Would love to hear it. |
adding the missing submodules
Some commits from over the weekend, when I had a chance to work directly with Erin. Nothing that changes structure of the app or adds any dependencies. Just a few field tweaks, and the addition of fixtures that include real demo data. Once this points at a stable db, |
Ryan, have just seen that you've committed your local.py to the repo. You're going to want to delete this from the pull request and add it to the .gitignore If there are default values you want people to have when they set it up locally add those to the local.py-dist. |
You know, I was wondering about that. The .gitignore created by the Playdoh install includes a line for local_settings.py, so maybe that's an artifact from when Playdoh was arranged a bit differently? This makes total sense, will push a fix right now. |
Yeah that's exactly right - settings_local.py was from way back when you Then since found out that was a bad idea so moved it into it's own Feel free to send playdoh a pull request - one for the .gitignore and one On Thu, Jun 21, 2012 at 5:52 PM, Ryan Pitts <
|
…ride local settings
Few updates to the project README
Interesting, the Playdoh .gitignore looks fine. https://github.com/mozilla/playdoh/blob/master/.gitignore So maybe this is a problem when you use funfactory to create the project? Ryan Pitts On Thursday, June 21, 2012 at 10:00 AM, Ross Bruniges wrote:
|
My guess is that the playdoh one gets trumped by the one in root, or that On Thu, Jun 21, 2012 at 6:13 PM, Ryan Pitts <
|
Initial demo version Been given the thumbs up by Chris McAvoy and Ross Bruniges
No description provided.