John Jarvis
|
6d78425a82
|
dding stanford-univ logo
|
2013-04-03 15:39:22 -04:00 |
|
John Jarvis
|
1c581835f2
|
changing stanford logo
|
2013-04-03 15:39:11 -04:00 |
|
Brian Talbot
|
f06892e9f9
|
Merge branch 'master' into feature/btalbot/studio-alerts
|
2013-04-03 15:38:52 -04: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 |
|
John Jarvis
|
71cfc4441b
|
university->logo
|
2013-04-03 15:37:12 -04:00 |
|
John Jarvis
|
0c81329fa5
|
updating image link
|
2013-04-03 15:35:50 -04: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 |
|
John Jarvis
|
7b226c34f8
|
Adding new logo for stanford
|
2013-04-03 15:34:54 -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 |
|
Brian Talbot
|
d87c4e3866
|
resolving local merge with master
|
2013-04-03 15:01:55 -04:00 |
|
Chris Dodge
|
5f9d7db94d
|
actually we need to start the draft content export from the sequentials. This is because we need the child pointers to the draft verticals. For private items, if we don't do this, then we'll loose those pointers
|
2013-04-03 14:43:01 -04:00 |
|
Victor Shnayder
|
9f9748b9fa
|
Stanford press release
|
2013-04-03 14:26:06 -04:00 |
|
Chris Dodge
|
a023cfa8d9
|
Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/export-draft-modules
|
2013-04-03 14:14:13 -04:00 |
|
Chris Dodge
|
b640866748
|
Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/studio-forum-improvements
Conflicts:
common/lib/xmodule/xmodule/x_module.py
|
2013-04-03 14:05:59 -04:00 |
|
Chris Dodge
|
f7a83cdc74
|
wip: add test case for exporting/importing a private module
|
2013-04-03 14:03:14 -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 |
|
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 |
|