-
-
Notifications
You must be signed in to change notification settings - Fork 240
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
Add auto-refresh on index page #99
Conversation
I'm willing to accept this if and only if it's configurable through I personally really dislike sites that just decide to auto-refresh on me because this always happens at the exact moment you're trying to copy-paste something. |
i'm user but i agree, it is only usefull if i can control it. |
Thanks for the suggestion. Setting REFRESH_RATE to 0 will disable the refreshing. |
Perfect. Two things:
|
Hmm, I don't think we should do this for refreshing personally. Instead, we really need to investigate an AJAX-based solution like Angular.js or similar. I'll test this out tomorrow but I'm pretty set on using a strategy that involved Javascript to dynamically update elements on the page instead of refreshing the entire page via a meta tag. |
I am personally happy with this solution until an AJAX solution emerges. @tjayL can you rebase this and we can merge it? |
@tjayL rebase? |
Sorry dude, |
@tjayL could you take a look again? it seems like a rebase is needed here. |
I am unsure what you are expecting of me here. I have put all of the changes for this into one commit. If i do a |
You've to do a rebase against the master:
this is untested and based on my memory, use the commands with caution. If you experience any issues you can ask here or also in #puppet-community on freenode |
Thanks bastelfreak. I have done that and pushed it back to my repo. |
did you push it in the wrong branch? I can't see anything changed here :( git is pure magic |
I pushed it into the master branch on my repo:
|
You need to add the original repo as an upstream. https://help.github.com/articles/configuring-a-remote-for-a-fork/ |
Or follow these steps. https://help.github.com/articles/merging-an-upstream-repository-into-your-fork/ |
Thanks for those guides. I think i have managed to do it. |
After the rebase you've to push (probably push -f) into your auto-refresh branch, than the changes will appear here. I can't see anything changed here. If you want, we can fiddle that out if you join #puppet-community. |
Got it. If there are still issues, i will jump on IRC to resolve them |
great, you based it \o/ but you missed two pieces off git diff code. could you rebase again and squash it down to one commit? |
envs=envs, | ||
current_env=env | ||
>>>>>>> f63a0cefcb71dfcd309fa508837dc131f90862a4 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
please remove this line
rebase done |
the code looks fine, could you squash the two commits into one? Than we should finally be ready to merge \o/ |
Would it be possible for you to create a new branch with just a single commit and a new PR? That could be easier than squashing this one. |
Done it (at last) |
thanks, looks perfect! |
Add auto-refresh on index page
* Version bump to 0.3.0 * pypuppetdb: Version bump to 0.3.1
Add an auto refresh to the index page.