Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,654 Commits 1 Branch 0 Tags
bff94de284fa58da2cedfaa657f4d5228bf89093
Commit Graph

5216 Commits

Author SHA1 Message Date
Jean Manuel Nater
9bfddd4891 Addressed pull request feedback. 2013-06-21 14:05:57 -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
Peter Baratta
7db93976c5 PR fixes 2013-06-21 11:02:25 -04:00
JonahStanley
e4af7287b6 Initial testing for parallelization 2013-06-21 08:51:43 -04:00
Calen Pennington
5ba6855d80 Merge pull request #224 from edx/cale/xmodule-assets-pylint-fixes 
Fix pylint violations in xmodule static_content.py
 2013-06-21 05:29:17 -07: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
4cb6eb6e19 Fix pylint violations in xmodule static_content.py 2013-06-20 16:45:11 -04:00
Peter Fogg
1d8d507f49 Merge in master (again). 2013-06-20 12:21:16 -04:00
Peter Fogg
ea56a0cd4a Make sure we can handle empty youtube attributes. 2013-06-20 11:58:01 -04:00
Peter Baratta
f623e42983 Fix formatting of docstrings; add more docstrings 2013-06-20 11:50:58 -04:00
Peter Baratta
b68e1e207e Fix some line lengths to make pylint happy 2013-06-20 11:46:04 -04:00
Peter Baratta
401dd550e4 Convert many byte strings to unicode; change string formatting 2013-06-20 11:46:04 -04:00
Peter Baratta
4f78c1977f Allow error messages with non-ascii characters to be handled correctly 
Also, add a test for this behavior.
 2013-06-20 11:46:04 -04:00
Peter Fogg
9c7be8b1dc Fix merge conflict in CHANGELOG.rst. 2013-06-20 09:58:22 -04:00
Calen Pennington
cd57e281f5 Only write to xmodule asset files that have changed 
Use md5 checksumming to verify that we only write out xmodule asset
files whose contents differ from what we are about to write. This
minimizes thrashing of the other watchers.

Fixes LMS-452
 2013-06-20 09:20:21 -04:00
Calen Pennington
eb3e94660b Don't delete generated files from xmodule-assets 
xmodule-assets creates coffeescript files in the output directories. On
its next run, it used to delete the javascript files compiled from those
coffee files. Now it doesn't which should make coffee have to do less
work.

Fixes LMS-451
 2013-06-20 09:18:58 -04:00
Alexander Kryklia
23d4a2b3db renames is_completed to is_submitted, fixes docstrings and rst docs 2013-06-20 15:09:05 +03:00
Alexander Kryklia
a7cf9d186d adds doc about correct 2013-06-20 14:56:32 +03:00
Alexander Kryklia
6f964acec5 added docs and added is_correct to conditional 2013-06-20 14:56:32 +03:00
Alexander Kryklia
e7f1baad62 Fixes broken imports in checker.py 2013-06-20 12:58:33 +03:00
Julian Arni
e08215e62a JSinput input type 2013-06-19 17:42:55 -04:00
Ned Batchelder
df6d3f9b2f Fix strings that should be raw. 2013-06-19 16:56:34 -04:00
Ned Batchelder
181b1e979b Remove unused imports from common, as reported by pylint. 2013-06-19 16:56:34 -04:00
Calen Pennington
b021d9cc12 Merge pull request #209 from edx/cale/pep8-fixes 
Cleanup pep8 violations in test_correctmap.py
 2013-06-19 13:36:18 -07: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
Calen Pennington
4cc30aab00 Cleanup pep8 violations in test_correctmap.py 2013-06-19 10:04:32 -04:00
lapentab
dece800888 Renames self.get_test_system to test_system, removes duplicate function. 2013-06-19 09:57:16 -04: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
brianhw
54a3bc620b Merge pull request #40 from edx/feature/brian/regrade-celery-2 
Feature/brian/regrade celery 2
 2013-06-18 12:36:36 -07:00
Peter Fogg
7633968701 Merge branch 'master' into peter-fogg/remove-video-xml 2013-06-18 15:07:58 -04:00
Brian Wilson
fd206a4128 Make sure InstructorTask is committed. 2013-06-18 15:07:15 -04:00
lapentab
f0fb620be6 Fixes missing refactoring 2013-06-18 14:12:23 -04:00
Jean Manuel Nater
97275a3286 Refactored some of the classes in tests.py to not unnecessarily depend on the XML modulestore. 
Conflicts:
	lms/djangoapps/courseware/tests/test_navigation.py
	lms/djangoapps/courseware/tests/test_view_authentication.py
	lms/djangoapps/courseware/tests/tests.py
 2013-06-18 13:54:16 -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
Jean Manuel Nater
78128e7672 Merge branch 'master' into jnater/playground 
Conflicts:
	common/lib/xmodule/xmodule/modulestore/tests/factories.py
	lms/djangoapps/courseware/tests/tests.py
 2013-06-18 13:36:24 -04:00
Don Mitchell
cf2675d701 Update fields.py 
When changing variable names for code review critique, accidental cut/paste prevented intended behavior.
 2013-06-18 12:32:26 -04:00
Don Mitchell
b151d6c155 Merge pull request #183 from edx/dhm/timeconv/bug0 
Fix a few remaining tz naive dates
 2013-06-18 09:09:24 -07:00
Don Mitchell
a1f181e7bb Make the variable and method names clearer 2013-06-18 11:45:16 -04:00
lapentab
b93f00e02f Rename system_test to get_test_system 2013-06-18 11:37:24 -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
d2b3977f57 Add dogstat logging to background tasks. 2013-06-18 11:13:55 -04:00
Brian Wilson
c676cfd64a Rename fields in CourseTaskLog, including a task_key column for indexing. Use 'rescore' instead of 'regrade'. Clean up task submission. 2013-06-18 11:13:19 -04:00
Brian Wilson
c1fff1568e reenable psychometrics for regrading 2013-06-18 11:13:18 -04:00
Brian Wilson
79a0f6a16b remove call to psychometrics when regrading 2013-06-18 11:13:18 -04:00
Brian Wilson
8660c9a7af Check descriptor to identify problems that don't support regrading. 2013-06-18 11:09:32 -04:00
Brian Wilson
73b25e1f32 Add check for problems that (do not) support regrading. 2013-06-18 11:09:32 -04:00
Brian Wilson
07d2de4789 Add tests for regrading at capa_module level. 2013-06-18 11:09:32 -04:00
Brian Wilson
ee5ffedfee Clean up task progress javascript. Add before/after scores to tracking of regrading requests. 2013-06-18 11:09:18 -04:00