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
Valera Rozuvan
fd64ed9a49
Updated error message in LTI template.
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
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
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
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
Brian Talbot
422c6282e4
LMS: adds in pseudo-state styling for disabled buttons/links (by attribute or standard class names)
2013-09-09 11:43:55 -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
Sarina Canelake
4b9df2e998
Add datadog tracking for bulk email
2013-09-06 16:18:40 -04: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
Calen Pennington
38de05c76c
Include mixins in advanced component class loading and preview modules
2013-09-06 13:37:03 -04:00
Vik Paruchuri
d3580994c8
Merge pull request #870 from edx/fix/vik/oe-nopath
...
Fix nopathtoitem error
2013-09-06 10:01:19 -07:00
Vik Paruchuri
0fbbaa83d6
Fix some staff-facing messages
2013-09-06 11:17:46 -04:00
Vik Paruchuri
66655080f6
Log a warning if assumption about path is not correct.
2013-09-06 11:12:10 -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
Calen Pennington
8201b1412e
Use XBlock 0.3
2013-09-06 09:45:59 -04:00
jsa
6e7965d26c
update mitxmako lookup / fixes FOR-150
2013-09-05 23:23:52 -04:00
Vik Paruchuri
9e1813041a
Fix nopathtoitem error
2013-09-05 14:16:28 -04:00
Vik Paruchuri
a6068201e1
Add in a staff warning message about duplicates
2013-09-05 12:29:21 -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
Chris Dodge
0847bc5e2b
pep8/pylint violations fixes
2013-09-04 11:34:35 -04:00
Sarina Canelake
577aeed35a
Don't fetch the editor for XML courses
2013-09-04 11:31:52 -04:00
ichuang
00710f75d2
add CAS authentication via django_cas and mods to external_auth
2013-09-04 10:56:45 -04:00
Sarina Canelake
51fcb5247d
Merge pull request #855 from edx/sarina/bulkemail-violations
...
Cleanup bulk email app
2013-09-03 14:25:36 -07: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
Sarina Canelake
bfebe684b3
Cleanup bulk email app
2013-09-03 16:11:34 -04:00
Adam Palay
67890b3c66
resolve merge conflict with hotfix branch
2013-09-03 16:00:24 -04:00
Will Daly
e284ac682a
Merge pull request #837 from edx/will/faster-acceptance-test-startup
...
Skip migrations if running acceptance in fasttest mode
2013-09-03 11:58:43 -07: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
Will Daly
1f2f0bf348
Skip acceptance test DB migrations if the DB already exists and running fasttest_acceptance
2013-09-02 09:58:08 -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
