Skip to content
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

Update central-develop to 0.16.x #5014

Merged
merged 628 commits into from
Mar 21, 2016
Merged

Conversation

aronasorman
Copy link
Collaborator

Summary

See title.

benjaoming and others added 30 commits January 29, 2016 21:53
Finally remove batch scripts; moved to installers repo
…ipts-finally

Revert "Finally remove batch scripts; moved to installers repo"
The "scripts path" it was testing was removed from the
KA Lite repo in #4771.
…1-remove-scripts-finally

Finally remove batch scripts; moved to installers repo
aronasorman and others added 20 commits March 8, 2016 15:03
Update points if there is server-client discrepancy
It's tied to the management command that backs it --
the UpdateProgressLog model which backs this app creates
a process_name attribute based on the invoked management
command, which in this case changed from languagepackdownload
to retrievecontentpack.
If the user clicks the button and no help is available,
show a warning message and disable the button.

Also fixes the pattern matching for the management page.
The previous element no longer exists.
Selectors were broken, and bootstrap src must be made available
for reloading.
the fix is nice and concise. Merged,  but open an new issue for improvement on bootstrap disable and enable. Ideally, we want to avoid reloading bootstrap everytime the "show me how!" button is clicked.
Open docs link in a separate window (accessible)
@aronasorman
Copy link
Collaborator Author

Merge conflict. Will resolve.

@jamalex
Copy link
Member

jamalex commented Mar 17, 2016

Can't review this by commits/files, obviously. I guess the proof is more "in the pudding", in terms of things still working in ka-lite-central post-merge. I'll join you to look at the merge conflicts, as they could be informative.

@aronasorman aronasorman force-pushed the update-central-develop branch from 738bc32 to c789b22 Compare March 17, 2016 22:29
jamalex added a commit that referenced this pull request Mar 21, 2016
@jamalex jamalex merged commit bf2cfa4 into central-develop Mar 21, 2016
@jamalex jamalex removed the has PR label Mar 21, 2016
@benjaoming benjaoming deleted the update-central-develop branch February 6, 2017 21:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants