search

MineForeman / minepeon-base

minepeon-base
GNU General Public License v2.0
24 stars 17 forks source link

Ajax Update, live status update #49

Closed mariogrip closed 10 years ago

mariogrip commented 10 years ago

I added this to 0.3.0 branch for testing, (ajax + minepeon looks awesome!)

(I do not have an BeagleBone Black)

mariogrip commented 10 years ago

btw, how does ajax works for you? (it runs perfect on RPi, how does it perform on a BBb?)

mariogrip commented 10 years ago

I might add a setting to edit refresh time and option to disable live update.

MineForeman commented 10 years ago

It runs great on the BBB as well. Email me your postal address and I will get one on its way to you (along with a serial cable and a few SD's)

I still cannot pull this, did you re-sysnc before you pushed?

mariogrip commented 10 years ago

Humm, Yeah, i did re-sync, it should be up to date with branch 0.3.0. I have some more stuff to push, but i will wait until this is fixed.

(How about adding me as an github collaborator?)

-Mariogrip (did you get my e-mail?)

MineForeman commented 10 years ago

Still wont merge.

I will try with the command line.

mariogrip commented 10 years ago

Ah, i see the problem. give me an minute to fix that.

mariogrip commented 10 years ago

did you add all my commits from my branch "master" to your "master"?

MineForeman commented 10 years ago

Yeah, that is the issue. I (should) only merge branches to master and 0.3.0 is not ready for that.

If you could do it against 0.3.0 that would be great.

mariogrip commented 10 years ago

Now my fork is fixed (now you can add me as an collaborator if you want, or do you want me to send a pull request)

MineForeman commented 10 years ago

Can you send a pull.

I am looking at adding you as a contributor but I am having trouble getting fine grained access to repo's. I have several private repo's that have other stuff in it that I cannot let out (hashfast and spondoolies).

Neil