-
Notifications
You must be signed in to change notification settings - Fork 8
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
Added a few things #16
base: master
Are you sure you want to change the base?
Conversation
…rakt widgets collapsed.
So, should I merge this? Git says it cannot be automatically merged and since it is a big big change I'm thinking of just replacing everything? This would mean Mikie would have to redo his updates? But I believe it is easier adding his stuff than all of this. I don't even remember everything I've modified. |
This is the update script yes? I would go for it and if it breaks bits, revert back. But I can't see why it would be a problem. Shame git does not explain why it cannot be merged. |
If you merge it on your local machine it will put arrows where there are conflicts and you can just re edit those files. But its chilled if you want to start over, I'll just add it manually. I quickly looked over the files and it seems that most of them are files I haven't edited at all so it shouldn't be too hard. I'll try do it a little later if I get the time |
My bad, pushed the wrong button! |
Other than that I've made all the changes to my repo I think EDIT: Getting an AJAX error as soon as the update page loads? Its this function function ajaxRequest(params, id) Then the pwait images slows.Its not actually downloading tho. Any ideas? Also how does it know what the current version number is? Like in the ini file its blank to begin? |
Why can this no longer be merged? I only just noticed and it really needs adding too. Should I just force them now? |
Mainly updating script. Will have to change to check the master repo and not mine anymore. Should be a matter of only modifying a couple of line here and there.