Mark L. Chang
1c7e13e1e8
copy change
2013-04-04 11:54:37 -04:00
Brian Talbot
65768e813b
resolving local merge conflict
2013-04-03 10:00:38 -04:00
chrisndodge
c7c7f1da4a
Merge pull request #1757 from MITx/feature/markchang/studio-nps
...
added net promoter score tracking javascript shim from Qualaroo
2013-04-03 06:37:00 -07:00
chrisndodge
54d45bae88
Merge pull request #1796 from MITx/feature/vaxxxa/fix-caption-asset-path
...
fix caption_asset_path for videoalpha
2013-04-03 06:17:13 -07:00
Brian Talbot
2b749b9728
studio - tweaking the depth/shadow on the help sock UI
2013-04-03 09:00:56 -04:00
Vasyl Nakvasiuk
c66eabb308
fix caption_asset_path for videoalpha
2013-04-03 11:41:11 +03:00
Mark L. Chang
1d70509da1
fixed merge on env
2013-04-03 00:31:48 -04:00
Mark L. Chang
565a2cf752
Merge branch 'feature/markchang/studio-nps' of github.com:MITx/mitx into feature/markchang/studio-nps
2013-04-03 00:28:24 -04:00
Mark L. Chang
43f6f0ce8f
put survey behind MITX_FEATURES flag
2013-04-03 00:28:08 -04:00
Mark L. Chang
5df7f41c8f
added net promoter score tracking javascript shim from Qualaroo
2013-04-03 00:28:08 -04:00
Mark L. Chang
7a57e369d1
put survey behind MITX_FEATURES flag
2013-04-03 00:26:12 -04:00
Victor Shnayder
67fecd3e5e
Merge pull request #1662 from MITx/feature/abarrett/annotation-styling-fixes
...
Annotation styling fixes
2013-04-02 18:36:19 -07:00
chrisndodge
d68650b4e8
Merge pull request #1786 from MITx/feature/cdodge/add-no-inheritable-metadata-on-verticals-to-xlint
...
per Victor, one shouldn't change the default parameter to a function, si...
2013-04-02 12:43:00 -07:00
Brian Talbot
bf82af9db6
Merge branch 'master' into feature/btalbot/studio-helpsock
2013-04-02 15:40:41 -04:00
Brian Talbot
6952b8e63b
studio - revising design, interaction, and FED of help sock
2013-04-02 15:37:49 -04:00
Chris Dodge
b8f1b744f2
fix up defaults per Victor's suggestions
2013-04-02 14:26:33 -04:00
Chris Dodge
61b4062689
Merge branch 'master' of github.com:MITx/mitx into feature/cdodge/add-no-inheritable-metadata-on-verticals-to-xlint
2013-04-02 14:20:33 -04:00
Ned Batchelder
36c27377c4
Merge pull request #1794 from MITx/fix/cale/remove-pylint-line-length-check
...
Remove line length limit, because people were convoluting code to fix it
2013-04-02 09:59:54 -07:00
Brian Talbot
8b9ecd9367
studio - reverting footer UI to existing
2013-04-02 12:53:11 -04:00
Calen Pennington
b3851cc9b3
Remove line length limit, because people were convoluting code to fix it
2013-04-02 11:32:24 -04:00
Christina Roberts
6ae26adf63
Merge pull request #1793 from MITx/fix/btalbot/studio-headerwidth
...
studio - resolving broken nav element width in smaller windows
2013-04-02 08:12:08 -07:00
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
Brian Talbot
6042f80703
studio - syncing up class naming conventions for icons
2013-04-02 09:02:59 -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
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
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
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
