Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • 42b332abb4 remove unnecessary code Vasyl Nakvasiuk 2013-02-13 13:11:59 +02:00
  • 2a05fdd4d9 use one general dictionary self.sources for videoalpha_module Vasyl Nakvasiuk 2013-02-13 11:48:06 +02:00
  • 9dbe911907 Back to last version of Protex jmclaus 2013-02-13 09:45:44 +01:00
  • df31b3114b Fixed bug when switching speeds in YouTube HTML5 player. Valera Rozuvan 2013-02-04 16:27:13 +02:00
  • baf6bbe34a Finalized HTML5 YouTube player inbrowser speed changes. Valera Rozuvan 2013-02-04 10:33:26 +02:00
  • 143217d6b6 Work on adding native spped change for YouTube HTML5. Not complete. Valera Rozuvan 2013-02-01 18:02:41 +02:00
  • bfda8bec89 Fixed bug with HTML5 start end options. Now can specify an interval of video which must be played. Valera Rozuvan 2013-02-01 16:47:34 +02:00
  • 6729eae90c Added start and end time support. Valera Rozuvan 2013-02-01 16:18:03 +02:00
  • 0216a0fd35 Fixed bugs. Removed unnecessary things from HTML5. Minor improvements. Subtitles now work in HTML5 if specified. Valera Rozuvan 2013-02-01 13:58:46 +02:00
  • 83f18fed28 Fixed bug with jumpy timeline when switching speeds. Enabled show_captions option. Added JS support for subtitles in HTML5 mode. Valera Rozuvan 2013-02-01 11:24:53 +02:00
  • 0ff68979ea add "sub" to <video> tag in xml lessons Vasyl Nakvasiuk 2013-02-01 10:55:20 +02:00
  • 219b8e8d45 add support sub attribute for <video> tag Vasyl Nakvasiuk 2013-01-31 19:04:55 +02:00
  • c0d024df8e fix wemb -> webm Vasyl Nakvasiuk 2013-01-31 15:43:39 +02:00
  • 1d08e22718 add docstrings in videoalpha_module.py Vasyl Nakvasiuk 2013-01-31 14:52:58 +02:00
  • 12eda46238 Added ability to change playback rate, added pause/play on video click, minor improvements. Valera Rozuvan 2013-01-31 14:34:36 +02:00
  • e37b62e4d3 Added support for time line in HTML5. Valera Rozuvan 2013-01-31 13:24:17 +02:00
  • dc267e894f Enabled play/pause buttons for HTML5 video player. Valera Rozuvan 2013-01-31 12:48:03 +02:00
  • 4163bb7b06 <videoalpha> tag now support multi-source Vasyl Nakvasiuk 2013-01-31 11:23:13 +02:00
  • adf0c75d51 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. Valera Rozuvan 2013-01-31 10:35:07 +02:00
  • 78e9692aaa Adding HTML5Video class and modifying coffee sources to use it when video sources are provided instead of YouTube IDs. Valera Rozuvan 2013-01-30 18:06:27 +02:00
  • 156da20c35 Renamed videox to videoalpha, as per Piotr naming scheme request. Valera Rozuvan 2013-01-30 11:47:17 +02:00
  • 949603e3c1 Fixed issue with return link and scroll after effects. Arthur Barrett 2013-02-13 01:16:20 -05:00
  • 6b5bf319c3 Style and behavior changes. Added return links to discussions. Arthur Barrett 2013-02-12 19:08:23 -05:00
  • dff0c10b7a Merge pull request #1493 from MITx/bug/dhm/misc Carlos Andrés Rocha 2013-02-12 15:14:37 -08:00
  • fccb3d7a73 studio - nav and soft landing various QA fixes Brian Talbot 2013-02-12 17:36:36 -05:00
  • c904174bb7 Fix broken test and don't pass time units as strings but as ints. Don Mitchell 2013-02-12 17:30:57 -05:00
  • 9785bc9e70 Adding multiple-choice loncapa integration. Julian Arni 2013-02-06 20:36:44 -05:00
  • 0a2b74110e studio - nav and soft landing various QA fixes Brian Talbot 2013-02-12 17:03:48 -05:00
  • d569c559ca Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into feature/btalbot/studio-softlanding Don Mitchell 2013-02-12 16:57:00 -05:00
  • 2197bd987f Merge pull request #1461 from MITx/feature/julian/multiple-choice-tweaks jkarni 2013-02-12 13:32:15 -08:00
  • af364166fe Merge pull request #1491 from MITx/bug/dhm/misc chrisndodge 2013-02-12 12:42:53 -08:00
  • b40a035ff7 Update error message Vik Paruchuri 2013-02-12 15:32:57 -05:00
  • 5cf7441da1 Fix error message passing to JS and student Vik Paruchuri 2013-02-12 15:31:30 -05:00
  • f56729dbdb Turn off line wrapping. cahrens 2013-02-12 15:27:38 -05:00
  • 53028b46c3 Remove debug statements Vik Paruchuri 2013-02-12 15:23:11 -05:00
  • 76d675ba16 fix npe for time (bug 185) Don Mitchell 2013-02-12 15:20:02 -05:00
  • dd50313f82 studio - revised manual policy editor scss to have value field height match key values' and condensed error message UI Brian Talbot 2013-02-12 15:19:08 -05:00
  • 40668133f7 Fix bug which I know I fixed before (perhaps on another branch?) to ensure old time had a value before comparing it to new time. Don Mitchell 2013-02-12 15:11:35 -05:00
  • 70e11e823c studio - made all page heading chrome have consistent markup Brian Talbot 2013-02-12 15:07:32 -05:00
  • 74b1187a39 Remove log statements Vik Paruchuri 2013-02-12 15:04:49 -05:00
  • 1409f8aa6b Add in checking for score list length to rubric rendering Vik Paruchuri 2013-02-12 15:03:03 -05:00
  • 8d3f4932e7 Add in checks to see if student can submit (ie needs to peer grade more or not) Vik Paruchuri 2013-02-12 14:41:36 -05:00
  • 4237df625a Add in a check function to see if students are allowed to submit peer grading Vik Paruchuri 2013-02-12 14:31:30 -05:00
  • 540710f553 studio - nav revamp: added in dynamic course org and number to header Brian Talbot 2013-02-12 14:22:42 -05:00
  • 0c70d201f8 Auto-expand the discussion thread after it is scrolled to by simulating a click on the show/hide button. Note: the jQuery highlight effect doesnt work here due to a CSS !important setting on .discussion-module background color. Arthur Barrett 2013-02-12 13:57:28 -05:00
  • 8e213fb0d7 lms required grace period fields to be in specific order Don Mitchell 2013-02-12 13:48:54 -05:00
  • 27e8d699be On 32-bit Python, this conversion could overflow, for example, for year 2099. This conversion won't. Ned Batchelder 2013-02-12 13:41:44 -05:00
  • 482d97d321 Better error messages for when a linked problem cannot be found Diana Huang 2013-02-12 13:41:26 -05:00
  • 9ead4ebb35 Wire through ability to skip basic checks Vik Paruchuri 2013-02-12 13:30:56 -05:00
  • 7e7911a08d Changed the markup and js for associating spans with discussion threads. Uses the discussion id now. Arthur Barrett 2013-02-12 13:24:50 -05:00
  • e5c0bdf7a1 studio - added in manual policy editor CodeMirror styles and removed unused classes on CodeMirror instance in other settings tabs Brian Talbot 2013-02-12 13:13:37 -05:00
  • 537d6dd18e Merge pull request #1490 from MITx/bugfix/brian/pearson-timer David Ormsbee 2013-02-12 09:26:53 -08:00
  • b5378b04b3 change timer to calculate relative duration in javascript Brian Wilson 2013-02-12 12:25:11 -05:00
  • c9c026be62 Fixed urls Don Mitchell 2013-02-12 12:15:07 -05:00
  • 45a27f303f Merge branch 'master' into feature/abarrett/annotatable_xmodule Arthur Barrett 2013-02-12 12:09:21 -05:00
  • cfa16feab5 Trying to setup jasmine specs... Arthur Barrett 2013-02-12 12:00:54 -05:00
  • 7ca267fd78 studio - debugging grading settings JS errors WIP Brian Talbot 2013-02-12 11:56:54 -05:00
  • baee9f96dc Merge branch 'master' of github.com:MITx/mitx Ned Batchelder 2013-02-12 11:28:51 -05:00
  • 78d3d20069 When checking types to convert data, don't forget about longs. 32-bit Pythons make longs from values that are ints on 64-bit Pythons. Ned Batchelder 2013-01-23 17:11:02 -05:00
  • 22b959d657 studio - link wiring and spot styling changes for new nav/soft landing/settings work Brian Talbot 2013-02-12 11:16:37 -05:00
  • 7658cd7a50 Make the text on the peer grading closed page clearer Diana Huang 2013-02-12 11:10:59 -05:00
  • e07b667c02 Merge pull request #1488 from MITx/bug/btalbot/pearson-ie David Ormsbee 2013-02-12 08:01:59 -08:00
  • d45c539c6d Make the peer grading due date a property of the problem metadata, not the peer grading module metadata. Diana Huang 2013-02-12 10:49:06 -05:00
  • 7d65c64148 Merge pull request #1485 from MITx/fix/kevin/code_show_lt_and_gt Victor Shnayder 2013-02-12 07:38:16 -08:00
  • f33f7134fb lms - pearson: trying to resolve JQUI accordion width bug in IE7 - enforcing width to chapters Brian Talbot 2013-02-12 10:34:21 -05:00
  • 75ceed7f69 Show "successful save" message when a new edit is made. cahrens 2013-02-12 10:29:47 -05:00
  • 93d186511f clean up templates that were removed from disk - we need to remove from DB as well Chris Dodge 2013-02-12 10:23:32 -05:00
  • 23bb87e0bb Merge pull request #1486 from MITx/feature/ned/clean_up_tests Calen Pennington 2013-02-12 07:22:27 -08:00
  • de5b3a2a39 Merge pull request #1483 from MITx/feature/victor/raw-static-files Calen Pennington 2013-02-12 07:21:01 -08:00
  • 83e4dfaacb lms - pearson: trying to resolve JQUI accordion width bug in IE7 Brian Talbot 2013-02-12 09:58:16 -05:00
  • 21f4616080 spread less than and greater than fix to responses and comments, and profile view Kevin Chugh 2013-02-12 09:18:46 -05:00
  • 8976818c78 studio - header UI: in progress markup changes WIP Brian Talbot 2013-02-12 09:16:24 -05:00
  • d57c78f9d9 fix showing less than and greater than in code Kevin Chugh 2013-02-11 20:01:09 -05:00
  • 65cb53b8a6 Revert logsettings Vik Paruchuri 2013-02-11 19:21:22 -05:00
  • e1b2481c38 Fix remaining path issues Vik Paruchuri 2013-02-11 19:08:53 -05:00
  • bdc5910cbb Fix import paths to point to xmodule, remove old JS resource strings Vik Paruchuri 2013-02-11 19:03:18 -05:00
  • b5bac1e3c1 Fix some path issues in import statements Vik Paruchuri 2013-02-11 18:47:01 -05:00
  • b9bf96520e Move open ended grading xmodule support files into a separate directory. apparently prune down on number of imports Vik Paruchuri 2013-02-11 18:43:47 -05:00
  • c2b32b7038 Fix location that is queried on Vik Paruchuri 2013-02-11 18:23:01 -05:00
  • ba650202b4 Add in logic to pass settings to peer grading xmodule Vik Paruchuri 2013-02-11 18:09:57 -05:00
  • 323caeb744 Properly pass around S3 interface Vik Paruchuri 2013-02-11 17:58:19 -05:00
  • 75898bfe1a tell collectstatic not to mess with protex--it relies on the filename Victor Shnayder 2013-02-11 17:54:54 -05:00
  • 01e8fe8d08 Pass S3 interface in module_render Vik Paruchuri 2013-02-11 17:54:37 -05:00
  • aadb885211 Merge branch 'feature/victor/raw-static-files' into 700x-sandbox Victor Shnayder 2013-02-11 17:51:36 -05:00
  • 3ccb33c8b3 Simplify, make it actually work. Victor Shnayder 2013-02-11 17:50:13 -05:00
  • 120c0e139e Remove url element from parent class to avoid annoying errors Vik Paruchuri 2013-02-11 17:38:25 -05:00
  • 0f71f5b92e Finish settings refactor Vik Paruchuri 2013-02-11 17:36:33 -05:00
  • aca5e2300b Fix dev settings Vik Paruchuri 2013-02-11 17:33:16 -05:00
  • 9bca4ebf21 Start to refactor grading settings Vik Paruchuri 2013-02-11 17:32:11 -05:00
  • 285e575895 Update copy to be clearer about the workflow. Diana Huang 2013-02-11 17:29:45 -05:00
  • e9bb5eb1d0 Minor updates. cahrens 2013-02-11 17:27:39 -05:00
  • 2dcdeff4b6 Make replace_static_urls leave alone urls that have '?raw' at the end Victor Shnayder 2013-02-11 17:07:15 -05:00
  • aa2d0ecaf2 We no longer need override_settings, Django has a better one. Ned Batchelder 2013-02-11 17:06:35 -05:00
  • f18618e35b Merge pull request #1482 from MITx/bug/dhm/misc Christina Roberts 2013-02-11 13:46:20 -08:00
  • 8bc9564d92 clean up note to self Don Mitchell 2013-02-11 16:45:36 -05:00
  • 777e0ef9c5 The other one was too inclusive Don Mitchell 2013-02-11 16:36:34 -05:00
  • 565f5f0adc Stop simple clicks from paging to top w/o disrupting dnd Don Mitchell 2013-02-11 16:28:22 -05:00
  • 14234c8106 Merge pull request #1481 from MITx/bug/dhm/misc Christina Roberts 2013-02-11 13:23:08 -08:00
  • 8f5d8a98c7 studio - resolved sidebar content organization and styling Brian Talbot 2013-02-11 16:20:25 -05:00
  • a144896154 Style and behavior changes to the header and tooltips. Arthur Barrett 2013-02-11 16:17:34 -05:00