-
Notifications
You must be signed in to change notification settings - Fork 23
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
Devel #100
Open
whytheplatypus
wants to merge
146
commits into
git-flow-conversion
Choose a base branch
from
devel
base: git-flow-conversion
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Devel #100
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
I'd like to have it around to contrast with the new look of PGProblemEditor2 At the moment it's not showing solutions in the problems but that may be an issue with the Problem.pm template display. ????
Conflicts: lib/WeBWorK/Authen.pm lib/WeBWorK/Authen/LTIBasic.pm Resolved. We have the new DragMath features We have essayAnswers and a bunch of other stuff.
Conflicts: lib/WeBWorK/Authen.pm lib/WeBWorK/Authen/LTIBasic.pm
The correct syntax should be $version >= "2" not $version==2 (as I changed it to) nor $version => 2 as it was originally.
This version has a different database schema. It's possible to upgrade courses to this but it might not be so easy to move them back to this.
Move conf/templates to conf/old_templates to avoid accidental references to old files Add link to code mirror to math, math2, math3
Conflicts: README README.md htdocs/themes/math/system.template htdocs/themes/math2/system.template
…new essayQuestion This also revises how past answers are handled. They use the database instead of a log file.
This also changes the way past_answers are stored. The are now stored in the database.
…2.5.2 Conflicts: VERSION conf/localOverrides.conf.dist
…2.5.2 Conflicts: VERSION conf/defaults.config
We may have to back out of this one -- I'm not sure which is the best file.
…into merge_with_ww2.5.2_on_hosted2
Conflicts: conf/localOverrides.conf.dist
Conflicts: PG_VERSION htdocs/js/apps/problemsetlist/problemsetlist.js
no longer cause the whole page to be regenerated, and the interface is simpler.
…e assignment of a problem set to a set of users.
… deleted some CalendarView files because of rearranging some code to simplify.
Updated Homework Manager
improvements to more-like-this feature of library browser 1.
comment, if present, was being killed) and moved a button in LB1.
(asciimath and latexmathml added). When pulling tags from OPL files, use Misc. for missing dbchapter or subject so we can find the problems (and not put blanks in the menus).
… into ww-devel Conflicts: VERSION conf/database.conf.dist conf/localOverrides.conf.dist htdocs/themes/math2/codemirror2 htdocs/themes/ubc/codemirror2 lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm lib/WeBWorK/URLPath.pm
We need to have two handles $dh and $dh2 because we are dealing with two directories -- the theme directory and the localization directory
…rom_jj Fixed conflicts and "m now merging. Further work may need to be done. Where should the file Browse.js go? It's now in two places What was intended for the modifications in SetMaker.js? I'm not sure I made the right choices. Conflicts: htdocs/js/lib/webwork/teacher/Browse.js lib/WeBWorK/ContentGenerator/instructorXMLHandler.pm lib/WebworkWebservice/LibraryActions.pm lib/WebworkWebservice/SetActions.pm
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.