Vik Paruchuri
|
9ee956a397
|
Skip self assessment test (fails due to need for querydict for getlist to work, but mocking querydict is painful)
|
2013-02-19 11:05:43 -05:00 |
|
Calen Pennington
|
956789e510
|
Merge pull request #1512 from MITx/fix/zoldak/coveragerc
Omit migrations from code coverage reports.
|
2013-02-19 07:57:09 -08:00 |
|
Jay Zoldak
|
2e85ba1a27
|
Omit migrations from code coverage reports.
Also omit portal and terrain, which are used for the lettuce testing framework.
|
2013-02-19 10:54:02 -05:00 |
|
Vik Paruchuri
|
4d57f1b9ee
|
Merge remote-tracking branch 'origin/master' into feature/vik/settings-to-xmodule
|
2013-02-19 10:43:55 -05:00 |
|
Vik Paruchuri
|
44fdc0135a
|
Remove magic 8 ball grading
|
2013-02-19 10:43:10 -05:00 |
|
Chris Dodge
|
94613c3ed3
|
add a null guard
|
2013-02-19 10:33:38 -05:00 |
|
Diana Huang
|
f4addddf42
|
Merge pull request #1484 from MITx/feature/vik/improve-oe-ui
Feature/vik/improve oe ui
|
2013-02-19 07:27:29 -08:00 |
|
Brian Talbot
|
6d2ada5084
|
xmodule scss - resolved some general span styling that would override basic em or strong type styling
|
2013-02-19 09:59:36 -05:00 |
|
Chris Dodge
|
1a2e794126
|
add test of inheritance on xmodule insert
|
2013-02-19 09:51:07 -05:00 |
|
Victor Shnayder
|
e4312d67f0
|
work in progress on supporting science puzzles
|
2013-02-19 09:43:19 -05:00 |
|
Christina Roberts
|
a62a575a33
|
Merge pull request #1506 from MITx/feature/btalbot/studio-softlanding
Soft Landing UI, Studio Nav Revamp, Sign In/Up Revisions
|
2013-02-19 06:34:32 -08:00 |
|
Victor Shnayder
|
c37238d592
|
Initial landing pages for ANU, McGill, Rice, Toronto
|
2013-02-19 08:22:09 -05:00 |
|
Alexander Kryklia
|
6940cb334a
|
small refactor
|
2013-02-19 13:33:55 +02:00 |
|
Alexander Kryklia
|
e2470842f7
|
get_module get descr insted of loc
|
2013-02-19 13:31:28 +02:00 |
|
Alexander Kryklia
|
841cfd28cc
|
fix typo
|
2013-02-19 13:06:14 +02:00 |
|
Victor Shnayder
|
a4ee057d05
|
Add showanswer="finished" option and tests
|
2013-02-18 21:43:57 -05:00 |
|
Arthur Barrett
|
72d9c1d7d2
|
Saving work-in-progress of guided classification exercise.
|
2013-02-18 19:02:54 -05:00 |
|
Chris Dodge
|
bd73cc16ee
|
compute (and cache) a generation of metadata inheritance tree for the course. We can then add that metadata to a newly instantiated xmodule
|
2013-02-18 18:49:45 -05:00 |
|
ichuang
|
8587044ea4
|
fix capa save button msgs, add simple capa survey mode
|
2013-02-18 10:48:45 -05:00 |
|
Alexander Kryklia
|
72f6578395
|
fix typo
|
2013-02-18 11:46:07 +02:00 |
|
Alexander Kryklia
|
0a80f835c0
|
Revert "fix typo"
This reverts commit 24d2c11c3e.
|
2013-02-18 11:45:21 +02:00 |
|
Alexander Kryklia
|
24d2c11c3e
|
fix typo
|
2013-02-18 11:45:03 +02:00 |
|
Don Mitchell
|
cfa13922f5
|
Change url for login from login to signin.
|
2013-02-15 17:30:24 -05:00 |
|
Brian Talbot
|
9eb02a8a26
|
studio - resolving base.js spacing/conflicts
|
2013-02-15 16:57:42 -05:00 |
|
Diana Huang
|
3e23b9e1f2
|
Merge pull request #1480 from MITx/diana/staff-grading-flagging
Flag submissions from staff grading view
|
2013-02-15 13:08:16 -08:00 |
|
Calen Pennington
|
2bc3000156
|
Fix tests
|
2013-02-15 15:44:11 -05:00 |
|
Diana Huang
|
b896cef86d
|
Add in click tracking for feedback elements
|
2013-02-15 15:17:53 -05:00 |
|
cahrens
|
5acf9cb3d2
|
Reformat to 4 spaces.
|
2013-02-15 14:46:41 -05:00 |
|
cahrens
|
2486ebc22a
|
Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into feature/btalbot/studio-softlanding
|
2013-02-15 14:45:20 -05:00 |
|
David Ormsbee
|
87784d1cff
|
Make sure the submissions history only shows up with problems.
|
2013-02-15 14:36:10 -05:00 |
|
Brian Talbot
|
3c6caa611c
|
resolving local merge
|
2013-02-15 14:24:42 -05:00 |
|
Brian Talbot
|
86d9f0b65c
|
resolving local merge
|
2013-02-15 14:15:51 -05:00 |
|
cahrens
|
37e4cd81b1
|
Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into feature/btalbot/studio-softlanding
|
2013-02-15 14:15:03 -05:00 |
|
Brian Talbot
|
93949ab342
|
resolving local merge problem
|
2013-02-15 14:12:46 -05:00 |
|
Brian Talbot
|
a5e2b5c53a
|
resolving merge conflict and missing Sass mixin
|
2013-02-15 14:10:52 -05:00 |
|
Jay Zoldak
|
34a4b35e66
|
Fix lettuce acceptance tests to reflect the new soft landing page changes.
|
2013-02-15 14:07:46 -05:00 |
|
Arthur Barrett
|
9fb80ec3df
|
Removed console.log.
|
2013-02-15 13:50:57 -05:00 |
|
Arthur Barrett
|
24f519e32f
|
Moved the return link above the inline discussion and updated the header styling so the hide annotations button is right-aligned with the help icon.
|
2013-02-15 13:46:38 -05:00 |
|
cahrens
|
b49325009a
|
Merge branch 'master' into feature/btalbot/studio-softlanding
|
2013-02-15 13:14:46 -05:00 |
|
Christina Roberts
|
dceb8fee5e
|
Merge pull request #1494 from MITx/feature/marco/addcomponent
Feature/marco/addcomponent
|
2013-02-15 10:13:24 -08:00 |
|
Diana Huang
|
7b11843086
|
Merge branch 'master' into diana/click-tracking
|
2013-02-15 12:53:21 -05:00 |
|
Don Mitchell
|
c4586edb2e
|
Change hardcoded template names to the newer hardcoded template names
:-(
|
2013-02-15 12:03:04 -05:00 |
|
Alexander Kryklia
|
059b9f66e3
|
poll and conditional finished
|
2013-02-15 18:48:39 +02:00 |
|
Brian Talbot
|
cb127d473d
|
studio - page headers: revised where new course form fields are placed in dashboard
|
2013-02-15 11:40:06 -05:00 |
|
Brian Talbot
|
c5d041a7a3
|
resolved local merge
|
2013-02-15 11:29:56 -05:00 |
|
Brian Talbot
|
995ec8db62
|
resolved local merge
|
2013-02-15 11:28:54 -05:00 |
|
Carlos Andrés Rocha
|
86865a6823
|
Merge pull request #1507 from MITx/bugfix/valera/video_alpha
Bugfix/valera/video alpha
|
2013-02-15 08:22:25 -08:00 |
|
Valera Rozuvan
|
c7679ea624
|
Removed debugging comments.
|
2013-02-15 18:12:53 +02:00 |
|
Valera Rozuvan
|
a0f46dae49
|
Fixed bug that prevented Firefox from playing HTML5 video content.
|
2013-02-15 18:10:14 +02:00 |
|
Brian Talbot
|
20553b00d3
|
resolving merge conflict with master
|
2013-02-15 09:32:38 -05:00 |
|