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
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
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
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
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
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
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
Valera Rozuvan
ed00d20708
Updated all coffee scripts to define and use Alpha version of classes. Added missing functions for HTML5Video.Player prototype. Now bare bones works without errors. YouTube version also works without errors.
2013-02-14 11:22:12 +02:00
Valera Rozuvan
ca83c3953a
Adding HTML5Video class and modifying coffee sources to use it when video sources are provided instead of YouTube IDs.
2013-02-14 11:22:12 +02:00
Valera Rozuvan
7c7e09500a
Renamed videox to videoalpha, as per Piotr naming scheme request.
2013-02-14 11:22:12 +02:00
Brian Wilson
f0258b8dd0
first pass at pdfbook
2013-02-13 18:01:44 -05:00
Diana Huang
943a565717
Log rubric selection clicks
2013-02-13 16:48:58 -05:00
Vik Paruchuri
48a5c9f0b2
Remove score display from status bar
2013-02-13 16:05:12 -05:00
Arthur Barrett
010593be6f
Merge branch 'master' into feature/abarrett/annotatable_xmodule
2013-02-13 15:39:41 -05:00
Vik Paruchuri
02b0bc2923
Add in answer unknown container/checkbox to pass back to controller
2013-02-13 15:37:42 -05:00
Calen Pennington
bd822b9d2f
Fix tests post-merge
2013-02-13 14:13:22 -05:00
Calen Pennington
793bbfd351
Set up dev environment for testing xml vs mongo vs split_mongo modulestores
2013-02-13 14:04:21 -05:00
Ned Batchelder
857edaf6f3
Remove dogfood and quickedit.
2013-02-13 12:23:08 -05:00
Vik Paruchuri
9e5eca1417
Swap b tag for span
2013-02-13 11:29:18 -05:00
Arthur Barrett
6b5bf319c3
Style and behavior changes. Added return links to discussions.
2013-02-12 19:08:23 -05:00
Brian Wilson
b5378b04b3
change timer to calculate relative duration in javascript
2013-02-12 12:25:11 -05:00
Arthur Barrett
45a27f303f
Merge branch 'master' into feature/abarrett/annotatable_xmodule
2013-02-12 12:09:21 -05:00
Diana Huang
7658cd7a50
Make the text on the peer grading closed page clearer
2013-02-12 11:10:59 -05:00
Diana Huang
285e575895
Update copy to be clearer about the workflow.
2013-02-11 17:29:45 -05:00
Arthur Barrett
a144896154
Style and behavior changes to the header and tooltips.
2013-02-11 16:17:34 -05:00
Your Name
7a1aed8945
Merge remote-tracking branch 'origin/master' into feature/victor/revert-revert-of-forums-ui
2013-02-11 13:55:47 -05:00
Vik Paruchuri
4e071d086f
Fix staff grading ML error info a bit
2013-02-11 11:31:26 -05:00
Diana Huang
d3d3a03c61
Add checkbox and make sure to uncheck it after submission
2013-02-11 09:23:55 -05:00
David Ormsbee
754493597d
Merge pull request #1469 from MITx/feature/ichuang/fix-verbose-staff-debug
...
Fix "staff debug" so it only appears where useful, instead of everywhere
2013-02-10 22:10:53 -08:00
Vik Paruchuri
d7c60231f0
Fix template icon
2013-02-09 15:13:55 -05:00
Vik Paruchuri
21cca5fb97
Add missing tag
2013-02-09 11:14:12 -05:00
Vik Paruchuri
50ba024ae8
Add additional calibration interstitial page, add in message when calibration essay saved.
2013-02-09 10:43:40 -05:00
