Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,032 Commits 1 Branch 0 Tags
f219228e4a7b37b77065eb3db89b8d08692145f2
Commit Graph

2170 Commits

Author SHA1 Message Date
Felix Sun
ab303e7567 Fixed numerous code-formatting issues and pep8 violations. 
Began enforcing one-vote-per-person.  This can be disabled with debug="True" in the <crowdsource_hinter> tag.

Started tests of the hint manager.
 2013-07-01 10:25:04 -04:00
Felix Sun
bb922ed8d8 Moved the crowdsourced hinter module into mako template form. 
Fixed some bugs in the tests for crowdsourced hinter.
 2013-07-01 10:25:04 -04:00
Felix Sun
b64fe5c537 Finished prototype of hint moderation view. Began re-writing tests of the crowdsource hinter module. (Old tests no longer cover all the code, now that moderation has been added.) 2013-07-01 10:25:03 -04:00
Felix Sun
100f6bf11e Began work on instructor view to hinting system. 
Added moderation feature - you can now choose to hold all hints for moderator approval before showing.
 2013-07-01 10:25:03 -04:00
Sarina Canelake
e5f97b372b pep8 fixes 2013-06-28 18:00:41 -04:00
Jay Zoldak
b1424a75b8 Add a test for 404 raised when requesting the profile page of a user that does not exist 2013-06-28 16:51:24 -04:00
Sarina Canelake
09501a62e2 Handle exception with a 404 2013-06-28 16:14:56 -04:00
Renzo Lucioni
4a41ce804f Merge pull request #293 from edx/renzo/fix-idashboard-event-types 
Standardize types used for logging events from the instructor dashboard
 2013-06-28 09:07:45 -07:00
Renzo Lucioni
d53114abda Shorten line length 2013-06-28 11:46:20 -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
jnater
7d0b72a41e Merge pull request #204 from edx/jnater/courseware_tests 
Jnater/courseware tests
 2013-06-27 13:50:51 -07:00
Jean Manuel Nater
3e0f933a73 Formatted a docstring. 2013-06-27 16:40:04 -04:00
Ned Batchelder
be4d5f3228 Merge pull request #292 from edx/ned/remove-pointless-addition-tests 
Remove pointless addition tests
 2013-06-27 13:31:36 -07:00
Ned Batchelder
a484224ef5 Remove pointless addition tests 2013-06-27 16:27:39 -04:00
Renzo Lucioni
4557891e0d Standardize types used for logging events from the instructor dashboard 2013-06-27 16:25:03 -04:00
John Jarvis
f6d7cc5516 save the cert record immediately after we set the status 
There was a potential though unlikely race condition because the .save()
was after the certificate request was put on the queue.

Now calling .save() immediately after we update the
cert.
 2013-06-27 15:57:51 -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
894d44a0d9 Merge pull request #286 from edx/zoldak/fix-discussion-override 
Make the UrlResetMixin load the urlconf after resetting it, and fix the ...
 2013-06-27 09:27:38 -07:00
Sarina Canelake
02a24716c6 Merge pull request #278 from edx/sarina/fix-modulestore-500s 
Catch InvalidLocationError
 2013-06-27 08:33:45 -07: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
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
Sarina Canelake
f7d6d14946 Catch InvalidLocationError 2013-06-26 15:24:48 -04:00
Don Mitchell
b42fe277d4 Add serial commas to modulestore definitions 2013-06-25 22:34:36 -04:00
Don Mitchell
8b23eeca7e Minor pylint/whitespace changes 2013-06-25 22:34:29 -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
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
Jean Manuel Nater
c4c68f516b Removed some unnecessary imports. 2013-06-24 17:31:49 -04:00
Jean Manuel Nater
799b938d5b Merge branch 'master' into jnater/courseware_tests 2013-06-24 17:24:42 -04:00
Jean Manuel Nater
1b344e4d4d Removed some unused functions. 2013-06-24 17:20:59 -04:00
Jean Manuel Nater
7fd1190505 Updated a doc string. 2013-06-24 17:13:33 -04:00
Jean Manuel Nater
986b63d85d Removed run_wrapped() and replaced its functionality with patch.dict(): 2013-06-24 17:07:43 -04:00
Jean Manuel Nater
e44ef1a54e Removed the use of random.choice() 2013-06-24 16:24:09 -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
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
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
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
Ned Batchelder
bea50efc26 Remove the unused smart-accordion lettuce feature, and the code it used. 2013-06-21 16:30:33 -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
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