Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,825 Commits 1 Branch 0 Tags
25dae57226447cfb9efbebca30945ab50e37a653
Commit Graph

13825 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vik Paruchuri
b0e55df13e Alter max attempts 2013-02-13 11:24:21 -05:00
Don Mitchell
f7e635a7cd fix npe w/ prev commit 2013-02-13 11:22:35 -05:00
Don Mitchell
4e3e2ec707 If user was trying to get to a specific page but had to log in, let them 
get to that page once they've logged in.
 2013-02-13 11:20:08 -05:00
Valera Rozuvan
26094a0421 YouTube HTML5 mode is used by default. Fix typo in video alpha template. 2013-02-13 16:47:06 +02:00
Vik Paruchuri
8f7c145957 Remove old import statements 2013-02-13 09:45:29 -05:00
Don Mitchell
3450c72833 Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into feature/btalbot/studio-softlanding 2013-02-13 09:31:09 -05:00
Don Mitchell
6f3a954d7b howitworks is default home page if not logged in. Otherwise course 
index. NOTE: didn't fix old wrong behavior of going to index if not
logged in and tried to navigate to a specific page. Will work on that
next.
 2013-02-13 09:30:54 -05:00
Christina Roberts
0b91c1c346 Merge pull request #1487 from MITx/fix/cdodge/cleanup-deleted-templates 
clean up templates that were removed from disk - we need to remove from ...
 2013-02-13 06:29:35 -08:00
Chris Dodge
fbe3d29f19 added tests 2013-02-13 09:25:09 -05:00
Brian Talbot
f1ad05059c studio - correcting an image-replacement Sass mixin 2013-02-13 09:18:23 -05:00
Brian Talbot
714f69a57e studio - resolving merge conflicts in settings from a recent rebase 2013-02-13 09:07:53 -05:00
Valera Rozuvan
a7b0dd67b7 Merge branch 'feature/valera/video_alpha' of github.com:MITx/mitx into feature/valera/video_alpha 2013-02-13 14:09:44 +02:00
Valera Rozuvan
6d5e230733 Fixes and additions. Addressing comments by Carlos for pull request 1409. 2013-02-13 14:09:35 +02:00
Vasyl Nakvasiuk
d0ac56ca56 some small fix 2013-02-13 13:35:34 +02:00
Vasyl Nakvasiuk
1f79877a9b add xml exmaple for videoalpja module in docstring 2013-02-13 13:35:10 +02:00
Vasyl Nakvasiuk
e6f1687362 rm videoalpha_list method 2013-02-13 13:28:09 +02:00
Vasyl Nakvasiuk
42b332abb4 remove unnecessary code 2013-02-13 13:11:59 +02:00
Vasyl Nakvasiuk
2a05fdd4d9 use one general dictionary self.sources for videoalpha_module 2013-02-13 11:48:06 +02:00
jmclaus
9dbe911907 Back to last version of Protex 2013-02-13 09:45:44 +01:00
Valera Rozuvan
df31b3114b Fixed bug when switching speeds in YouTube HTML5 player. 2013-02-13 10:27:57 +02:00
Valera Rozuvan
baf6bbe34a Finalized HTML5 YouTube player inbrowser speed changes. 2013-02-13 10:27:57 +02:00
Valera Rozuvan
143217d6b6 Work on adding native spped change for YouTube HTML5. Not complete. 2013-02-13 10:27:57 +02:00
Valera Rozuvan
bfda8bec89 Fixed bug with HTML5 start end options. Now can specify an interval of video which must be played. 2013-02-13 10:27:56 +02:00
Valera Rozuvan
6729eae90c Added start and end time support. 2013-02-13 10:27:56 +02:00
Valera Rozuvan
0216a0fd35 Fixed bugs. Removed unnecessary things from HTML5. Minor improvements. Subtitles now work in HTML5 if specified. 2013-02-13 10:27:56 +02:00
Valera Rozuvan
83f18fed28 Fixed bug with jumpy timeline when switching speeds. Enabled show_captions option. Added JS support for subtitles in HTML5 mode. 2013-02-13 10:27:56 +02:00
Vasyl Nakvasiuk
0ff68979ea add "sub" to <video> tag in xml lessons 2013-02-13 10:27:56 +02:00
Vasyl Nakvasiuk
219b8e8d45 add support sub attribute for <video> tag 2013-02-13 10:27:56 +02:00
Vasyl Nakvasiuk
c0d024df8e fix wemb -> webm 2013-02-13 10:27:56 +02:00
Vasyl Nakvasiuk
1d08e22718 add docstrings in videoalpha_module.py 2013-02-13 10:27:56 +02:00
Valera Rozuvan
12eda46238 Added ability to change playback rate, added pause/play on video click, minor improvements. 2013-02-13 10:27:56 +02:00
Valera Rozuvan
e37b62e4d3 Added support for time line in HTML5. 2013-02-13 10:27:56 +02:00
Valera Rozuvan
dc267e894f Enabled play/pause buttons for HTML5 video player. 2013-02-13 10:27:56 +02:00
Vasyl Nakvasiuk
4163bb7b06 <videoalpha> tag now support multi-source 2013-02-13 10:27:56 +02:00
Valera Rozuvan
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. 2013-02-13 10:27:56 +02:00
Valera Rozuvan
78e9692aaa Adding HTML5Video class and modifying coffee sources to use it when video sources are provided instead of YouTube IDs. 2013-02-13 10:27:56 +02:00
Valera Rozuvan
156da20c35 Renamed videox to videoalpha, as per Piotr naming scheme request. 2013-02-13 10:27:55 +02:00
Arthur Barrett
949603e3c1 Fixed issue with return link and scroll after effects. 2013-02-13 01:16:20 -05:00
Arthur Barrett
6b5bf319c3 Style and behavior changes. Added return links to discussions. 2013-02-12 19:08:23 -05:00
Carlos Andrés Rocha
dff0c10b7a Merge pull request #1493 from MITx/bug/dhm/misc 
Fix broken test and don't pass time units as strings but as ints.
 2013-02-12 15:14:37 -08:00
Brian Talbot
fccb3d7a73 studio - nav and soft landing various QA fixes 2013-02-12 17:36:36 -05:00
Don Mitchell
c904174bb7 Fix broken test and don't pass time units as strings but as ints. 2013-02-12 17:30:57 -05:00
Julian Arni
9785bc9e70 Adding multiple-choice loncapa integration. 2013-02-12 17:21:34 -05:00
Brian Talbot
0a2b74110e studio - nav and soft landing various QA fixes 2013-02-12 17:03:48 -05:00
Don Mitchell
d569c559ca Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into feature/btalbot/studio-softlanding 
Conflicts:
	cms/djangoapps/contentstore/views.py
	cms/static/js/views/settings/main_settings_view.js
	cms/templates/index.html
	cms/templates/settings.html
 2013-02-12 16:57:00 -05:00
jkarni
2197bd987f Merge pull request #1461 from MITx/feature/julian/multiple-choice-tweaks 
Feature/julian/multiple choice tweaks
 2013-02-12 13:32:15 -08:00
chrisndodge
af364166fe Merge pull request #1491 from MITx/bug/dhm/misc 
lms required grace period fields to be in specific order
 2013-02-12 12:42:53 -08:00
Vik Paruchuri
b40a035ff7 Update error message 2013-02-12 15:32:57 -05:00
Vik Paruchuri
5cf7441da1 Fix error message passing to JS and student 2013-02-12 15:31:30 -05:00
cahrens
f56729dbdb Turn off line wrapping. 2013-02-12 15:27:38 -05:00