Vik Paruchuri
8930e753e4
Set default weights
2013-06-28 14:59:39 -04:00
Vik Paruchuri
b38a36d44a
Fix test
2013-06-28 14:38:13 -04:00
Don Mitchell
1c5706fb1f
Add JSON encoder for datetimes to xml export
...
During policy export, we want to write any python datetime objects found
as iso timestamps, rather than throwing exceptions.
2013-06-28 14:19:10 -04:00
Don Mitchell
c7046df0f2
Make request.POST be only json content when using expect_json
2013-06-28 14:19:10 -04:00
Don Mitchell
115b214df1
Retrieve location from self in CustomTagDescriptor
2013-06-28 14:19:10 -04:00
Don Mitchell
97c2e9ec80
Make url matching regex flexible to allow for browsers that munged :// into :/
2013-06-28 14:19:09 -04:00
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
Diana Huang
c98651fadb
Add in the ability to handle malformed return urls.
2013-06-27 18:02:23 -04:00
Diana Huang
c6fa4873b1
Handle issues decoding requests more gracefully
...
Clean up some pep8/pylint violations as well
2013-06-27 18:02:23 -04:00
jnater
7d0b72a41e
Merge pull request #204 from edx/jnater/courseware_tests
...
Jnater/courseware tests
2013-06-27 13:50:51 -07:00
Ned Batchelder
a484224ef5
Remove pointless addition tests
2013-06-27 16:27:39 -04: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
Jay Zoldak
c98a77565f
Make the UrlResetMixin load the urlconf after resetting it, and fix the comment client test that was leaving ENABLE_DISCUSSION_SERVICE at True
2013-06-27 11:05:09 -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
dcadams
306ac48210
Email on enroll/un-enroll actions
...
Optionally email students on enroll/un-enroll actions
by instructor from enrollment tab in LMS.
2013-06-26 15:28:36 -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
b03d93901f
Pass arguments from ctxCall forward to set state
2013-06-26 12:36:04 -04: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
Jason Bau
4a3165414d
Merge pull request #84 from edx/feature/jbau/activation-after-password-reset-confirm
...
Moves user activation from just clicking on reset password to following the link in the password reset email
2013-06-25 20:34:19 -07:00
Jason Bau
734440f4b9
Refactored tests
2013-06-25 20:21:20 -07:00
Don Mitchell
d9575a0874
Remove traling commas to make json valid
2013-06-25 22:34:36 -04: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
Julian Arni
1e0702f374
Allow nested object methods for the grade and state functions
2013-06-25 16:14:34 -04:00
Renzo Lucioni
881d63dae7
Fixed Jasmine tests in light of Logger changes, and wrote test to cover case where data passed is not a dictionary
2013-06-25 16:04:00 -04: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
Jason Bau
3e38327f7f
External_auth.views.login_or_signup fix codepath that didn't set uname
...
which caused UnboundLocalError. Added tests for this case
2013-06-24 17:55:33 -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
Jason Bau
83062c0b7d
Tests + Now subclass PasswordResetForm instead of copy
...
Changed to subclassing django's PasswordResetForm and
overriding clean_password() instead of copy/paste.
Less lines to worry about for diff-cover this way =)
2013-06-24 11:54:31 -07:00
