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

5152 Commits

Author SHA1 Message Date
Don Mitchell
26aa085d9d Handle edge case when trying to aggregate progress in an empty sequence 2013-06-28 14:19:09 -04:00
Vik Paruchuri
8a6c8b5ab0 Add test for incrementing student attempts 2013-06-28 14:10:17 -04:00
Valera Rozuvan
97d7421432 Fix for bug Blades/BLD-152. Added test for bugfix. Optimized bug fix. 2013-06-28 13:52:04 +03:00
Vik Paruchuri
9b14ea790c Properly increment student attempts 2013-06-27 16:20:58 -04:00
Vik Paruchuri
8164ca9a78 Merge remote-tracking branch 'origin/master' into fix/vik/studio-oe 2013-06-27 16:11:24 -04:00
Jean Manuel Nater
3c67e2754a Merge branch 'master' into jnater/courseware_tests 
Conflicts:
	lms/djangoapps/courseware/tests/tests.py
	lms/djangoapps/instructor/tests/test_enrollment.py
 2013-06-27 13:53:47 -04:00
Christina Roberts
2b6d338d2d Merge pull request #276 from edx/christina/python-problem 
Make the problem handle empty fields and non-integers correctly.
 2013-06-27 06:44:53 -07:00
Peter Fogg
4b5fe427ed Merge pull request #282 from edx/peter-fogg/fix-default-videos 
Fix Lyla showing up everywhere.
 2013-06-27 06:19:56 -07:00
Calen Pennington
6e357db24c Merge pull request #268 from edx/dhm/cosmetic-cleanup 
Cosmetic Cleanups Incidental to Next Gen Modulestore Implementaton
 2013-06-27 05:44:49 -07:00
Jean Manuel Nater
7f017d0ca9 Addressed pull request feedback 2013-06-26 17:19:13 -04:00
Peter Fogg
ee5389800a Fix Lyla showing up everywhere. 
Previously XML data wasn't parsed in VideoDescriptor.__init__, leading
to the defaults being used for video settings.
 2013-06-26 16:30:13 -04:00
Don Mitchell
391ed8c964 Add docstring to CourseDescriptor.__init__ 2013-06-26 14:19:33 -04:00
Renzo Lucioni
2cd18dfad3 Merge pull request #263 from edx/renzo/segment-io-whitelist-expansion 
Add handful of events to the Segment.io whitelist
 2013-06-26 10:41:11 -07:00
Julian Arni
9d49a0e8b9 Fix check for waitfor attr 2013-06-26 12:35:34 -04:00
cahrens
bb8c62d84c Make the problem handle empty fields and non-integers correctly. 2013-06-26 12:33:55 -04:00
Ned Batchelder
6e5c861018 Merge pull request #272 from edx/fix/LMS-500 
Fix LMS-500: Random class in random module was None
 2013-06-26 07:49:54 -07:00
Don Mitchell
8b23eeca7e Minor pylint/whitespace changes 2013-06-25 22:34:29 -04:00
Renzo Lucioni
3f49da385f Swap Logger call from check_fd to check 2013-06-25 17:22:05 -04:00
Carlos Andrés Rocha
94e1746500 Merge pull request #258 from edx/rocha/pre-external-grader-cleanup 
Cleanup before adding external grader
 2013-06-25 13:17:11 -07:00
Renzo Lucioni
84f4361d52 Avoid changing format of data sent to our logs, and prevent problem_check event from firing twice 2013-06-25 15:33:16 -04:00
Renzo Lucioni
bcbce3eff0 Add handful of events to the Segment.io whitelist 2013-06-25 15:33:16 -04:00
Jonah Stanley
b14553d867 Merge pull request #220 from edx/jonahstanley/make-units-parallel 
Jonahstanley/make units parallel
 2013-06-25 11:44:01 -07:00
Ned Batchelder
ed62c5a6f9 Fix LMS-500: Random class in random module was None 
Deleting the module object isn't needed to replace it, and deleting
a module object causes all of its attributes to be set to None.
 2013-06-25 14:23:16 -04:00
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
JonahStanley
8a9125f121 Test Mongo database is now unique and destroyed in teardown 2013-06-25 11:33:46 -04:00
Peter Baratta
4c269c1079 Merge pull request #203 from edx/pbaratta/fix/capa-unicode 
Fix unicode for errors on capa problems
 2013-06-25 06:46:30 -07:00
Valera Rozuvan
08b994b87e Merge pull request #247 from edx/alex/fix_choiceresponse 
removes choiceresponse wiping after clicking Show Answer
 2013-06-25 05:55:27 -07:00
Jean Manuel Nater
799b938d5b Merge branch 'master' into jnater/courseware_tests 2013-06-24 17:24:42 -04:00
Julian Arni
74bb976ef5 Abort submission and alter user if gradefn throws an exception 2013-06-24 16:54:30 -04:00
Peter Baratta
3a8f591fe5 Add tests for the diff coverage; fix one hidden unicode bug 2013-06-24 16:49:33 -04:00
Jean Manuel Nater
32a0a2d29d In the middle of addressing pull request comments. This is a safety commit in case I have to revert some changes I'm about to make. 2013-06-24 11:13:59 -04:00
Julian Arni
bc25defd10 Merge branch 'master' into feature/jkarni/jsinput 
Conflicts:
	doc/public/index.rst
 2013-06-24 10:46:19 -04:00
Alexander Kryklia
85b4a4ccab removes choiceresponse wiping after clicking Show Answer 2013-06-22 16:13:40 +03:00
Ned Batchelder
57909ce1aa Fix all W0602, global used but no assignment done. 2013-06-21 17:33:23 -04:00
Jean Manuel Nater
1b94050ef6 Merge branch 'master' into jnater/courseware_tests 
Conflicts:
	lms/djangoapps/open_ended_grading/tests.py
 2013-06-21 16:38:31 -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
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