Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
17,334 Commits 1 Branch 0 Tags
4b9df2e9989afbb5dea875a90bd2d962f456debd
Commit Graph

4690 Commits

Author SHA1 Message Date
Don Mitchell
0848360436 Merge pull request #844 from edx/dhm/editable_metadata 
refactoring of platform to xblock 0.3 w/ refactoring of inheritance in the platform to a consistent representation.
 2013-09-06 11:58:36 -07:00
Don Mitchell
0099ee0970 Clarify repr by naming 2013-09-06 12:19:51 -04:00
Don Mitchell
b81e5504db Fix pylint and typos 2013-09-06 12:19:51 -04:00
Don Mitchell
fc131fa841 Add InheritanceKVS and standardize inherited attr patterns 2013-09-06 12:19:50 -04:00
Calen Pennington
8201b1412e Use XBlock 0.3 2013-09-06 09:45:59 -04:00
Valera Rozuvan
441eb3699b Merge pull request #869 from edx/valera/video_js_console_log_useful_debug_info 
Adding debugging messages for Video player.
 2013-09-06 04:51:23 -07:00
Valera Rozuvan
73a9c43ebb Addressing Anton's comments on PR 869. 
Removed extra check for console.log() existance. Modified error
messages. Formatted entire file to fit in 80 lines or less.

Formatting files so that they fit under 80 lines. Adding debug info for
what type of YouTube video player is being used. Also comment on whether
playbackRates is available for HTML5 mode.

Changed back Anton's original function _checkPlaybackRates(). Now logging for
this function's result is done only on error (in the function that is invoking)
it).
 2013-09-06 14:16:47 +03:00
Valera Rozuvan
20c16ec69e Adding debugging messages for Video player. 
For now outputting main flow of loading YouTube or non-YouTube videos.
 2013-09-06 14:16:46 +03:00
Valera Rozuvan
b2c605a187 Addressing comments by Jean Michel for PR 867. 
Forgot to include local variables in var statement.
 2013-09-06 14:02:28 +03:00
Valera Rozuvan
8ffd16366f Fix for test. 
Must clear the state youtubeXhr variable before counting number
of ajax calls.
 2013-09-06 11:58:49 +03:00
Valera Rozuvan
545af7e854 Jasmine test to verify that only one check for YT is made. 
We test for the number of ajax calls made when there are 3
videos on the page.
 2013-09-06 11:58:49 +03:00
jmclaus
e1f75666fa Added test to verify that there is a certain order in the controls -- tabbing on the speed control will malfunction if it is not the case. 2013-09-06 09:22:33 +02:00
jmclaus
8e2c5bca7b Added focus tracking to play/pause button. This fixes a bug where the tabbing, in certain condition, would get stuck on speed button. 2013-09-06 09:22:33 +02:00
jmclaus
578e02b589 Speed button know behaves like the volume button when tabbing forward or backward. 2013-09-06 09:22:33 +02:00
chrisndodge
9aa024b585 Merge pull request #845 from edx/bugfix/ichuang/fix-capa-optioninput-for-inline 
Fix capa optioninput template to honor inline flag
 2013-09-05 15:51:30 -07:00
Anton Stupak
d93215c0b9 Fix test. 2013-09-05 17:02:53 +03:00
Anton Stupak
af6d0eb145 Fix selector. 2013-09-05 10:49:42 +03:00
ichuang
69f72989c5 consistently use inline=False as default in capa inputtypes 2013-09-04 23:13:05 -04:00
Adam
ef042c39aa Merge pull request #853 from edx/fix/adam/pylint-pep8 
fix pep8 and pylint errors
 2013-09-03 14:22:11 -07:00
Adam Palay
67890b3c66 resolve merge conflict with hotfix branch 2013-09-03 16:00:24 -04:00
Adam Palay
300f7f13a6 fix pep8 and pylint errors 
Conflicts:
	cms/djangoapps/contentstore/views/course.py
	common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
	lms/envs/common.py
 2013-09-03 14:55:11 -04:00
Anton Stupak
a09e610403 Fix multiple video bug 2013-09-03 18:49:46 +03:00
ichuang
d7fdcd904a fix capa optioninput template to honor inline flag 2013-08-31 15:14:05 -04:00
Sarina Canelake
6defd7baf1 Merge pull request #790 from edx/unanswered-on-input 
Unanswered on input
 2013-08-30 14:25:21 -07:00
