jangellx / MagicMirror

My variant of Michael Teeuw's Magic Mirror website
41 stars 14 forks source link

Pull request #2 #2

Closed amosko closed 8 years ago

jangellx commented 8 years ago

No problem -- you're the first pull request I've received. :) There's some useful stuff in here that I'd like to integrate into my version, like the tweets, and making the jewish calendar optional for people who want that.

Now that I know you didn't meant to submit a pull request, the changes make a lot more sense -- this is meant for you, not everyone else.

amosko commented 8 years ago

Exactly :). Feel free to use some of my stuff though. The tweets no longer support HTTPS but I think it's working since I changed to HTTP. I think they are also no longer supporting the API.

The jewish calendar was a generic build but Hebcal does have a more functional API to do more customization. I'm very novice with programming so it was beyond my capabilities.

I merged our two repos (since I didn't know how to fork at the time and simply cloned it)

Everything seems to be going well except my calendar blinks in and out. Any thoughts?

On Fri, Jul 15, 2016 at 12:18 PM, jangellx notifications@github.com wrote:

No problem -- you're the first pull request I've received. :) There's some useful stuff in here that I'd like to integrate into my version, like the tweets, and making the jewish calendar optional for people who want that.

Now that I know you didn't meant to submit a pull request, the changes make a lot more sense -- this is meant for you, not everyone else.

— You are receiving this because you modified the open/close state. Reply to this email directly, view it on GitHub https://github.com/jangellx/MagicMirror/pull/2#issuecomment-232997999, or mute the thread https://github.com/notifications/unsubscribe-auth/AHYb2psysiFOnx9FLdktofJHUmXnQ7gCks5qV7LSgaJpZM4JNinf .

jangellx commented 8 years ago

Not off the top of my head, but I can clone your fork this weekend and take a look.

I'm a seasoned C programmer, but a fairly novice Javascript one. Luckily, it's very C-like. This was also my first GitHub project, so I had trouble with the fork vs. clone stuff (still not totally sure I got it right).

amosko commented 8 years ago

Thanks a lot. I'm very new to programming and newer to github so I have no idea what I'm doing :) I guess I'll learn by doing

On Fri, Jul 15, 2016 at 12:29 PM, jangellx notifications@github.com wrote:

Not off the top of my head, but I can clone your fork this weekend and take a look.

I'm a seasoned C programmer, but a fairly novice Javascript one. Luckily, it's very C-like. This was also my first GitHub project, so I had trouble with the fork vs. clone stuff (still not totally sure I got it right).

— You are receiving this because you modified the open/close state. Reply to this email directly, view it on GitHub https://github.com/jangellx/MagicMirror/pull/2#issuecomment-233000655, or mute the thread https://github.com/notifications/unsubscribe-auth/AHYb2i9QVVdSHC9fxF_lYLKhCsVwzIetks5qV7VsgaJpZM4JNinf .