John Jarvis
2a6fde9db2
javascript to redirect to the course being accessed
2013-02-19 20:42:38 -05:00
John Jarvis
fd36c555a6
Renaming login url for modal-less login
2013-02-19 19:36:32 -05:00
John Jarvis
bfbd7de042
Adding baseFontColor to _variables.scss
2013-02-19 19:36:15 -05:00
Brian Talbot
6f922570ff
made flex-grid references consistent within different page element Sass files
2013-02-19 17:36:28 -05:00
Brian Talbot
d14c8e2585
Merge branch 'drupal-new' of github.com:MITx/mitx into drupal-new
2013-02-19 17:32:25 -05:00
Brian Talbot
074f866b58
resolving some light footer display issues
2013-02-19 17:32:17 -05:00
John Jarvis
4596fa417f
Changing login and signin view names
2013-02-19 17:31:22 -05:00
Brian Talbot
b2839514f2
Merge branch 'drupal-new' of github.com:MITx/mitx into drupal-new
2013-02-19 17:22:57 -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
Arthur Barrett
34cc112cfb
Saving work in progress on annotations v2 with classification problems.
2013-02-19 14:18:56 -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
John Jarvis
dabcb51746
resolving merge conflicts
2013-02-19 12:43:06 -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
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
Arthur Barrett
72d9c1d7d2
Saving work-in-progress of guided classification exercise.
2013-02-18 19:02:54 -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
David Ormsbee
87784d1cff
Make sure the submissions history only shows up with problems.
2013-02-15 14:36:10 -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
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
Diana Huang
7b11843086
Merge branch 'master' into diana/click-tracking
2013-02-15 12:53:21 -05:00
Alexander Kryklia
059b9f66e3
poll and conditional finished
2013-02-15 18:48:39 +02:00
David Ormsbee
8f17e6ae9e
First pass at implementing problem history.
2013-02-15 01:30:14 -05:00
Brian Wilson
0d3b566dd8
finish piping URL through to pdf.js
2013-02-14 15:47:53 -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
Vasyl Nakvasiuk
786c11484e
<videoalpha> tag now support multi-source
2013-02-14 11:22:12 +02:00
