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
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
Adam Palay
67890b3c66
resolve merge conflict with hotfix branch
2013-09-03 16:00:24 -04:00
Anton Stupak
a09e610403
Fix multiple video bug
2013-09-03 18:49:46 +03: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
Will Daly
c680dfdd40
Merge pull request #768 from edx/will/use-mixed-modulestore-in-tests
...
Will/use mixed modulestore in tests
2013-08-23 08:38:09 -07:00
Will Daly
1cb52df16b
Removed unnecessary TestCase
2013-08-22 16:10:24 -04:00
chrisndodge
0191ae9417
Merge pull request #652 from edx/feature/ichuang/import-with-no-static
...
Enable mongodb to be used as back-end for git-based authoring workflow
2013-08-22 11:05:02 -07:00
lapentab
d894a065df
Stylistic changes
2013-08-22 09:28:37 -04:00
lapentab
1759191370
Remove network calls in tests
2013-08-22 08:43:28 -04:00
Chris Dodge
ef98c54f5b
fix some pylint violations
2013-08-21 20:06:10 -04:00
Will Daly
8165a033b1
Pep8/pylint fixes
...
Fixed test_masquerade failure due to not clearing the modulestore
between tests.
2013-08-21 19:42:59 -04:00
JonahStanley
b2480b5f00
Changed way feature flags are interpreted
...
Configurations must be defined before hand
Reduced pylint violations
We only support 4 browsers
2013-08-21 16:05:53 -04:00
JonahStanley
21f75ff250
Various stylistic and pylint fixes / changes
...
Version numbers have very different ranges for different browsers so not having a dictionary of those.
Fixed a whitespace issue
Fixed pylint/pep8 violations
Don't need django_url
Spacing issues
Changed how commenting works
Forgot one
Used wrong name
Changed around importing
Remove django_url
Fixed function orderingn
Made logic nicer for getting a new browser
Modifying tests to run in opera
Needed to increase time to account for slow sauce loading
Now safari LMS works
Forgot an assert statement
Skipping a few tests for opera
2013-08-21 16:05:52 -04:00
JonahStanley
58bb6e1ea3
Changed tags to be lowercase to prevent preprocessing
...
Changed to have a default for device since it isn't always needed
Tags are more clear
Fixed stylistic issues
2013-08-21 16:05:02 -04:00
JonahStanley
3746c654d8
Added a tag for things that will not work on Firefox
...
Added tags for tests that will not work on Sauce
Changed build name
Tightened up logic
Conflicts:
common/djangoapps/terrain/browser.py
Added flag for session name
2013-08-21 16:05:01 -04:00
Peter Fogg
e177270d0d
Merge pull request #700 from edx/peter-fogg/course-image-upload
...
WIP: Peter fogg/course image upload
2013-08-21 11:17:12 -07:00
Kevin Chugh
2f4665375f
Merge pull request #745 from edx/dave/block_forums_for_unenrolled
...
Make it so that students who are not enrolled cannot see the forum
2013-08-21 09:13:10 -07:00
Your Name
25d98778cc
Merge branch 'master' into dave/block_forums_for_unenrolled
2013-08-21 12:00:06 -04:00
Your Name
541aa08471
update forum access to include check for valid date range
2013-08-21 11:59:39 -04:00
