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

14859 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Jonah Stanley
b7f745c737 Merge pull request #228 from edx/jonahstanley/fix-flakey-tests 
Jonahstanley/fix flakey tests
 2013-06-20 13:14:21 -07:00
Will Daly
106e0aae01 Clean tests step now removes stale coverage report files. 
Added test cleaning to fasttest_* instead of test_*, so that
it always gets executed for lms and cms tests.

Added comment to `directory` command for tests.rake

Separated cleaning of test fixtures from cleaning of reports
directory to resolve conflicts with collectstatic.
 2013-06-20 16:08:18 -04:00
cahrens
34f8c044b8 Pep8 cleaning. 2013-06-20 16:06:00 -04:00
JonahStanley
b9d79aea60 A bunch of pylint fixes and explicit use case for uploads/test 2013-06-20 15:55:53 -04:00
JonahStanley
281f900389 Changed format of docstring 2013-06-20 15:40:58 -04:00
Peter Fogg
0ef4390aff Merge pull request #132 from edx/peter-fogg/remove-video-xml 
Peter fogg/remove video xml
 2013-06-20 12:40:13 -07:00
JonahStanley
eec095a195 Changed naming of attempts to max_attempts and changed css_selector 2013-06-20 15:38:56 -04:00
JonahStanley
96c4d2877f Navigation now has a click success condition 2013-06-20 14:05:00 -04:00
Christina Roberts
fc6422641a Merge pull request #229 from edx/christina/activation_email 
Don't mention edge in the e-mail; same text used for edge and edx.
 2013-06-20 11:02:46 -07:00
cahrens
5f0a89bc27 Don't mention edge in the e-mail; same text used for edge and edx. 2013-06-20 13:16:13 -04:00
Brian Talbot
0c75f427b1 Merge pull request #226 from edx/talbs/studio-uiwell 
studio - revising the visual design of UI well pattern
 2013-06-20 09:46:06 -07:00
Peter Fogg
83d84e2b65 Actually fix merge conflicts. 2013-06-20 12:40:37 -04:00
Brian Talbot
b7b2f91e79 studio - revising the visual design of UI well pattern 2013-06-20 12:30:25 -04:00
Peter Fogg
1d8d507f49 Merge in master (again). 2013-06-20 12:21:16 -04:00
Christina Roberts
1a5b58acd6 Merge pull request #210 from edx/christina/course-settings-drupal 
On marketing site, disable course settings options that do not work.
 2013-06-20 09:15:18 -07:00
cahrens
9a753f1cc5 Studio feature to disable course settings on Drupal site. 2013-06-20 12:03:59 -04:00
Peter Fogg
ea56a0cd4a Make sure we can handle empty youtube attributes. 2013-06-20 11:58:01 -04:00
Jonah Stanley
9b478ff3e3 Merge pull request #115 from edx/jonahstanley/add-gradingsettings-tests 
Added testing for grading settings
 2013-06-20 08:31:31 -07:00