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

5204 Commits

Author SHA1 Message Date
Jason Bau
4a3165414d Merge pull request #84 from edx/feature/jbau/activation-after-password-reset-confirm 
Moves user activation from just clicking on reset password to following the link in the password reset email
 2013-06-25 20:34:19 -07:00
Carlos Andrés Rocha
e4ee1c6c9b Rename arguments of modx_dispatch and handle_ajax related functions 
Refactor a bit modx_dispatch
 2013-06-25 13:38:57 -04:00
Carlos Andrés Rocha
2f02496c8f Reorder imports on module_render 2013-06-25 13:31:53 -04:00
Brian Wilson
332a440539 Enable per-student background tasks. 2013-06-24 18:47:50 -04: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
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
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
df4b512b6f Change wildcard imports into specific imports 2013-06-21 17:33:06 -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
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
75b355c337 Remove unused reactivation email function 2013-06-21 13:12:18 -04:00
Jason Bau
07e56ac43b Merge pull request #67 from edx/features/jbau/stanford-shib 
Shibboleth Auth
 2013-06-21 09:32:30 -07:00
JonahStanley
b847930579 Changed a click to css_click and fixed earlier typo 2013-06-21 09:38:43 -04: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
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
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
JonahStanley
281f900389 Changed format of docstring 2013-06-20 15:40:58 -04: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
Peter Fogg
83d84e2b65 Actually fix merge conflicts. 2013-06-20 12:40:37 -04:00
Peter Fogg
1d8d507f49 Merge in master (again). 2013-06-20 12:21:16 -04:00
JonahStanley
e1d4c69365 Merge branch 'master' into jonahstanley/fix-flakey-tests 
Conflicts:
	common/djangoapps/terrain/ui_helpers.py
 2013-06-20 11:17:15 -04:00
Peter Fogg
c77eb4fd4c Fix VideoAlpha acceptance test step definitions to not clash with Video module. 2013-06-20 11:14:33 -04:00
JonahStanley
a8789dced9 Fixed flakey check box by making a css_check function that behaves like css_click 
As a result, changed inputfield to return the css, and all of the element.fill() to css_fill
 2013-06-20 11:14:17 -04:00
Will Daly
ef06932df0 Merge pull request #197 from edx/will/fix-video-acceptance-tests 
Will/fix video acceptance tests
 2013-06-20 08:07:28 -07:00
JonahStanley
1e51bd7314 Fixed flakey navigation tests by changing css 
Now only check for the css that appears when the accordion is done
 2013-06-20 10:58:11 -04:00
JonahStanley
033b974047 Fixed flakey show answer test 2013-06-20 10:54:43 -04:00
Felix Sun
c00721bbe6 Fixed the preferences scope of xblock. 
Added self to authors.

Conflicts:
	AUTHORS
	CHANGELOG.rst
 2013-06-20 10:17:25 -04:00
Peter Fogg
9c7be8b1dc Fix merge conflict in CHANGELOG.rst. 2013-06-20 09:58:22 -04:00
Calen Pennington
308fe26b65 Clean up pep8 E128 issues 2013-06-20 09:08:25 -04:00
Calen Pennington
448ca26cdf Remove simplewiki from the codebase 2013-06-20 09:06:29 -04:00
Will Daly
dbd2716e29 Updated video alpha template name to reflect recent changes in master. 2013-06-20 07:44:33 -04:00
Will Daly
b1c963ab5e Changed stubbing behavior in video templates to exclude 
only the sources (not the player)
 2013-06-20 07:40:12 -04:00
Will Daly
6ab5bb2f20 Changed videoalpha stub to exclude video sources, but include 
the rest of the player.
 2013-06-20 07:40:12 -04:00
Will Daly
3b37e0c19f Fixed incorrect videoalpha template name 2013-06-20 07:40:12 -04:00
Will Daly
e76ef3aa31 Combined video and videoalpha acceptance tests. 
Resolved conflict between two steps with the same name.
 2013-06-20 07:40:12 -04:00
Ned Batchelder
e775852ee4 Make lms and cms more similar. 2013-06-19 22:44:55 -04:00
Ned Batchelder
61b53713d2 Remove unused imports from lms, as detected by pylint. 2013-06-19 16:56:34 -04:00
Ned Batchelder
df6d3f9b2f Fix strings that should be raw. 2013-06-19 16:56:34 -04:00
Renzo Lucioni
0bf02cabff Fix for the failing acceptance tests 2013-06-19 16:48:25 -04:00
David Ormsbee
e1b071be30 Initialize MakoMiddleware manually during certificate grading runs. 
Without this, problems fail to load because they can't find how to
render themselves, and the certificate generation grading run will
get an inaccurately low count of the possible points a user could
get (anything they didn't see will be omitted), inflating their
grade during certificate calculation and making it inconsistent
with their Progress page.
 2013-06-19 14:39:02 -04:00