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

Devel #100

Open
wants to merge 146 commits into
base: git-flow-conversion
Choose a base branch
from
Open

Devel #100

wants to merge 146 commits into from

Conversation

whytheplatypus
Copy link
Member

No description provided.

mgage and others added 30 commits June 24, 2012 15:40
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.
pstaabp and others added 30 commits December 18, 2012 14:25
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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants