Merge develop into central-develop #3254
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
cronserver gunks up the works for the other kaserve command. Not clear to me why. I'm calling not executing it a workaround. Does it actually do anything? Also, fixed a bug in the 'status' command. Windows doesn't like an HTTPConnection with "0.0.0.0" address.
For some reason, the thread running the cronserver management command (in Windows only) barfs and kills the whole process. This prevents the server from starting. Why does it get sick and die? Who knows? A better solution on windows (better than trying to UNIX-ly daemonize programs) seems to be to create windows services. Then kalitectl.py can simply start and stop those services. Just to be clear, there's no issue on windows with running the cronserver and kaserve command in separate processes (say, in different instances of cmd.exe or using subprocess.Popen), there's only an issue when they are run in different threads belonging to the same process.
Sidebar resizing only detects window resizes in 100px steps to prevent unnecessary computation when user decides to play with the glorious responsiveness.
Remove reference to removed file and other commented out stuff
Track how many points have been piled onto statusModel points, which should also allow for negative points accrual.
…fixes It was the cronserver mgmt command all along
Remove unused javascript and css
…nsive-design Sidebar now responsive as ever
Fixes top level navigation bug that showed "Teach" twice, also style fixes and css cleanup
…s_points Properly update statusModel points
slight changes to css styling in top nav
…evice is imported.
jamalex
added a commit
that referenced
this pull request
Mar 11, 2015
Merge develop into central-develop
|
Ahhhh! This PR doesn't incorporate all the changes we made to the |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.