Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,825 Commits 1 Branch 0 Tags
25dae57226447cfb9efbebca30945ab50e37a653
Commit Graph

13825 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark L. Chang
84a16f5ce1 Merge branch 'master' into feature/markchang/studio-nps 2013-04-02 11:07:22 -04:00
John Hess
17fa312b26 Merge pull request #1695 from MITx/jmclaus/genex-save-state 
Genex now saves its state
 2013-04-02 07:58:17 -07:00
Brian Talbot
899714a3c2 studio - resolving broken nav width 2013-04-02 10:19:17 -04:00
cahrens
ceababbf6d Minor cleanup. 2013-04-02 09:35:26 -04:00
Chris Dodge
63085ec65b Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/export-draft-modules 2013-04-02 09:10:00 -04:00
Chris Dodge
3727edabf2 Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/export-draft-modules 
Conflicts:
	cms/djangoapps/contentstore/views.py
	common/lib/xmodule/xmodule/modulestore/draft.py
	common/lib/xmodule/xmodule/modulestore/xml_importer.py
	common/lib/xmodule/xmodule/xml_module.py
 2013-04-02 09:09:45 -04:00
Brian Talbot
6042f80703 studio - syncing up class naming conventions for icons 2013-04-02 09:02:59 -04:00
Kevin Chugh
daa0cd22d5 filter implemented for flagged 2013-04-01 23:16:22 -04:00
Victor Shnayder
c5869c76b6 Merge pull request #1782 from MITx/feature/ichuang/allow-reset-of-openended-problems 
allow student state of module other than problem to be reset by instructor
 2013-04-01 15:11:59 -07:00
ichuang
025c5df16e fix IntegrityError duplicate entry issue with module_data Scope.student_state update 2013-04-01 21:51:45 +00:00
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
ichuang
5477d6430a add instructions to idashboard for deleting state of non-problem xblocks 2013-04-01 19:59:20 +00: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
cahrens
8b26d3a8a1 Protect against no due property (as was there before). 2013-04-01 14:42:05 -04:00
cahrens
ee2b92ab02 Protect against no due property (as was there before). 2013-04-01 14:38:56 -04:00
cahrens
845e86b8d1 Format timestamp. 2013-04-01 14:32:03 -04: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
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