Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,365 Commits 1 Branch 0 Tags
2c83dc3f09b49d740407daaffe05ab8fd549ed8a
Commit Graph

8693 Commits

Author SHA1 Message Date
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
Calen Pennington
1255ab7514 Add mitxmako.middleware to fix workers 
If mitxmako.middleware has ever been imported, then render_to_string
works correctly (which is why we didn't see this in the rest of
edx-platform). However, if it hasn't (like in a celery worker), then
using mitxmako.middleware errors out.

[LMS-1085]
 2013-09-09 11:13:50 -04:00
David Ormsbee
48f867bd6b Merge branch 'master' into ormsbee/verifyuser3 
Conflicts:
	lms/envs/common.py
 2013-09-09 10:18:25 -04:00
Jason Bau
9dac2eff90 actually flatten username suggestion to ascii 2013-09-08 20:26:21 -07:00
ichuang
7fac4f3bb9 formulaequationinput: add capital greek letters and hbar to calc preview 2013-09-07 22:51:51 -04:00
Jason Bau
6a850e27bb Address @brianhw review comments 
* Fix open redirect vulnerability
* Add Logging To AUDIT_LOG : Note I had to change existing tests
  that mocked AUDIT_LOG with this
* Use external_auth.views.SHIBBOLETH_DOMAIN_PREFIX in student.views
* Add a bunch of documentation
* PEP8 / Pylint
 2013-09-06 15:37:27 -07:00
Jason Bau
4d656061be Removing handling for ExternalAuthMap.MultipleObjectsReturned 2013-09-06 15:36:22 -07:00
Jason Bau
948c07c493 Revamped + Enhanced Shibboleth support 
* If a shib users type in their email on the regular login page,
  redirects them to /shib-login/
* Modify student.views.accounts_login to handle redirects
  generated by @login_required for courses that use shib for
  access control.
  Redirect those logins to /shib-login/?next=
 2013-09-06 15:36:22 -07:00
Diana Huang
238a2d53e3 Don't allow people into the verification flow if they've already been verified 2013-09-06 17:20:24 -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
Frances Botsford
47df7e420f ux adjustments to vcert flow 2013-09-06 12:02:37 -04:00
Vik Paruchuri
0fbbaa83d6 Fix some staff-facing messages 2013-09-06 11:17:46 -04:00
chrisndodge
b92d88fcbc Merge pull request #401 from edx/feature/ichuang/cas-authentication 
Provide CAS authentication integration
 2013-09-06 07:36:28 -07:00
Frances Botsford
af2424daf1 adjustments to choose and contribution for vcerts 2013-09-06 10:23:46 -04:00
David Ormsbee
90923f3e12 Add min_price var to _contribution.html template 2013-09-06 10:11:29 -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
David Ormsbee
4e011326bc Replace placeholder 'Course Name' in paid cert templates with the actual course name 2013-09-05 23:39:35 -04: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