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

822 Commits

Author SHA1 Message Date
Jonah Stanley
0be0df1b59 Merge pull request #325 from edx/jonahstanley/fix-flakey-tests 
Made a css_html to obtain the html of the css element.
 2013-07-03 11:55:25 -07:00
Chris Dodge
ccfc4fc012 remove extra line space at end of file 2013-07-03 13:46:32 -04:00
Chris Dodge
5088450ed3 add another unit test to explicitly exercise the can_execute_unsafe_code() method 2013-07-03 13:46:32 -04:00
Chris Dodge
b32c4aaa56 actually, seems like we should be using double quotes for docstrings 2013-07-03 13:46:32 -04:00
Chris Dodge
aa7f1f867d actually, I think we use single quotes for docstrings 2013-07-03 13:46:32 -04:00
Chris Dodge
bcbac3aaa4 add docstring to newly refactored method 2013-07-03 13:46:32 -04:00
Chris Dodge
bf3a7287f0 do some lamda magic to refactor out the whitelist checking code to be shared between LMS and CMS 2013-07-03 13:46:31 -04:00
JonahStanley
19513e4134 Refactored all clicks to use the css_click method 2013-07-03 10:34:56 -04:00
JonahStanley
9a5326bca5 Made a css_html to obtain the html of the css element. 
This works like css_click in that it will retry if there was a stale element reference exception
 2013-07-02 16:46:20 -04:00
Adam Palay
c692428fe5 fix pylint violations 2013-07-02 10:22:26 -04:00
Adam Palay
bdacc7646c clean up track/models 2013-07-01 18:21:47 -04:00
Adam Palay
03aee3ed79 add tests 2013-07-01 18:21:47 -04:00
Adam Palay
af75e1f785 log student answers using POST instead of GET 2013-07-01 18:21:47 -04:00
Jean Manuel Nater
5cb4c1a750 Removed some pep8 violations. 2013-07-01 17:07:24 -04:00
Calen Pennington
1a7b833146 Merge pull request #269 from edx/dhm/incidental-functionality-improvements 
Incidental functionality improvements from Next Gen Modulestore work
 2013-07-01 13:04:20 -07:00
David Baumgold
ce6b319288 Added jsonable_server_error in common/util/views.py 2013-07-01 15:09:41 -04:00
Jean Manuel Nater
72b4561e3a Moved xml_store_config, mongo_store_config, and draft_mongo_store_config to xmodule/modulestore/tests/django_util.py 
Removed some repeated instances of xml_store_config.
Reverted some changes to mongo_store_config so each modulestore gets it's own uuid.
 2013-07-01 14:45:53 -04:00
Diana Huang
d5c5fb344e Merge pull request #290 from edx/diana/open-id-namespace 
Handle issues decoding openid requests more gracefully
 2013-06-28 13:00:19 -07:00
Diana Huang
f33bfd1c6c Address code review feedback 2013-06-28 15:03:44 -04:00
Don Mitchell
c7046df0f2 Make request.POST be only json content when using expect_json 2013-06-28 14:19:10 -04:00
Diana Huang
c98651fadb Add in the ability to handle malformed return urls. 2013-06-27 18:02:23 -04:00
Diana Huang
c6fa4873b1 Handle issues decoding requests more gracefully 
Clean up some pep8/pylint violations as well
 2013-06-27 18:02:23 -04:00
Ned Batchelder
a484224ef5 Remove pointless addition tests 2013-06-27 16:27:39 -04:00
Jay Zoldak
c98a77565f Make the UrlResetMixin load the urlconf after resetting it, and fix the comment client test that was leaving ENABLE_DISCUSSION_SERVICE at True 2013-06-27 11:05:09 -04:00
dcadams
306ac48210 Email on enroll/un-enroll actions 
Optionally email students on enroll/un-enroll actions
by instructor from enrollment tab in LMS.
 2013-06-26 15:28:36 -07:00
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
Jason Bau
734440f4b9 Refactored tests 2013-06-25 20:21:20 -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
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
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
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
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
Sarina Canelake
8201ca5e77 Fix 500 error on reactivation email 2013-06-21 12:21:02 -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
JonahStanley
ec4547b51e Merge branch 'master' into jonahstanley/add-courseteam-tests 2013-06-20 16:55:37 -04:00
JonahStanley
eec095a195 Changed naming of attempts to max_attempts and changed css_selector 2013-06-20 15:38:56 -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
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
cahrens
9e69586bb3 pep8 fixes. 2013-06-20 10:31:44 -04:00
Christina Roberts
6fe56ac9f7 Merge pull request #205 from edx/christina/advanced-settings-test 
Sometimes the first click doesn't actually work, so call click up to 5 t...
 2013-06-20 05:48:13 -07:00
Ned Batchelder
df6d3f9b2f Fix strings that should be raw. 2013-06-19 16:56:34 -04:00
Ned Batchelder
181b1e979b Remove unused imports from common, as reported by pylint. 2013-06-19 16:56:34 -04:00
cahrens
6643994348 Add an optional success lambda to css_click. 2013-06-19 13:51:40 -04:00