Peter Baratta
fe47dcb122 Acceptance tests for visual correctness reset feature 2013-08-30 17:24:33 -04:00
Adam Palay
5b0194d9b4 bump version number on calc 2013-08-30 16:59:46 -04:00
Adam Palay
589dcfcc35 change calcfunctions -> functions 2013-08-30 16:57:44 -04:00
Adam Palay
2284f56e20 specify preview import statements to reflect new package structure 2013-08-30 16:57:27 -04:00
Adam Palay
ac90679544 restructure calc 2013-08-30 16:57:10 -04:00
Calen Pennington
ea36b834c7 Merge pull request #811 from cpennington/initialize-mitxmako-at-startup 
Move mitxmako initialization to a startup module
 2013-08-30 13:10:09 -07:00
Peter Baratta
48cb05c037 Reset 'correctness' visual indicator of a problem on new input 
Affects:
Choicegroups, option inputs, textline, and formula equation inputs
 2013-08-30 12:03:41 -04:00
Christina Roberts
d893e6d440 Merge pull request #827 from edx/christina/course-info-links3 
Rewriting of links for Course Updates and Course Handouts.
 2013-08-30 07:32:01 -07:00
Vik Paruchuri
df03b09136 Merge pull request #824 from edx/fix/vik/oe-progress 
Properly display student progress
 2013-08-29 14:39:11 -07:00
Vik Paruchuri
9b57ef0b54 Pep8 fixes 2013-08-29 17:28:14 -04:00
Vik Paruchuri
a06226aad6 Address review comments 2013-08-29 16:34:17 -04:00
Will Daly
fc5a24dfc0 Merge pull request #801 from edx/will/remove-test-network-calls 
Remove network calls in test suite
 2013-08-29 11:42:19 -07:00
cahrens
a061c7ece7 Rewriting of links for Course Updates and Course Handouts. 
STUD-669.
 2013-08-29 14:35:16 -04:00
Sarina Canelake
52d9320e62 Hide "Email Settings" from student dash if bulk email not enabled 
Some minor pep8 cleanup
 2013-08-29 12:40:33 -04:00
Sarina Canelake
e6bde93837 Change bulk email model field names and add migrations 2013-08-29 12:40:33 -04:00
Sarina Canelake
b3bc4023b0 Refactor html->plaintext conversion (for bulk email) into separate library 2013-08-29 12:40:33 -04:00
Vik Paruchuri
940a337dd3 Properly display student progress 2013-08-29 12:14:30 -04:00
Will Daly
bfca803b27 Merge pull request #818 from edx/will/cms-js-fixtures-dir 
Studio JS fixture files no longer need individual symlinks
 2013-08-29 08:37:15 -07:00
Will Daly
23805ca52f Studio JS fixture files no longer need individual symlinks 2013-08-29 07:50:28 -04:00
Ned Batchelder
547d441954 Merge pull request #821 from edx/ned/fix-the-requirements-in-the-sandbox-instructions 
Fix the requirements in the sandbox instructions
 2013-08-28 13:29:47 -07:00
Ned Batchelder
30cf0b57e6 Fix the requirements in the sandbox instructions 2013-08-28 16:04:43 -04:00
Calen Pennington
7d79f4fe37 Move mitxmako initialization to a startup module, called by lms.startup and cms.startup for both management commands and when run via wsgi 
[DEVPAIN-7]
 2013-08-28 10:56:07 -04:00
Valera Rozuvan
0a110b672d Using native Jasmine-jQuery method to check for hidden el. 2013-08-28 17:23:42 +03:00
Ned Batchelder
e88e04d3a6 A test that our XML-comments fix works. 2013-08-28 10:15:59 -04:00
Valera Rozuvan
33fa1e2c7f Applying code changes as suggested by Anton. 
Fixed 2 failing Jasmine tests. Removed unnecessary console.log() call.
Initializing of variables in a single var statement.
 2013-08-28 17:15:52 +03:00
Ned Batchelder
6738a37ec1 Keep comments in capa XML from causing failures 
Comments (and processing instructions!) are handled oddly in lxml.
This change will keep them from causing failures.  They will be omitted
from the HTML generated, which is fine, since they aren't needed there.
 2013-08-28 10:15:48 -04:00