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

5207 Commits

Author SHA1 Message Date
Renzo Lucioni
2cd18dfad3 Merge pull request #263 from edx/renzo/segment-io-whitelist-expansion 
Add handful of events to the Segment.io whitelist
 2013-06-26 10:41:11 -07:00
Ned Batchelder
6e5c861018 Merge pull request #272 from edx/fix/LMS-500 
Fix LMS-500: Random class in random module was None
 2013-06-26 07:49:54 -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
Renzo Lucioni
3f49da385f Swap Logger call from check_fd to check 2013-06-25 17:22:05 -04:00
Carlos Andrés Rocha
94e1746500 Merge pull request #258 from edx/rocha/pre-external-grader-cleanup 
Cleanup before adding external grader
 2013-06-25 13:17:11 -07:00
Renzo Lucioni
881d63dae7 Fixed Jasmine tests in light of Logger changes, and wrote test to cover case where data passed is not a dictionary 2013-06-25 16:04:00 -04:00
Renzo Lucioni
84f4361d52 Avoid changing format of data sent to our logs, and prevent problem_check event from firing twice 2013-06-25 15:33:16 -04:00
Renzo Lucioni
bcbce3eff0 Add handful of events to the Segment.io whitelist 2013-06-25 15:33:16 -04:00
Jonah Stanley
b14553d867 Merge pull request #220 from edx/jonahstanley/make-units-parallel 
Jonahstanley/make units parallel
 2013-06-25 11:44:01 -07:00
Ned Batchelder
ed62c5a6f9 Fix LMS-500: Random class in random module was None 
Deleting the module object isn't needed to replace it, and deleting
a module object causes all of its attributes to be set to None.
 2013-06-25 14:23:16 -04: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
JonahStanley
8a9125f121 Test Mongo database is now unique and destroyed in teardown 2013-06-25 11:33:46 -04:00
Peter Baratta
4c269c1079 Merge pull request #203 from edx/pbaratta/fix/capa-unicode 
Fix unicode for errors on capa problems
 2013-06-25 06:46:30 -07:00
Valera Rozuvan
08b994b87e Merge pull request #247 from edx/alex/fix_choiceresponse 
removes choiceresponse wiping after clicking Show Answer
 2013-06-25 05:55:27 -07:00
Peter Baratta
3a8f591fe5 Add tests for the diff coverage; fix one hidden unicode bug 2013-06-24 16:49:33 -04: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
Alexander Kryklia
85b4a4ccab removes choiceresponse wiping after clicking Show Answer 2013-06-22 16:13:40 +03: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
Peter Baratta
7db93976c5 PR fixes 2013-06-21 11:02:25 -04:00
JonahStanley
e4af7287b6 Initial testing for parallelization 2013-06-21 08:51:43 -04: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
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
Calen Pennington
4cb6eb6e19 Fix pylint violations in xmodule static_content.py 2013-06-20 16:45:11 -04:00
JonahStanley
70d48e2e9f Now referencing css element 2013-06-20 16:40:13 -04: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
b9d79aea60 A bunch of pylint fixes and explicit use case for uploads/test 2013-06-20 15:55:53 -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
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
Peter Fogg
ea56a0cd4a Make sure we can handle empty youtube attributes. 2013-06-20 11:58:01 -04:00
Peter Baratta
f623e42983 Fix formatting of docstrings; add more docstrings 2013-06-20 11:50:58 -04:00
Peter Baratta
b68e1e207e Fix some line lengths to make pylint happy 2013-06-20 11:46:04 -04:00
Peter Baratta
401dd550e4 Convert many byte strings to unicode; change string formatting 2013-06-20 11:46:04 -04:00
Peter Baratta
4f78c1977f Allow error messages with non-ascii characters to be handled correctly 
Also, add a test for this behavior.
 2013-06-20 11:46:04 -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