Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,939 Commits 1 Branch 0 Tags
2cd18dfad3bcda0bbca0ee4ea81eaef026c975f9
Commit Graph

2130 Commits

Author SHA1 Message Date
Carlos Andrés Rocha
e4ee1c6c9b Rename arguments of modx_dispatch and handle_ajax related functions 
Refactor a bit modx_dispatch
 2013-06-25 13:38:57 -04:00
Carlos Andrés Rocha
2f02496c8f Reorder imports on module_render 2013-06-25 13:31:53 -04:00
Brian Wilson
332a440539 Enable per-student background tasks. 2013-06-24 18:47:50 -04:00
Ned Batchelder
bec6330c34 Merge pull request #251 from edx/ned/pylint-fixes 
Ned/pylint fixes
 2013-06-24 10:44:35 -07:00
mlsteele
88060c0590 Merge pull request #144 from edx/fix/msteele/instructor_tests 
fix gradebook tests
 2013-06-21 19:16:09 -07:00
Ned Batchelder
57909ce1aa Fix all W0602, global used but no assignment done. 2013-06-21 17:33:23 -04:00
Ned Batchelder
df4b512b6f Change wildcard imports into specific imports 2013-06-21 17:33:06 -04:00
Ned Batchelder
e045860cb6 Pylint complains if you use string, even if you use it for what its still meant to be used for. 2013-06-21 16:35:47 -04:00
Ned Batchelder
bea50efc26 Remove the unused smart-accordion lettuce feature, and the code it used. 2013-06-21 16:30:33 -04:00
Jason Bau
07e56ac43b Merge pull request #67 from edx/features/jbau/stanford-shib 
Shibboleth Auth
 2013-06-21 09:32:30 -07:00
JonahStanley
b847930579 Changed a click to css_click and fixed earlier typo 2013-06-21 09:38:43 -04:00
Ned Batchelder
3eec09b87a Merge pull request #216 from edx/ned/remove-unused-imports 
Ned/remove unused imports
 2013-06-20 14:15:31 -07:00
Calen Pennington
d06a9a2043 Merge pull request #219 from edx/cale/remove-simplewiki 
Remove simplewiki from the codebase
 2013-06-20 13:43:38 -07:00
Calen Pennington
5344434259 Merge pull request #218 from edx/cale/pep8-e128 
Clean up pep8 E128 issues
 2013-06-20 13:42:43 -07:00
JonahStanley
281f900389 Changed format of docstring 2013-06-20 15:40:58 -04:00
JonahStanley
eec095a195 Changed naming of attempts to max_attempts and changed css_selector 2013-06-20 15:38:56 -04:00
JonahStanley
96c4d2877f Navigation now has a click success condition 2013-06-20 14:05:00 -04:00
JonahStanley
e1d4c69365 Merge branch 'master' into jonahstanley/fix-flakey-tests 
Conflicts:
	common/djangoapps/terrain/ui_helpers.py
 2013-06-20 11:17:15 -04:00
JonahStanley
a8789dced9 Fixed flakey check box by making a css_check function that behaves like css_click 
As a result, changed inputfield to return the css, and all of the element.fill() to css_fill
 2013-06-20 11:14:17 -04:00
Will Daly
ef06932df0 Merge pull request #197 from edx/will/fix-video-acceptance-tests 
Will/fix video acceptance tests
 2013-06-20 08:07:28 -07:00
JonahStanley
1e51bd7314 Fixed flakey navigation tests by changing css 
Now only check for the css that appears when the accordion is done
 2013-06-20 10:58:11 -04:00
JonahStanley
033b974047 Fixed flakey show answer test 2013-06-20 10:54:43 -04:00
Felix Sun
c00721bbe6 Fixed the preferences scope of xblock. 
Added self to authors.

Conflicts:
	AUTHORS
	CHANGELOG.rst
 2013-06-20 10:17:25 -04:00
Calen Pennington
308fe26b65 Clean up pep8 E128 issues 2013-06-20 09:08:25 -04:00
Calen Pennington
448ca26cdf Remove simplewiki from the codebase 2013-06-20 09:06:29 -04:00
Will Daly
dbd2716e29 Updated video alpha template name to reflect recent changes in master. 2013-06-20 07:44:33 -04:00
Will Daly
3b37e0c19f Fixed incorrect videoalpha template name 2013-06-20 07:40:12 -04:00
Will Daly
e76ef3aa31 Combined video and videoalpha acceptance tests. 
Resolved conflict between two steps with the same name.
 2013-06-20 07:40:12 -04:00
