Alexander Kryklia
3531f2cbb7
Update docs.
2013-09-09 19:16:14 +03:00
Alexander Kryklia
e10577d6ad
Pass user_id and course_id to runtime in cms (dev) and tests.
2013-09-09 19:16:14 +03:00
Alexander Kryklia
f6d9c077f0
Improve LTI module
...
Add simplifyed template.
Update lti integration test.
Add getting oauth credentials from course settings.
Add user id transferring to provider.
Improve documentation of lti module.
2013-09-09 19:13:22 +03:00
Alexander Kryklia
e5ec4600df
Add documentation to LTI module and to dev docs
2013-09-09 19:13:22 +03:00
Alexander Kryklia
f1dc6ecf67
Add course setings for client key, secret
2013-09-09 19:13:22 +03:00
Alexander Kryklia
b1d40b0f27
updated docs
2013-09-09 19:13:22 +03:00
Alexander Kryklia
0d2d10d77a
custom parameters
2013-09-09 19:13:22 +03:00
Alexander Kryklia
3e3d89e370
added roles and student id
2013-09-09 19:13:21 +03:00
Alexander Kryklia
42bcd9c28c
updated comment
2013-09-09 19:13:21 +03:00
Alexander Kryklia
02de4609de
updates
2013-09-09 19:13:21 +03:00
Alexander Kryklia
b5dc03ec36
Acceptance test for LTI module (not finished), but working
2013-09-09 19:13:20 +03:00
Valera Rozuvan
e4bad0a6a1
Fixing Jasmine tests.
2013-09-09 19:13:20 +03:00
Valera Rozuvan
729d74f129
Fixing issues found by Anton during review of PR 804.
...
Changed use of IDs to classes. Simplified lti.js - now simple one function.
Updated tests.
2013-09-09 19:13:20 +03:00
Alexander Kryklia
c8ea4da2cc
Change h2 to h3
2013-09-09 19:13:20 +03:00
Alexander Kryklia
e4e7a4e30b
Remove ipdb.
2013-09-09 19:13:20 +03:00
Valera Rozuvan
417ddcaaa1
LTI module with tests
2013-09-09 19:13:20 +03:00
ichuang
7fac4f3bb9
formulaequationinput: add capital greek letters and hbar to calc preview
2013-09-07 22:51:51 -04:00
Vik Paruchuri
499d272adc
Merge pull request #825 from edx/fix/vik/staff-information
...
Staff information about duplicate ORA submissions
2013-09-06 14:14:31 -07:00
Adam
3184939138
Merge pull request #885 from edx/release
...
Release
2013-09-06 13:51:03 -07:00
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
Chris Dodge
c7f2f27708
fix bug and add unit test
2013-09-06 14:47:59 -04: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
Vik Paruchuri
0fbbaa83d6
Fix some staff-facing messages
2013-09-06 11:17:46 -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
Vik Paruchuri
a6068201e1
Add in a staff warning message about duplicates
2013-09-05 12:29:21 -04:00
Anton Stupak
5d55714cad
Fix test.
2013-09-05 10:27:41 -04:00
Anton Stupak
961bd4c9cb
Fix selector.
2013-09-05 10:27:29 -04: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