Skip to content

Merging the_practice_feature to the master. #11

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.

Sign up for GitHub

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

Open
ImanYZ wants to merge 15 commits into
base: master
Choose a base branch
from
Open

Merging the_practice_feature to the master. #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
5955ead
Modified layout.html to include a link to the practice page.
ImanYZ Dec 27, 2017
d846eb6
Merge remote-tracking branch 'upstream/master' into practice_feature
presnick Jan 5, 2018
dc20dc9
Added the topics tag.
ImanYZ Jan 5, 2018
f7878ec
Merge branch 'master' of git://github.com/ImanYZ/RunestoneComponents …
presnick Jan 5, 2018
b516eba
get rid of .DS_Store files that shouldn't be in the repo
presnick Jan 5, 2018
7e05061
Merge branch 'ImanYZ-master' into practice_feature
presnick Jan 5, 2018
1e0930b
Removed unnecessary files and folders.
ImanYZ Jan 5, 2018
18d4ee1
Merge branch 'master' into practice_feature
presnick Jan 7, 2018
94bf157
make Parsons loadData even when in practice mode
presnick Jan 7, 2018
5e77eca
When clicking the 'Next Step' button in a Parson, we should disable t…
ImanYZ Jan 8, 2018
60cd6e1
Merge remote-tracking branch 'professorresnickmaster/master'
ImanYZ Jan 8, 2018
fb856e0
Merge remote-tracking branch 'professorresnickmaster/practice_feature'
ImanYZ Jan 9, 2018
1f5dc57
Merging the_practice_feature to the master.
ImanYZ Feb 4, 2018
e4037b8
Merging with final changes in miller/master.
ImanYZ Aug 22, 2018
47e7c29
Fixed the timezone issue by having it in its original minutes scale.
ImanYZ Sep 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,5 @@ runestone/*/test/build_info
# IDEs
.vscode/
**/sphinx-enki-info.txt

*.DS_Store
2 changes: 1 addition & 1 deletion runestone/common/js/bookfuncs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ function isLoggedIn() {

function handleLoginLogout() {
if (shouldLogin()) {
data = {timezoneoffset: (new Date()).getTimezoneOffset()/60 }
data = { timezoneoffset: (new Date()).getTimezoneOffset() }
jQuery.get(eBookConfig.ajaxURL + 'getuser', data, gotUser).error(notifyRunestoneComponents);
} else {
$(document).trigger("runestone:logout")
Expand Down