Vik Paruchuri
|
c55f997086
|
Fix self assessment tests
|
2013-02-20 17:34:51 -05:00 |
|
Vik Paruchuri
|
912800cabf
|
Fix location string object problems
|
2013-02-20 17:27:37 -05:00 |
|
Vik Paruchuri
|
d5ba5457dc
|
Merge remote-tracking branch 'origin/master' into feature/vik/check-if-submission-allowed
Conflicts:
common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
|
2013-02-20 16:49:59 -05:00 |
|
VikParuchuri
|
fbce67a883
|
Merge pull request #1519 from MITx/diana/fix-self-assessment-test
Fix test so we don't have to skip it anymore.
|
2013-02-20 13:02:02 -08:00 |
|
Victor Shnayder
|
d2e97d2389
|
Merge pull request #1518 from MITx/press/international
Press/international
|
2013-02-20 12:07:16 -08:00 |
|
Victor Shnayder
|
1ae06a45bb
|
Add lower case urls for universities.
- Dan sent out a press release with those urls.
- Using a redirect instead of making it case-insensitive
because the proper urls are prettier
|
2013-02-20 14:59:28 -05:00 |
|
Diana Huang
|
a789d6c363
|
Merge branch 'master' into diana/fix-self-assessment-test
|
2013-02-20 13:37:42 -05:00 |
|
Diana Huang
|
6e453c2b8b
|
Clean up and fix some peer grading tests.
|
2013-02-20 13:36:09 -05:00 |
|
Vik Paruchuri
|
c3d485a609
|
Fix error message
|
2013-02-20 13:33:17 -05:00 |
|
Diana Huang
|
789db30176
|
Merge pull request #1520 from MITx/feature/vik/disable-spell-check
Feature/vik/disable spell check
|
2013-02-20 09:45:32 -08:00 |
|
Vik Paruchuri
|
dbe93502f1
|
Fix tests
|
2013-02-20 12:44:12 -05:00 |
|
Vik Paruchuri
|
2302c3244b
|
Merge branch 'feature/vik/disable-spell-check' into feature/vik/check-if-submission-allowed
|
2013-02-20 12:01:42 -05:00 |
|
Vik Paruchuri
|
c48998b30a
|
Fix SA tests
|
2013-02-20 11:57:29 -05:00 |
|
Vik Paruchuri
|
7be76fe124
|
Fix tests
|
2013-02-20 11:54:57 -05:00 |
|
VikParuchuri
|
4673c7392b
|
Merge pull request #1458 from MITx/feature/diana/close-oe-problems
Support due dates for Peer Grading XModule
|
2013-02-20 08:54:50 -08:00 |
|
Vik Paruchuri
|
ee3c658f46
|
Merge remote-tracking branch 'origin/master' into feature/vik/disable-spell-check
|
2013-02-20 11:39:39 -05:00 |
|
Diana Huang
|
eefe87494d
|
Merge branch 'feature/diana/close-oe-problems' of github.com:MITx/mitx into feature/diana/close-oe-problems
|
2013-02-20 11:23:28 -05:00 |
|
Diana Huang
|
d0bd7466b4
|
Fix import statement for TimeInfo
|
2013-02-20 11:22:58 -05:00 |
|
Diana Huang
|
b3767fc553
|
Merge branch 'master' into feature/diana/close-oe-problems
Conflicts:
common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
common/lib/xmodule/xmodule/peer_grading_module.py
|
2013-02-20 11:20:10 -05:00 |
|
Diana Huang
|
03a4deb847
|
Merge pull request #1489 from MITx/feature/vik/settings-to-xmodule
Feature/vik/settings to xmodule
|
2013-02-20 08:06:20 -08:00 |
|
Diana Huang
|
e467c057c9
|
Fix test so we don't have to skip it anymore.
|
2013-02-20 10:59:38 -05:00 |
|
Christina Roberts
|
52caae2fee
|
Merge pull request #1515 from MITx/feature/btalbot/studio-pagechrome
Adding in Studio Page headers and actions + help text
|
2013-02-20 06:44:16 -08:00 |
|
Jay Zoldak
|
7dd1515f5d
|
Merge pull request #1517 from MITx/feature/zoldak/refactor-terrain
Refactor lettuce tests to move common stuff out of lms and cms and into common
|
2013-02-20 06:43:09 -08:00 |
|
Jay Zoldak
|
30edc380e1
|
Change coverage report config to reflect refactoring of terrain files
|
2013-02-20 09:31:50 -05:00 |
|
Victor Shnayder
|
2981f532c1
|
Integrate Brian T's front-page changes, add epfl and delft
- removed duplicate logos.
- cover images are still in the 200-350 KB range.
|
2013-02-19 22:04:20 -05:00 |
|
Victor Shnayder
|
105cbd3bfc
|
Merge remote-tracking branch 'origin/style/btalbot/homepage-newxunis' into press/international
|
2013-02-19 21:52:06 -05:00 |
|
Brian Talbot
|
266e8951a4
|
made necessary code revisions per https://github.com/MITx/mitx/pull/1515/files#r3069750
|
2013-02-19 17:18:09 -05:00 |
|
Jay Zoldak
|
db6fa9a3aa
|
Pep8fix lettuce test code
|
2013-02-19 16:46:32 -05:00 |
|
Jay Zoldak
|
040f840c9d
|
Remove portal (fake) app, move tests to courseware.
Comment out tests that don't run correctly without prerequisites.
|
2013-02-19 16:46:32 -05:00 |
|
Jay Zoldak
|
9096914782
|
Move terrain module from lms to common.
|
2013-02-19 16:46:32 -05:00 |
|
Brian Talbot
|
1f247ceb0c
|
edX Homepage - revised layout (HTML/CSS) for new edX universities and created logo assets
|
2013-02-19 16:40:21 -05:00 |
|
Vik Paruchuri
|
2b01ecc1af
|
Merge remote-tracking branch 'origin/master' into feature/vik/settings-to-xmodule
|
2013-02-19 15:21:47 -05:00 |
|
Vik Paruchuri
|
72d069825d
|
Merge remote-tracking branch 'origin/master' into feature/vik/check-if-submission-allowed
Conflicts:
lms/templates/instructor/staff_grading.html
|
2013-02-19 15:21:09 -05:00 |
|
David Ormsbee
|
821e2d06e9
|
Merge pull request #1466 from MITx/feature/ichuang/fix-idashboard-error-message
Fix error message provided by Instructor dashboard datadump - make it more useful
|
2013-02-19 11:08:21 -08:00 |
|
Victor Shnayder
|
45c80abecf
|
Add initial images for ANU, McGill, Rice, Toronto.
Still waiting on transparent logos.
|
2013-02-19 14:04:17 -05:00 |
|
Jay Zoldak
|
8c423da6db
|
Updated test to reflect new class name for course titles.
|
2013-02-19 13:50:40 -05:00 |
|
Jay Zoldak
|
301d58d648
|
Update lettuce test with new button name for add new section.
|
2013-02-19 13:31:11 -05:00 |
|
Brian Talbot
|
585dff521a
|
Merge branch 'master' into feature/btalbot/studio-pagechrome
|
2013-02-19 12:27:49 -05:00 |
|
Brian Talbot
|
fca98c19a5
|
studio - adding in info icon to page intro help and making icon classes consistent in all new references
|
2013-02-19 12:13:08 -05:00 |
|
Christina Roberts
|
94a28f600b
|
Merge pull request #1510 from MITx/bug/btalbot/html-strongspan
xmodule scss - resolved studio bug #191
|
2013-02-19 09:09:47 -08:00 |
|
cahrens
|
596de8ab2c
|
Hook up "View Live" buttons and get "New Static Tab" working again.
|
2013-02-19 11:34:41 -05:00 |
|
VikParuchuri
|
0db6247d96
|
Merge pull request #1513 from MITx/feature/vik/improve-oe-ui
Skip self assessment test (fails due to need for querydict for getlist t...
|
2013-02-19 08:15:42 -08:00 |
|
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 |
|
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 |
|
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 |
|