Jay Zoldak
2ff056df8c
Simplify retry logic for ui helper functions
2013-09-16 16:49:17 -04:00
Jay Zoldak
6531918af5
Skip verified cert acceptance tests that upload to s3
2013-09-16 16:11:21 -04:00
Diana Huang
47ce9082e4
Merge branch 'release'
...
Conflicts:
common/lib/xmodule/xmodule/modulestore/mongo/draft.py
lms/djangoapps/courseware/tests/modulestore_config.py
2013-09-13 17:15:44 -04:00
Vik Paruchuri
009017fe07
Address review comments
2013-09-13 11:06:40 -04:00
Diana Huang
90951a7bdb
Merge branch 'release'
...
Conflicts:
CHANGELOG.rst
common/lib/xmodule/xmodule/js/fixtures/lti.html
common/lib/xmodule/xmodule/js/spec/lti/constructor.js
common/lib/xmodule/xmodule/js/src/lti/lti.js
common/lib/xmodule/xmodule/lti_module.py
lms/djangoapps/courseware/features/certificates.py
lms/djangoapps/courseware/mock_lti_server/mock_lti_server.py
lms/djangoapps/courseware/tests/test_lti.py
lms/djangoapps/shoppingcart/models.py
lms/envs/aws.py
2013-09-12 16:03:39 -04:00
Christina Roberts
70cc500851
Merge pull request #916 from edx/christina/due-date-format
...
Allow custom formatting of due date strings.
2013-09-12 12:05:28 -07:00
Jay Zoldak
cfe4e46a17
Remove unimplemented steps from certificates acceptance test code
2013-09-12 14:54:01 -04:00
Jay Zoldak
ade62ab90f
Fix acceptance tests to capture images for paid cert flow
2013-09-12 14:33:07 -04:00
cahrens
988833ded9
pylint/pep8
2013-09-12 14:30:00 -04:00
cahrens
95ad1826d4
Hide show_timezone from Advanced Settings and migrate courses with show_timezone=False to using due_date_display_format.
2013-09-12 14:30:00 -04:00
cahrens
08d9942993
Allow custom formatting of due date strings.
...
STUD-724
Test course for allowing custom formatting of due date strings.
STUD-724
Try making the name of the course match the folder name.
More cleanup.
More cleanup.
updates.
2013-09-12 14:30:00 -04:00
Carlos Andrés Rocha
87fcf1ab9e
Merge pull request #905 from rocha/datadog-statsd
...
Remove dogstatsd-python in favor of dogapi
2013-09-12 06:53:02 -07:00
Calen Pennington
58a5cdd81f
Replace references to .system
2013-09-12 09:29:17 -04:00
David Ormsbee
00f96ec79f
Merge pull request #937 from edx/zoldak/add-cert-tests
...
Add more certificates test for newly implemented features
2013-09-11 20:33:53 -07:00
Carlos Andrés Rocha
ee0004e2f8
Remove dogstatsd-python in favor of dogapi
...
Also added datadog application to commom django apps and set it to use
a local statsd server by default.
2013-09-11 19:28:58 -04:00
Adam Palay
ee62719025
check if module created from description is None before looking for its child descriptors
2013-09-11 18:33:51 -04:00
Jay Zoldak
fbeb63ee47
Add more certificates test for newly implemented features
2013-09-11 17:29:50 -04:00
Jay Zoldak
1ead54223b
Change locators of links to match updated ids
2013-09-11 16:23:51 -04:00
Jay Zoldak
36f7d439aa
Change locators of links to match updated ids
2013-09-11 16:18:59 -04:00
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 2894b21c3234d0fe1554
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
