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

15929 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
jkarni
bbfadb2f7d Merge pull request #32 from yarko/patch-1 
create-dev-env.sh:  if run from repo, set $BASE appropriately
 2013-06-21 13:38:47 -07: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
JonahStanley
3f9a72e6ce Consolidated imports 2013-06-21 16:32:13 -04:00
Ned Batchelder
bba626f481 Merge pull request #241 from edx/ned/delete-unused-test-code 
Remove the unused smart-accordion lettuce feature, and the code it used.
 2013-06-21 13:31:20 -07:00
Ned Batchelder
bea50efc26 Remove the unused smart-accordion lettuce feature, and the code it used. 2013-06-21 16:30:33 -04:00
JonahStanley
5e6de488ab Fixed pylint/pep8 violations 2013-06-21 16:28:32 -04:00
Sarina Canelake
88b83c4266 Merge pull request #235 from edx/sarina/fix-reactivation-email-bug 
Fix 500 error on reactivation email
 2013-06-21 13:23:30 -07:00
JonahStanley
58fe6d4e83 Cleaned up import and comment 2013-06-21 16:17:33 -04:00
Sarina Canelake
30593b3795 Merge pull request #238 from edx/sarina/remove-unused-reactivation-path 
Remove unused reactivation email function
 2013-06-21 12:44:21 -07:00
Jonah Stanley
26a05f2a45 Merge pull request #140 from edx/jonahstanley/add-courseteam-tests 
Jonahstanley/add courseteam tests
 2013-06-21 12:43:14 -07:00
David Baumgold
d632ffe9cd Make Course Team lettuce tests gender-neutral 
Because it bothers me, although I don't expect anyone else to care.
 2013-06-21 14:52:31 -04:00
Jay Zoldak
e85fa65182 Update discussion documentation 2013-06-21 14:24:41 -04:00
Jean Manuel Nater
9bfddd4891 Addressed pull request feedback. 2013-06-21 14:05:57 -04:00
Sarina Canelake
75b355c337 Remove unused reactivation email function 2013-06-21 13:12:18 -04:00
Will Daly
a36aee5bf7 Merge pull request #237 from edx/will/restore-pylint-pep8-reports 
Restore Pylint/Pep8 reports
 2013-06-21 09:50:04 -07:00
Jason Bau
07e56ac43b Merge pull request #67 from edx/features/jbau/stanford-shib 
Shibboleth Auth
 2013-06-21 09:32:30 -07:00
Sarina Canelake
8201ca5e77 Fix 500 error on reactivation email 2013-06-21 12:21:02 -04:00
Peter Baratta
7db93976c5 PR fixes 2013-06-21 11:02:25 -04:00
Will Daly
3d202ffc71 Moved generation of pylint/pep8 reports to after running the 
test suite, so the clean reports command doesn't blow
away the reports.
 2013-06-21 10:57:19 -04:00
Jonah Stanley
51469ad30a Merge pull request #236 from edx/jonahstanley/fix-flakey-tests 
Changed a click to css_click and fixed earlier typo
 2013-06-21 06:54:11 -07:00
JonahStanley
b847930579 Changed a click to css_click and fixed earlier typo 2013-06-21 09:38:43 -04:00
Will Daly
bd811b8bbe Merge pull request #234 from edx/will/create-report-dir 
Report Dir Acceptance Test Fix
 2013-06-21 06:13:32 -07:00
JonahStanley
cb04f9f0b8 Moved port range to rake file 2013-06-21 08:51:44 -04:00