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
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
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
Calen Pennington
ea36b834c7
Merge pull request #811 from cpennington/initialize-mitxmako-at-startup
...
Move mitxmako initialization to a startup module
2013-08-30 13:10:09 -07:00
Calen Pennington
7d79f4fe37
Move mitxmako initialization to a startup module, called by lms.startup and cms.startup for both management commands and when run via wsgi
...
[DEVPAIN-7]
2013-08-28 10:56:07 -04:00
Jay Zoldak
c8949b99d1
Disable pylint violation E0611 when importing assert_* methods from nose.tools
...
Cleaned up files with muliline imports
Cleaned up files that do not use these imports
Misread comment
2013-08-27 16:21:33 -04:00
Calen Pennington
407b02b358
Centralize startup code, and execute in all contexts
...
Inspired by: http://eldarion.com/blog/2013/02/14/entry-point-hook-django-projects/
Moves startup code to lms.startup and cms.startup, and calls the startup
methods in wsgi.py and manage.py for both projects.
2013-08-27 12:12:20 -04:00
Will Daly
42ac76ce0c
Merge branch 'master' into lapentab/fix_network_tests
...
Conflicts:
lms/djangoapps/courseware/tests/tests.py
2013-08-23 11:48:38 -04:00
