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

15032 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Felix Sun
f219228e4a Made the hint management instructor view off by default. 2013-07-01 10:25:04 -04:00
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
242d0c28ae Properly fomatted the tab-based UX for hint-voting. 
Chiseled a little at writing template tests.
 2013-07-01 10:25:04 -04:00
Felix Sun
c79ca38f6e Moved the hinter rendering onto a mako template. 
Hinter now displays vote count after voting.

Began testing templates.
 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
ad40905a38 Made correct/incorrect determination in coffeescript a little more sensitive. Still very hacky. 2013-07-01 10:25:04 -04:00
Felix Sun
475ac62c79 Fixed epic git rebase meltdown. No new features. 2013-07-01 10:25:04 -04:00
Felix Sun
6ccfa2e38d Made tests of the crowdsource hinter module more standardized and easier to read. Fixed database non-initialization bug in crowdsource hinter module. 2013-07-01 10:25:03 -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
Felix Sun
6f6a451784 Working prototype of crowdsourced hinting module. 
Conflicts:
	common/static/coffee/src/logger.coffee
 2013-07-01 10:25:03 -04:00
Sarina Canelake
712f17a47e Merge pull request #257 from edx/sarina/fix-unknown-user-profile 
When user profile isn't found, throw a 404 rather than 500
 2013-06-28 15:24:25 -07: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
Diana Huang
d5c5fb344e Merge pull request #290 from edx/diana/open-id-namespace 
Handle issues decoding openid requests more gracefully
 2013-06-28 13:00:19 -07:00
Diana Huang
f33bfd1c6c Address code review feedback 2013-06-28 15:03:44 -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
Ned Batchelder
ff60034849 Merge pull request #273 from edx/ned/remove-obsolete-and-distracting-scss-file 
Remove obsolete and distracting SCSS file
 2013-06-28 08:40:56 -07:00
Valera Rozuvan
938e48e5c8 Merge pull request #296 from edx/valera/bugfix_allow_no_youtube_attribute 
Fix for bug Blades/BLD-152
 2013-06-28 05:08:35 -07: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
Christina Roberts
8207f229f1 Merge pull request #285 from edx/christina/course-create-permissions 
Script for granting existing instructors creator access.
 2013-06-27 14:08:18 -07:00
jnater
7d0b72a41e Merge pull request #204 from edx/jnater/courseware_tests 
Jnater/courseware tests
 2013-06-27 13:50:51 -07:00
Will Daly
af05d05cbe Used dependency to ensure that REPORT_DIR exists before cleaning. 
This allows the build to pass in Jenkins
 2013-06-27 16:40:32 -04:00
Will Daly
7e6722c50f Added clean reports dependency to rake JavaScript test tasks. 
This ensures that `rake test` will clean the report directories
*before* running the JS tests.
 2013-06-27 16:40:32 -04: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
cahrens
32e6d4819f pep8/pylint cleanup. 2013-06-27 16:18:16 -04:00
John Jarvis
d1cb80a0ab Merge pull request #291 from edx/jarv/fix-certificates-race-cond 
save the cert record immediately after we set the status
 2013-06-27 13:14:11 -07:00
Frances Botsford
189fc89412 Merge branch 'release' 2013-06-27 16:03:29 -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
Will Daly
18c1bcdf12 Merge pull request #283 from edx/will/recover-jasmine-test-results 
Fix: deleting JS test reports in Jenkins
 2013-06-27 12:10:36 -07: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
Will Daly
ed57e7e555 Used dependency to ensure that REPORT_DIR exists before cleaning. 
This allows the build to pass in Jenkins
 2013-06-27 11:43:11 -04: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
cahrens
f095c5fec6 Add ENABLE_CREATOR_GROUP (set to False). 2013-06-27 11:00:43 -04:00
cahrens
27e720cf3b Make it clear that this should only be run once. 2013-06-27 11:00:11 -04:00
cahrens
0e0f22999d Add doc strings. 2013-06-27 09:52:18 -04:00
cahrens
ce100bad88 Add doc strings. 2013-06-27 09:48: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
cahrens
3babf53925 Handle the case of script being terminated before the user was deleted. 2013-06-27 09:44:09 -04:00
Frances Botsford
21a14eff94 update to changelog 2013-06-27 09:32:16 -04:00
Peter Fogg
0e4bc920ae Merge pull request #284 from edx/peter-fogg/fix-default-videos 
Peter fogg/fix default videos
 2013-06-27 06:23:54 -07:00