Will Daly
|
8cd11f4f63
|
Merge pull request #1799 from MITx/fix/zoldak/terrain-pylint
Fix some pylint errors in the lettuce terrain module
|
2013-04-03 11:01:26 -07:00 |
|
Don Mitchell
|
9a7324ebfa
|
Merge pull request #1798 from MITx/bug/christina/studio
Fix due date bug.
|
2013-04-03 10:26:40 -07:00 |
|
Jay Zoldak
|
c9add70a75
|
Fix some pylint errors in the lettuce terrain module
|
2013-04-03 13:01:42 -04:00 |
|
cahrens
|
52fdf5c7a0
|
Make sure due date year is always in the past.
|
2013-04-03 11:30:14 -04:00 |
|
Chris Dodge
|
1a1635d402
|
Fix tests and extend export/import unit test with draft testing.
|
2013-04-03 11:28:25 -04:00 |
|
Diana Huang
|
8cd4220b5f
|
Fix the conditions by which we show the queueing message
for Matlab inputs
|
2013-04-03 10:48:27 -04:00 |
|
Chris Dodge
|
b61d7b2c3c
|
Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/export-draft-modules
|
2013-04-03 10:39:06 -04:00 |
|
brianhw
|
7c9875870b
|
Merge pull request #1770 from MITx/fix/brian/remove-input_state
management command to remove excess input_state entries
|
2013-04-03 07:35:47 -07:00 |
|
Brian Wilson
|
b11f0e17f7
|
respond to feedback
|
2013-04-03 10:22:43 -04:00 |
|
Diana Huang
|
c658c65149
|
Add new Matlab unit tests.
|
2013-04-03 10:17:28 -04:00 |
|
Brian Talbot
|
65768e813b
|
resolving local merge conflict
|
2013-04-03 10:00:38 -04:00 |
|
Brian Talbot
|
f501000825
|
edx.org - hiding the login nav element when on the login view
|
2013-04-03 09:46:36 -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
|
fa898d0589
|
edx.org - revising register field label per marketing's request
|
2013-04-03 09:13:48 -04: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 |
|
Brian Wilson
|
b6f95c71ce
|
change command to handle file input instead
|
2013-04-02 16:20:46 -04:00 |
|
Chris Dodge
|
1d8f9c225b
|
Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/export-draft-modules
|
2013-04-02 16:12:05 -04: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 |
|
cahrens
|
f802ac2098
|
Remove string default value.
|
2013-04-02 15:21:09 -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 |
|
Chris Dodge
|
1789814ceb
|
wip
|
2013-04-02 14:19:54 -04:00 |
|
cahrens
|
42fbc16006
|
Feedback from code review.
|
2013-04-02 14:10:56 -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 |
|
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 |
|