ichuang
|
2e852d16ac
|
Merge remote-tracking branch 'edx-mitx/master' into feature/ichuang/staff-email-for-course-creation
Conflicts:
cms/envs/common.py
|
2013-04-04 17:34:52 +00:00 |
|
Calen Pennington
|
72ce1af982
|
Merge pull request #1424 from MITx/feature/ichuang/fix-forum-management-commands
fix forum management commands (assign_default_role was moved)
|
2013-04-04 10:14:31 -07:00 |
|
Calen Pennington
|
7f19d48985
|
Merge pull request #1795 from MITx/feature/cale/use-open-source-xblock
Migrate to the open source XBlock repo
|
2013-04-04 10:12:00 -07:00 |
|
brianhw
|
b7c8a6977e
|
Merge pull request #1805 from MITx/fix/brian/user-on-progress
add user name and email to progress page
|
2013-04-04 10:09:52 -07:00 |
|
chrisndodge
|
0ff31adf74
|
Merge pull request #1779 from MITx/feature/ichuang/studio-sort-my-courses
sort course index in studio my courses page
|
2013-04-04 09:30:16 -07:00 |
|
Brian Wilson
|
d3e7739b3b
|
add user name and email to progress page
|
2013-04-04 12:03:08 -04:00 |
|
Will Daly
|
1b7e552d5d
|
Merge pull request #1804 from MITx/fix/brian/remove-input-state-logging
add progress logging while running remove_input_state management command
|
2013-04-04 08:32:45 -07:00 |
|
Brian Wilson
|
4c511c3c66
|
add progress logging
|
2013-04-04 11:14:52 -04:00 |
|
Calen Pennington
|
039ccb83cc
|
Migrate to the open source XBlock repo
|
2013-04-04 10:55:31 -04:00 |
|
Diana Huang
|
8304e9031c
|
Merge pull request #1797 from MITx/diana/fix-matlab-queueing-message
Matlab Unit Tests and Minor Bugfix
|
2013-04-04 07:39:05 -07:00 |
|
Will Daly
|
fb14bedfdf
|
Merge pull request #1803 from MITx/fix/zoldak/pep8-psychometrics
pep8 fixes for psychoanalyze and capa module
|
2013-04-04 07:26:13 -07:00 |
|
Jay Zoldak
|
22017ac24c
|
pep8 fixes for psychoanalyze and capa module
|
2013-04-04 09:57:19 -04:00 |
|
Piotr Mitros
|
1717782c5b
|
Merge pull request #1776 from MITx/feature/ichuang/psychometrics-fix
fix psychometrics to be compatible with new xblocks
|
2013-04-04 05:50:59 -07:00 |
|
Christina Roberts
|
56d5f13b5e
|
Merge pull request #1801 from MITx/fix/btalbot/studio-outlinedates
Resolving display issues around outline release dates
|
2013-04-03 12:38:51 -07:00 |
|
Brian Talbot
|
b0021e7346
|
studio - resolved z-index issue with release date modal and JQUI timepicker + conslidated all vendor styling overrides/extensions
|
2013-04-03 15:35:22 -04:00 |
|
cahrens
|
f77aaec392
|
Need to mock datetime.datetime.utcnow.
|
2013-04-03 15:33:51 -04:00 |
|
Brian Talbot
|
eb6f2d8c09
|
studio - revising outline layout per date changes and gradable status UI issue
|
2013-04-03 15:22:27 -04:00 |
|
Diana Huang
|
2230fe3c23
|
Set the queue_len more consistently.
|
2013-04-03 15:08:33 -04:00 |
|
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 |
|
Diana Huang
|
8cd4220b5f
|
Fix the conditions by which we show the queueing message
for Matlab inputs
|
2013-04-03 10:48:27 -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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|