Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,611 Commits 1 Branch 0 Tags
bc1ee3dbfa1ba0f7b3de62dec3696f76569e1b4e
Commit Graph

3848 Commits

Author SHA1 Message Date
Ned Batchelder
c3b571bf9b Make sure temp directories are properly cleaned up so running tests doesn't leave them behind. 2013-02-21 11:38:45 -05:00
Diana Huang
3fe6a74e76 Merge pull request #1528 from MITx/press/international-press-release 
add press release: edX expands internationally
 2013-02-20 14:55:58 -08:00
Victor Shnayder
84eaec3666 add press release: edX expands internationally 2013-02-20 17:50:23 -05:00
Victor Shnayder
bf454382d0 Merge pull request #1525 from MITx/press/international 
Press/international
 2013-02-20 14:14:11 -08:00
Victor Shnayder
4d643d36cc Merge branch 'press/international' of github.com:MITx/mitx into press/international 2013-02-20 16:53:39 -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
Brian Talbot
d0fca477a8 edx.org - university pages' main banner images are now centered when window resizes 2013-02-20 16:12:36 -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
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
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
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
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
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
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
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
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
Jay Zoldak
34a4b35e66 Fix lettuce acceptance tests to reflect the new soft landing page changes. 2013-02-15 14:07:46 -05:00
Victor Shnayder
cc7a97082a Merge pull request #1468 from MITx/feature/ichuang/fix-module-staff-access-v2 
fix module staff accesss - by has_access, not by user.is_staff
 2013-02-14 12:08:56 -08:00
Victor Shnayder
723012b2bb Better logging, and make view csrf exempt... 2013-02-14 14:50:18 -05:00
Victor Shnayder
d7f9bdda66 Move foldit app into the lms. No need for it in the cms, and it was breaking tests there.. 2013-02-14 13:23:58 -05:00
Victor Shnayder
4f8757600a merge 2013-02-14 12:49:14 -05:00
Victor Shnayder
5e44846596 Foldit integration. 
- ops view for the desktop app to talk to
  - xmodule that talks to the foldit model and displays the student's state
  - grading tweak to make grade updates from an external service work:
    - Add an always_recalculate_grades property to XModuleDescriptor.
 2013-02-14 12:45:06 -05:00
Victor Shnayder
21dab27ed6 fix logger name in module_render 2013-02-14 12:45:01 -05:00
Ned Batchelder
f9664284c5 Merge pull request #1501 from MITx/feature/ned/fix-firefox-gradient-buttons 
Firefox doesn't draw the buttons right with -90deg, but will draw it rig...
 2013-02-14 08:41:41 -08:00
Ned Batchelder
d614c80cc2 Firefox doesn't draw the buttons right with -90deg, but will draw it right if no direction is specified. 2013-02-14 10:39:16 -05:00
Valera Rozuvan
d55b818bb2 Updated YouTube JS API file to the new one. 2013-02-14 11:25:36 +02:00
Valera Rozuvan
92dc8859a3 YouTube HTML5 mode is used by default. Fix typo in video alpha template. 2013-02-14 11:22:14 +02:00
Vasyl Nakvasiuk
8cf8dcd10b rm videoalpha_list method 2013-02-14 11:22:13 +02:00
Vasyl Nakvasiuk
de94855ba0 use one general dictionary self.sources for videoalpha_module 2013-02-14 11:22:13 +02:00
Vasyl Nakvasiuk
a2d9df9d34 add "sub" to <video> tag in xml lessons 2013-02-14 11:22:13 +02:00
Vasyl Nakvasiuk
d72036a6dc add support sub attribute for <video> tag 2013-02-14 11:22:13 +02:00
Vasyl Nakvasiuk
3ac9d54ff7 fix wemb -> webm 2013-02-14 11:22:13 +02:00
Valera Rozuvan
067f2e97f5 Enabled play/pause buttons for HTML5 video player. 2013-02-14 11:22:12 +02:00