Ned Batchelder
61b53713d2 Remove unused imports from lms, as detected by pylint. 2013-06-19 16:56:34 -04:00
Ned Batchelder
df6d3f9b2f Fix strings that should be raw. 2013-06-19 16:56:34 -04:00
Renzo Lucioni
0bf02cabff Fix for the failing acceptance tests 2013-06-19 16:48:25 -04:00
David Ormsbee
e1b071be30 Initialize MakoMiddleware manually during certificate grading runs. 
Without this, problems fail to load because they can't find how to
render themselves, and the certificate generation grading run will
get an inaccurately low count of the possible points a user could
get (anything they didn't see will be omitted), inflating their
grade during certificate calculation and making it inconsistent
with their Progress page.
 2013-06-19 14:39:02 -04:00
lapentab
24bee17da5 Merge pull request #156 from edx/blapenta/fix-test-coverage 
Fix test_system looking like a test to nosetest. Fix class inheritance causing double counting of coverage.
 2013-06-19 08:50:54 -07:00
Jason Bau
824fb9a311 The bulk of Shibboleth authentication for Stanford 
Highlights:
* The url '/shib-login/' interfaces with apache/mod_shib via
  request.META to handle shibboleth login and registrations
* Courses can designate 'enrollment_domains' to limit enrollment
  to users with a linked ExternalAuthMap verified by a particular
  identity provider
* Tests
* Logging

 Changes to be committed:

	new file:   common/djangoapps/external_auth/migrations/0001_initial.py
	new file:   common/djangoapps/external_auth/migrations/__init__.py
	new file:   common/djangoapps/external_auth/tests/test_shib.py
	modified:   common/djangoapps/external_auth/views.py
	modified:   common/djangoapps/student/views.py
	modified:   common/lib/xmodule/xmodule/course_module.py
	modified:   lms/djangoapps/courseware/access.py
	modified:   lms/djangoapps/courseware/tests/test_access.py
	modified:   lms/envs/common.py
	modified:   lms/envs/dev.py
	modified:   lms/envs/test.py
	modified:   lms/templates/courseware/course_about.html
	modified:   lms/templates/dashboard.html
	modified:   lms/templates/extauth_failure.html
	modified:   lms/templates/navigation.html
	modified:   lms/templates/register.html
	modified:   lms/templates/signup_modal.html
	modified:   lms/urls.py
	renamed:    lms/wsgi_apache.py -> lms/wsgi_apache_lms.py
 2013-06-19 00:48:18 -07:00
Don Mitchell
1ff022e181 Incidental pep8 changes 2013-06-18 17:25:06 -04:00
Brian Wilson
fd206a4128 Make sure InstructorTask is committed. 2013-06-18 15:07:15 -04:00
Brian Wilson
5389bba490 Add changelog entry. 2013-06-18 14:28:00 -04:00
lapentab
f0fb620be6 Fixes missing refactoring 2013-06-18 14:12:23 -04:00
Brian Wilson
2d1ebb7329 Test when querying for a non-existent task 2013-06-18 13:51:05 -04:00
lapentab
b9ca9a84d7 Merge branch 'master' into blapenta/fix-test-coverage 
Conflicts:
	AUTHORS
	common/lib/xmodule/xmodule/tests/test_annotatable_module.py
	common/lib/xmodule/xmodule/tests/test_capa_module.py
	common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
	common/lib/xmodule/xmodule/tests/test_conditional.py
	common/lib/xmodule/xmodule/tests/test_html_module.py
	common/lib/xmodule/xmodule/tests/test_progress.py
	common/lib/xmodule/xmodule/tests/test_xml_module.py
	lms/djangoapps/courseware/tests/__init__.py
 2013-06-18 13:41:53 -04:00
lapentab
b93f00e02f Rename system_test to get_test_system 2013-06-18 11:37:24 -04:00
Brian Wilson
77032067ac Refactor test_views from test_api. Pull out pending_tasks.js. 2013-06-18 11:19:25 -04:00
Brian Wilson
c2aadbfb18 Fix issue with unicode in errors. 2013-06-18 11:17:17 -04:00
Brian Wilson
a8c3e91051 Handle failure task_output that won't fit in the model column. 2013-06-18 11:17:17 -04:00
Brian Wilson
eb1fe899e8 Fix progress reporting. 2013-06-18 11:17:17 -04:00
Brian Wilson
2c5e038f82 initial test_tasks 2013-06-18 11:17:17 -04:00
Brian Wilson
3bd2b08258 factor out InstructorTaskTestCase base class, for reuse in test_tasks. 2013-06-18 11:17:16 -04:00
Brian Wilson
a0dcc97e08 tasks now extract task_input and course_id from InstructorTask, instead of passing explicitly. 2013-06-18 11:17:16 -04:00
Brian Wilson
a67674fe34 set task_id on LMS side. 2013-06-18 11:17:16 -04:00
Brian Wilson
b224f4e8cc move test_tasks to test_integration. 2013-06-18 11:17:16 -04:00