Commit Graph

4617 Commits

Author SHA1 Message Date
Alexander Kryklia
68409f0c7a Add default launch url for lti. 2013-09-11 19:16:46 +03:00
David Baumgold
871ad7d694 Pass hostname to LTI XModule
Necessary for RFC compliance with oauthlib
2013-09-10 14:21:56 -04:00
David Baumgold
a1d3899a4d Use oauthlib directly for LTI module 2013-09-10 11:02:30 -04:00
David Baumgold
45f38ddf81 Update requests library to 1.2.3 2013-09-10 09:59:21 -04:00
Valera Rozuvan
ee02c06250 Add Learning Tools Interoperability (LTI) blade.
LTI blade allows to include LTI components to courses.
Python integration, Jasmine and acceptance tests are included.
2013-09-10 12:30:42 +03:00
Valera Rozuvan
d02ef8bc12 Add Learning Tools Interoperability (LTI) blade.
LTI blade allows to include LTI components to courses.
Python integration, Jasmine and acceptance tests are included.
2013-09-09 23:54:49 +03:00
Alexander Kryklia
719ec8f9d8 Revert "Merge pull request #804 from edx/valera/lti_module"
This reverts commit 2894b21c32, reversing
changes made to 34d0fe1554.
2013-09-09 22:51:57 +03:00
Alexander Kryklia
2894b21c32 Merge pull request #804 from edx/valera/lti_module
LTI module with tests
2013-09-09 12:38:01 -07:00
Alexander Kryklia
cd72f05778 Fix test 2013-09-09 19:16:19 +03:00
Alexander Kryklia
03de84ecfe Fix 2013-09-09 19:16:18 +03:00
Alexander Kryklia
bd6fed83eb Fix. 2013-09-09 19:16:18 +03:00
Alexander Kryklia
c63170aea5 Fix 2013-09-09 19:16:18 +03:00
Alexander Kryklia
5e8aebf00b Fix 2013-09-09 19:16:18 +03:00
Alexander Kryklia
a5016473b2 Fix 2013-09-09 19:16:18 +03:00
Alexander Kryklia
f45eddc1cb Fix 2013-09-09 19:16:17 +03:00
Alexander Kryklia
cf70a986d6 Fix 2013-09-09 19:16:17 +03:00
Alexander Kryklia
c4259ba9bf Fix 2013-09-09 19:16:17 +03:00
Alexander Kryklia
494fd52de0 Fix 2013-09-09 19:16:17 +03:00
Alexander Kryklia
5e3c6736ab Fixes. 2013-09-09 19:16:16 +03:00
Alexander Kryklia
787545c83e Renames LTIs to lti_passports. 2013-09-09 19:16:15 +03:00
Alexander Kryklia
ab3cde8a4d Fix 2013-09-09 19:16:14 +03:00
Alexander Kryklia
faa03f0e25 Update docstrings. 2013-09-09 19:16:14 +03:00
Alexander Kryklia
d563929337 Add correct acceptance tests for LTI 2013-09-09 19:16:14 +03:00
Alexander Kryklia
462a42e99e Update acceptance test 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
3e3d89e370 added roles and student id 2013-09-09 19:13:21 +03:00
Alexander Kryklia
ec9b3d67d2 updates for acceptance tests 2013-09-09 19:13:21 +03:00
Alexander Kryklia
0e697f972c acceptance tests updated 2013-09-09 19:13:21 +03:00
Alexander Kryklia
02de4609de updates 2013-09-09 19:13:21 +03:00
Alexander Kryklia
04294b04df Adds oauth checking to acceptance tests 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
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
David Ormsbee
48f867bd6b Merge branch 'master' into ormsbee/verifyuser3
Conflicts:
	lms/envs/common.py
2013-09-09 10:18:25 -04:00
Jay Zoldak
5ece64433d Fix certificates acceptance test after come css changes 2013-09-06 15:31:08 -04:00
Calen Pennington
8201b1412e Use XBlock 0.3 2013-09-06 09:45:59 -04:00
Jason Bau
08168ec67f Merge pull request #859 from edx/jbau/studio-link-in-instructor-panel
Add link in lms legacy instructor dashboard to cms course_index
2013-09-04 13:03:21 -07:00
Jason Bau
ec989e4999 Address review comments for lms_link_to_cms
* Uses override_settings to provide test variable
* Move location of cms link to upper right
* PEP8 / Pylink
2013-09-04 11:29:22 -07:00
David Ormsbee
78acd083be Merge branch 'master' into ormsbee/verifyuser3
Conflicts:
	common/djangoapps/course_modes/models.py
	lms/djangoapps/shoppingcart/models.py
	lms/djangoapps/shoppingcart/processors/CyberSource.py
	lms/djangoapps/shoppingcart/processors/tests/test_CyberSource.py
	lms/djangoapps/shoppingcart/tests/test_models.py
	lms/djangoapps/shoppingcart/tests/test_views.py
	lms/djangoapps/shoppingcart/urls.py
	lms/djangoapps/shoppingcart/views.py
	lms/envs/common.py
	lms/envs/dev.py
	lms/static/sass/base/_variables.scss
2013-09-04 10:58:30 -04:00
Jay Zoldak
a432cffc2c Mark tests for unimplemented features as skip so that the acceptance tests will all pass when we merge into master. 2013-09-03 16:42:03 -04:00
Adam Palay
67890b3c66 resolve merge conflict with hotfix branch 2013-09-03 16:00:24 -04:00
Jay Zoldak
e0110bf108 Change css for payment page for better synchronization. 2013-09-03 13:51:47 -04:00
Anton Stupak
a09e610403 Fix multiple video bug 2013-09-03 18:49:46 +03:00
Jay Zoldak
b9ccc37c57 Automate more scenarios 2013-09-03 10:46:33 -04:00
Jay Zoldak
7bc997d0fb Change CSS after rebase. 2013-09-03 10:46:33 -04:00
Will Daly
a52ca3639b Initial BDD spec for certificates workflow 2013-09-03 10:46:32 -04:00
Jason Bau
b0f9fd0df5 Add link in lms legacy instructor dashboard to cms course_index
A one-click way of getting to editing the course
2013-08-31 01:07:34 -07: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