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

19654 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Wilson
a9a7f97d9b Update CHANGELOG for per-student problem rescoring. 2013-06-25 11:32:45 -04:00
David Baumgold
dddfdc735d Merge pull request #261 from edx/db/notification-event-prevent-default 
Call event.preventDefault() on notification action buttons
 2013-06-25 08:32:21 -07:00
David Baumgold
ddc986f775 Call event.preventDefault() on notification action buttons 
But allow you to specify that the event should not be prevented
 2013-06-25 11:29:42 -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
brianhw
3f2d33c580 Merge pull request #254 from edx/fix/brian/rescore-cleanup 
Enable per-student background tasks.
 2013-06-24 15:49:37 -07: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
Peter Fogg
a28451ab53 Merge pull request #255 from edx/peter-fogg/fix-advanced-settings-lettuce-test 
Fix acceptance tests expecting outdated CSS.
 2013-06-24 14:17:37 -07: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
Peter Fogg
d5d495c24d Fix acceptance tests expecting outdated CSS. 2013-06-24 16:57:14 -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
e44ef1a54e Removed the use of random.choice() 2013-06-24 16:24:09 -04:00
Peter Fogg
ad09236c82 Merge pull request #242 from edx/peter-fogg/advanced-backbone-notifications 
Refactor Advanced Settings page to use Backbone notifications.
 2013-06-24 12:37:26 -07: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
David Baumgold
4d2183d764 Merge pull request #253 from edx/db/notifications-secondary-single 
Backbone notifications secondary actions
 2013-06-24 11:48:55 -07:00
Jason Bau
f1825eff81 Update CHANGELOG.rst 2013-06-24 12:19:34 -06:00
Peter Fogg
fb573a1db6 Hide "success" alert as soon as we start editing another field. 2013-06-24 13:59:14 -04:00
Jason Bau
ab7b991e78 Update CHANGELOG.rst 2013-06-24 11:53:59 -06:00
Jason Bau
fde8e5b0a4 Merge pull request #246 from edx/fix/jbau/multiple-choice-label-width 
Change width of labels for multiple-choice capa problems to width of text, not 100%
 2013-06-24 10:52:06 -07:00
David Baumgold
72ffe2d8f2 Backbone notifications secondary actions 
Handle secondary actions on notifications either specified as a single object,
or as a list of objects. Under the hood, the initialize method converts a single
object to a list containing a single object.
 2013-06-24 13:44:50 -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
Peter Fogg
3e376bd780 Prevent "saved" and "error" views from showing at the same time. 
Previously the "saved" view was never hidden, even after more data was
edited. So if one field was saved successfully and then another was
not, we would find ourselves in the unfortunate situation of seeing
both views at once, leading to much confusion.
 2013-06-24 11:06:53 -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
Calen Pennington
634ad8937e Tidy up argument parsing in release email script 2013-06-24 10:32:27 -04:00
Peter Fogg
72e08456a8 Refactor Advanced Settings page to use Backbone notifications. 2013-06-24 09:48:37 -04:00
Jay Zoldak
2fadd655f4 Merge pull request #240 from edx/zoldak/update-discussion-md 
Update discussion documentation
 2013-06-24 06:18:45 -07:00
Jay Zoldak
f61c529cbb Merge pull request #231 from edx/zoldak/fix-rakefile-typo 
Fix typo in output message of rakefile
 2013-06-24 06:18:08 -07:00
Christina Roberts
503186196a Merge pull request #248 from edx/christina/remove-w 
Forgot to remove registration of onKeyUp function.
 2013-06-24 06:12:24 -07:00
cahrens
ad6e745762 Forgot to remove registration of onKeyUp function. 2013-06-24 09:09:05 -04:00
Christina Roberts
08aaa7850a Merge pull request #243 from edx/christina/remove-w 
Remove keybinding for work in progress (WIP).
 2013-06-24 05:55:44 -07:00
Jason Bau
4a98e2eda7 Moves user activation away from just clicking on reset password 
To following the link in the password reset email
 2013-06-23 22:33:54 -07:00
Alexander Kryklia
85b4a4ccab removes choiceresponse wiping after clicking Show Answer 2013-06-22 16:13:40 +03:00
Jason Bau
2eefa494b1 Width of labels for multiple-choice capa problems = width of text 
Stanford got some feedback from our students/faculty that students
were making accidental clicks on radio-button capa questions.
They would click way to the right of the label text, but it would
still select the corresponding input, which caused some students
to make unintentional changes to their answers.  This was because
labels for these inputs were display:block and width:100%

Changing these labels to float:left clear:both should fix it.
 2013-06-21 23:46:56 -07:00
mlsteele
88060c0590 Merge pull request #144 from edx/fix/msteele/instructor_tests 
fix gradebook tests
 2013-06-21 19:16:09 -07:00
Julian Arni
fa9a8f4af0 Greater dir naming flexibility. 
Accepts any dirname for the edx-platform repo. Allows the script to be
   called from any directory, not just $BASE/edx-platform.
 2013-06-21 18:00:30 -04:00
Juho Kim
ae960ccf5a analytics service update 2013-06-21 17:40:54 -04:00
Juho Kim
513c01b166 bringing up to master 2013-06-21 17:39:38 -04:00
Ned Batchelder
5a5d425eb3 Files that may not exist need F0401 suppressed during import. 2013-06-21 17:33:23 -04:00
Ned Batchelder
45815e2d03 Remove obsolete file comment_client/legacy.py 2013-06-21 17:33:23 -04:00
Ned Batchelder
57909ce1aa Fix all W0602, global used but no assignment done. 2013-06-21 17:33:23 -04:00
Ned Batchelder
75b390124f Tweaks to our pylintrc rules. 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
cahrens
250de3fcb6 Remove keybinding for work in progress (WIP). 
STUD-329
 2013-06-21 17:13:06 -04:00