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

14877 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Bau
f1825eff81 Update CHANGELOG.rst 2013-06-24 12:19:34 -06: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
Ned Batchelder
bec6330c34 Merge pull request #251 from edx/ned/pylint-fixes 
Ned/pylint fixes
 2013-06-24 10:44:35 -07: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
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
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
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
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
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
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
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
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
Calen Pennington
5ba6855d80 Merge pull request #224 from edx/cale/xmodule-assets-pylint-fixes 
Fix pylint violations in xmodule static_content.py
 2013-06-21 05:29:17 -07:00
Will Daly
f109e5b01c Changed order of arguments to test tasks so that the report 
directory is created before it is cleaned.
 2013-06-21 08:02:23 -04:00
Will Daly
151aa1c082 Merge pull request #114 from edx/will/test-report-cleanup 
Clean tests step now removes stale coverage report files.
 2013-06-20 18:59:02 -07:00
Jason Bau
aa4e27f775 Shib PR responses to @cpennington and @ormsbee comments 
* Changed unicode test cases to ascii encoding
* Removed 'stanford' hardcoding in TOS logic in lieu of
  'SHIB_DISABLE_TOS' MIT_FEATURES flag
* made 'external_auth' always an installed_app in lms
* log.exception changd to log.error where appropriate

But: did not change skipping tests to changing settings, for
reasons stated here:
https://github.com/edx/edx-platform/pull/67#issuecomment-19790330
 2013-06-20 18:12:20 -07:00
Jay Zoldak
22b400b349 Fix typo in output message of rakefile 2013-06-20 17:18:01 -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
JonahStanley
a52d0beb41 Got rid of leftover set_trace 2013-06-20 17:00:46 -04:00
JonahStanley
ec4547b51e Merge branch 'master' into jonahstanley/add-courseteam-tests 2013-06-20 16:55:37 -04:00
Calen Pennington
4cb6eb6e19 Fix pylint violations in xmodule static_content.py 2013-06-20 16:45:11 -04: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
Calen Pennington
d687a2aefd Merge pull request #208 from edx/cale/create-dev-env-fixes 
Cale/create dev env fixes
 2013-06-20 13:42:24 -07:00
JonahStanley
70d48e2e9f Now referencing css element 2013-06-20 16:40:13 -04:00
Christina Roberts
e84ee873d0 Merge pull request #230 from edx/christina/pep8-again 
Pep8 cleaning.
 2013-06-20 13:34:50 -07:00