Brian Talbot
f07da92ab8
studio - adding in content/links to studio sock
2013-04-01 16:59:46 -04:00
Brian Talbot
769e209091
resolving local merge
2013-04-01 16:56:11 -04:00
Brian Talbot
57e5eb683b
studio - basic design, interaction, and content for static in-page help
2013-04-01 16:54:56 -04:00
Christina Roberts
ac180ca2b9
Merge pull request #1765 from MITx/feature/btalbot/studio-tenderwidget
...
Adding in reference and UI for Tender discussion submission widget
2013-04-01 13:17:06 -07:00
Christina Roberts
a8592b749a
Merge pull request #1783 from MITx/bug/btalbot/studio-datepickerzindex
...
Studio - JQUI's default date picker z-index bug
2013-04-01 13:07:51 -07:00
Christina Roberts
ebeee7a195
Merge pull request #1785 from MITx/fix/cdodge/xml_attribute-as-system-metadata
...
list xml_attributes (new field since xblock integration) as system metad...
2013-04-01 12:24:56 -07:00
jarv
b7fba98e2a
Merge pull request #1790 from MITx/fix/cdodge/certificates-db-perf-optimization
...
optimize db round trips, by getting the course descriptor outside of the...
2013-04-01 11:26:29 -07:00
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
Brian Wilson
1abfff220e
when grading, check for always-regrade at the section level too
2013-04-01 14:14:12 -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
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
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
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
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
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
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
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
Chris Dodge
599ca4d429
oops. I'm not programming in C# any longer
2013-03-29 15:31:37 -04:00
Chris Dodge
60e295895e
remove unused parameter
2013-03-29 15:26:21 -04:00
brianhw
6b1e1b1425
Merge pull request #1769 from MITx/fix/ned/cleanup-wacky-code
...
Enough is enough.
2013-03-29 12:10:23 -07:00
Ned Batchelder
0cfcd183b2
No need to wrap comments that tightly.
2013-03-29 15:05:22 -04:00
Ned Batchelder
e8f8e9e197
Enough is enough.
2013-03-29 14:49:24 -04:00
Chris Dodge
3ce01882bb
add an 'allowed' list of metadata (e.g. display_name, etc.) and also restrict metadata on sequentials
2013-03-29 13:59:59 -04:00
Vik Paruchuri
b8e6c94dd6
Add in a comment
2013-03-29 13:57:16 -04:00
Jay Zoldak
a5b1428bba
Merge pull request #1760 from MITx/feature/will/speed_up_unit_tests
...
Feature/will/speed up unit tests
2013-03-29 10:53:10 -07:00
Vik Paruchuri
5aa357938d
Minor fixes for things that broke in the merge
2013-03-29 13:48:20 -04:00
Vik Paruchuri
65c2fd5f0c
Fix some post-merge errors
2013-03-29 13:22:13 -04:00
Jay Zoldak
d044d5c48d
a few more pep8 fixes
2013-03-29 13:15:33 -04:00
Vik Paruchuri
20bbf75fba
Merge remote-tracking branch 'origin/master' into fix/vik/add-oe-tab
...
Conflicts:
cms/djangoapps/contentstore/utils.py
cms/djangoapps/contentstore/views.py
cms/djangoapps/models/settings/course_metadata.py
2013-03-29 13:10:47 -04:00
