Victor Shnayder
140ad8bf61
Merge pull request #1791 from MITx/fix/brian/foldit-grading
...
when grading, check for always-regrade at the section level too
2013-04-01 11:18:58 -07:00
cahrens
b1ee96b38e
Format timestamp.
2013-04-01 14:18:15 -04:00
Brian Wilson
1abfff220e
when grading, check for always-regrade at the section level too
2013-04-01 14:14:12 -04:00
cahrens
055538e213
Format timestamp.
2013-04-01 14:10:48 -04:00
Victor Shnayder
ba7d29b3e7
Merge pull request #1763 from MITx/fix/brian/single_section_grading
...
modify AssignmentFormatGrader to act like a SingleSectionGrader on single sections
2013-04-01 11:06:44 -07:00
Victor Shnayder
53cf8aa744
Merge pull request #1789 from MITx/fix/will/chem_customresponse_bug
...
Fix/will/chem customresponse bug
2013-04-01 11:04:37 -07:00
Chris Dodge
8fef830740
optimize db round trips, by getting the course descriptor outside of the user loop
2013-04-01 14:02:54 -04:00
Will Daly
1cba122dc0
Undid accidental commit of pylint fixes to responsetypes
2013-04-01 13:47:59 -04:00
cahrens
42b4ffdcf9
Cleanup.
2013-04-01 13:40:32 -04:00
Will Daly
87d8a56a93
CustomResponse now imports chem packages into the global
...
context for scripts to access.
This was removed accidentally during an earlier refactoring,
which caused customresponse to raise an exception for chem problems.
Unit tests verify the changes
2013-04-01 13:27:31 -04:00
Kevin Chugh
2f4310713b
fix index
2013-04-01 13:22:56 -04:00
Calen Pennington
ec06b36660
Merge pull request #1787 from MITx/fix/will/random_seed_not_saved
...
Fix/will/random seed not saved
2013-04-01 10:15:14 -07:00
brianhw
98a717b6b2
Merge pull request #1771 from MITx/feature/rocha/enable-sass-source-maps
...
Enable dev env support for sass source maps
2013-04-01 09:44:57 -07:00
cahrens
93b0fafea8
Merge branch 'master' into bug/christina/studio
...
Conflicts:
cms/djangoapps/contentstore/views.py
common/lib/xmodule/xmodule/capa_module.py
common/lib/xmodule/xmodule/combined_open_ended_module.py
common/lib/xmodule/xmodule/peer_grading_module.py
2013-04-01 12:41:34 -04:00
cahrens
8ace7fe57c
Merge branch 'master' into bug/christina/studio
...
Conflicts:
cms/djangoapps/contentstore/views.py
common/lib/xmodule/xmodule/capa_module.py
common/lib/xmodule/xmodule/combined_open_ended_module.py
common/lib/xmodule/xmodule/peer_grading_module.py
2013-04-01 12:30:07 -04:00
Will Daly
fb97602442
Save randomization seed if it is not already set,
...
so that the same problem loads when the user
checks/saves/resets
2013-04-01 12:08:53 -04:00
James Tauber
fdc8a6fedf
reverted rednose version
...
create-dev-env.sh is failing because rednose 0.3.3 seems to have
fallen off the face of the Earth. 0.3 is still available so reverting
to that.
2013-04-01 13:06:35 -03:00
Will Daly
7f00487203
Reverted last commit due to concerns about database writes.
2013-04-01 11:48:10 -04:00
cahrens
16f4a3f9c1
Convert due date to a Date (vs. a string with no year).
2013-04-01 11:37:05 -04:00
Calen Pennington
a50f1ca630
Merge pull request #1784 from MITx/fix/zoldak/enable-jasmine-lms
...
Enable executing the lms jasmine tests as part of the build process
2013-04-01 08:33:35 -07:00
Calen Pennington
0e4369603e
Merge pull request #1756 from MITx/fix/vik/oe-and-progress
...
Fix/vik/oe and progress
2013-04-01 08:31:58 -07:00
Chris Dodge
dc17e93339
per Victor, one shouldn't change the default parameter to a function, since that change is global to the entire lifetime.
2013-04-01 11:31:25 -04:00
Will Daly
b76adb4b06
Updated tests to address on-going randomization bug.
...
Capa problem state was not being copied to module state
during module initialization.
This meant that when check_problem was called the first time,
the seed would be re-generated and saved.
2013-04-01 11:22:42 -04:00
Chris Dodge
ef267d9b89
list xml_attributes (new field since xblock integration) as system metadata which should not be edited in Studio
2013-04-01 11:11:30 -04:00
Jay Zoldak
f6b6f16ba5
Update the comments explaining test execution
2013-04-01 10:58:00 -04:00
Jay Zoldak
1679f1e31d
Enable executing the lms jasmine tests as part of the build
2013-04-01 10:52:11 -04:00
Brian Talbot
9c2dbb91b4
studio - resolving a bug where JQUI sets the z-index of our datepickers to 1, which is less than our dynamic tooltips, causing visual display/access issues.
2013-04-01 10:34:31 -04:00
Victor Shnayder
9c4a88b570
Merge pull request #1743 from MITx/fix/will/bug_288
...
Fix/will/bug 288
2013-04-01 07:22:20 -07:00
David Ormsbee
fd0dc92cba
Merge pull request #1772 from MITx/fix/brian/subhist-order
...
change submission history to be ordered by id
2013-04-01 06:38:47 -07:00
Will Daly
4322b83894
Added additional comments
2013-04-01 09:02:04 -04:00
Will Daly
f90e29ce96
Fixed a test error that occurred because the problem
...
was not set to done before resetting it.
To avoid to small chance that we'll get the same seed when
we reset, try to get a new seed multiple times.
2013-04-01 08:55:06 -04:00
ichuang
cac7f8a289
allow student state of module other than problem to be reset by instructor
...
this makes it possible to reset open ended response problems
2013-03-31 19:43:39 +00:00
ichuang
15d1bc372d
clean up xqueue callback url generation; allow override from settings
2013-03-31 19:40:39 +00:00
ichuang
1969a6633e
if user course creation is disabled & if staff email given, add link to request course creation by email
2013-03-31 16:05:09 +00:00
ichuang
a0fab132a1
sort course index in studio my courses page
2013-03-31 15:51:14 +00:00
ichuang
de5fa56b19
add dump of description of grading configuration to instructor dashboard
2013-03-31 13:18:54 +00:00
ichuang
febcb51133
make psychometrics curve fitting more robust
2013-03-31 12:52:29 +00:00
ichuang
26f14aaf6d
fix psychoanalyze (compatibility with new xblock)
2013-03-31 12:41:12 +00:00
ichuang
f1cc6e8597
fix psychoanalyze - make compatible with xblock
2013-03-31 12:40:43 +00:00
ichuang
14899b9066
fix lms migration to be compatible with xblock
2013-03-31 12:35:08 +00:00
ichuang
b3f00a6725
add default message to conditional
2013-03-31 12:31:05 +00:00
David Ormsbee
24e64e3946
Merge pull request #1773 from MITx/hotfix/dave/mult_choice_display
...
HOTFIX: Accept either a list of possible values, or a string as a value for
I'm pulling this in myself because it's urgent, it's the weekend, and I don't want this to get forgotten.
2013-03-30 08:55:45 -07:00
David Ormsbee
dfd3a699b9
Accept either a list of possible values, or a string as a value for
...
comparison of correctness in multiple choice.
Multiple choice code is scattered and sometimes sends a list of
choices for the value, and sometimes a single string. We used to use
"in" which scarily handled both cases (list or substring search),
but that caused a bug when you had two choices like choice_1 and
choice10. Moving to == caused us to break when lists were sent to
us. So this ugly code is extra paranoid and checks both possibilities.
This really needs a better cleanup.
2013-03-30 11:09:44 -04:00
Brian Wilson
23d96b2533
change submission history to be ordered by id
2013-03-29 21:16:20 -04:00
Carlos Andrés Rocha
29efa84205
Enable dev env support for sass source maps
...
Change the parameters of the sass compiler to output source
maps. Google Chrome uses the maps in the debugger to show the sass or
scss file that originated the style for a particular element.
More information here:
http://fonicmonkey.net/2013/03/25/native-sass-scss-source-map-support-in-chrome-and-rails/
2013-03-29 18:34:02 -04:00
chrisndodge
1c47573bd7
Merge pull request #1669 from MITx/fix/vik/add-oe-tab
...
Fix/vik/add oe tab
2013-03-29 13:55:58 -07:00
Chris Dodge
02f97858f6
move the provisioning seeding from LMS into Common. Add provisioning seeding calling from create new course view.
2013-03-29 16:32:53 -04:00
Vik Paruchuri
033f5ce73c
Make process to add open ended tab to studio reversible
2013-03-29 15:53:28 -04:00
Don Mitchell
c655c814e8
Merge pull request #1721 from MITx/feature/cdodge/add-no-inheritable-metadata-on-verticals-to-xlint
...
add checking for metadata that we can't support editing for in Studio. T...
2013-03-29 12:38:42 -07:00
Don Mitchell
80f57db7c3
Merge pull request #1762 from MITx/feature/cdodge/course-overview-perf
...
Feature/cdodge/course overview perf
2013-03-29 12:35:41 -07:00
