pulling github back to local machine

Now that I had a clean slate in terms of my dev setup, I needed to pull my github changes back to my local machine. Currently my .git/config looked like this: [remote "origin"] url = https://github.com/hyperkitty/hyperkitty.git fetch = +refs/heads/*:refs/remotes/origin/* [branch "master"] remote = origin merge = refs/heads/master To pull my github changes (which I had forked from the main repo), I made these changes to .git/config: [remote "origin"] url = git@github.com:/hyperkitty.git fetch = +refs/heads/*:refs/remotes/origin/* [remote "upstream"] url = https://github.com/hyperkitty/hyperkitty.git fetch = +refs/heads/*:refs/remotes/origin/* [branch "master"] remote = origin merge = refs/heads/master With these changes,…Read more …

troubleshooting rvm install

In an effort to get reacquainted with Ruby on Rails, I embarked on installing rvm on my machine. Unfortunately, right out of the box, I ran into a few problems. Since I already have macports and the latest Xcode installed (along with its command lines tools), I started the installation process off by running : \curl -L https://get.rvm.io | bash -s stable --rails --autolibs=enabled However, running that gave me this error message: curl: (60) SSL certificate problem: self signed certificate in certificate chain More details here: http://curl.haxx.se/docs/sslcerts.html I tried a bunch of options…Read more …

configuring 3rd party blogging software for blogger

In case anyone else had trouble searching for how to setup a 3rd party app (in my case, MarsEdit) to be used with Blogger, here's what you need to know: Blog ID: Follow these instructions to find your Blog ID. API Endpoint URL: http://www.blogger.com/feeds/[YourBlogID]/posts/default  Read more …

learning about git rebase and git format-patch

After reading a lot about git merge and git rebase, my takeaway is this: Use git rebase when: Working alone on a feature branch that isn't and won't be shared with anyone. Rebasing will keep your history cleaner. You're done working on a feature branch and about to integrate it into the main branch. Use rebase to sanitize your history and squash/rewrite history as needed before the 'big merge' onto the main branch. Use git merge when: Working alone on a feature branch and others may be work off of your branch. This…Read more …

mobile layouts

Recently I've been trying to figure out the best mobile layouts for some of the hyperkitty pages. The challenge has been that there is often a lot of content on these pages, so figuring out a clean way to display that on a small screen can be tricky. The screenshots below give you a sense of what I've been playing around with. These are for 3 different screen widths of the overview page: 320px screen width: 640px screen width: 768px screen width: The 320px is for the smallest Android screens, 640px is a…Read more …