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

2006 Commits

Author SHA1 Message Date
Diana Huang
f3b36b8bc9 Use from_descriptor instead of from_xml to make ErrorDescriptor 2013-06-03 17:21:41 -04:00
JonahStanley
6af54ead39 Fixed scenario wording 2013-06-03 12:43:54 -04:00
JonahStanley
0d11eb16ba Fixed typo 
I accidently had show_answer instead of showanswer.  This error was hidden by a previous default of showanswer=always.
 2013-06-03 11:52:40 -04:00
JonahStanley
a17c487f16 Merged from Master 2013-06-03 09:46:19 -04:00
Peter Fogg
8c5f9e6e41 Fix merge conflict. 2013-06-03 08:49:52 -04:00
Peter Fogg
5434f2750e Cleaning up code to fix pylint/pep8 errors. 2013-05-31 15:58:12 -04:00
JonahStanley
cb9da2cd03 Potentially fixed all flakey tests 
New function was added: is_css_not_present
This function works like is_css_present in that it will wait and can take in an optional argument to wait longer.  This should be used everywhere INSTEAD of not is_css_present as in the latter case, you are telling selenium to wait for the thing you don't want to be there to either be there or time out.
 2013-05-31 15:16:45 -04:00
JonahStanley
3308bb4be7 Fixed pull request comments and refactored the duplicate code 2013-05-31 14:53:29 -04:00
Vik Paruchuri
badd3a8d13 Properly stub out the controller_qs variable in the tested module. Test times out without this. 2013-05-31 13:14:19 -04:00
Peter Fogg
2277c82efd Fix pep8 whitespace violation. 2013-05-31 12:54:09 -04:00
Peter Fogg
a503a753cd Remove unnecessary pylint warning disable. 2013-05-31 12:16:25 -04:00
Peter Fogg
782cb05410 Add passing Lettuce testing for video autoplay in LMS. 2013-05-31 11:22:45 -04:00
JonahStanley
a49acc73ee Removed the save_html line 2013-05-31 09:16:14 -04:00
Peter Fogg
1ead857792 Working on Lettuce tests for video in LMS. 
In progress, committing for the great git history rewrite.
 2013-05-30 15:01:23 -04:00
JonahStanley
c27391ce8f Accidently left in a set_trace and forgot to include files 2013-05-30 15:00:01 -04:00
JonahStanley
ccc253d5c0 Sped up tab lettuce test 2013-05-30 14:56:08 -04:00
JonahStanley
7fe206a9d2 Sped up some Lettuce Tests 2013-05-30 14:23:49 -04:00
JonahStanley
62b74008e6 Added tests for Limited Attempt Problems and Showing the Answer 2013-05-30 14:22:37 -04:00
JonahStanley
c3c4a0e9ad Hopefully fixed registration flakey test 2013-05-28 15:22:47 -04:00
Vik Paruchuri
5050eab74a Merge remote-tracking branch 'origin/master' into feature/vik/oe-editor 2013-05-24 14:26:33 -04:00
Chris Dodge
3fceb46953 Merge branch 'master' of github.com:edx/edx-platform into feature/cdodge/autoprovision-forums-master 2013-05-22 20:44:22 -04:00
Greg Price
d724223a4c Merge pull request #2053 from edx/fix/gprice/modulestore-500-errors 
Handle ItemNotFoundError from the modulestore to avoid 500 errors
 2013-05-22 10:58:06 -07:00
Chris Dodge
9b88528b04 Merge branch 'master' of github.com:edx/edx-platform into feature/cdodge/autoprovision-forums-master 2013-05-22 13:20:49 -04:00
Vik Paruchuri
e9f05640f8 Update comments 2013-05-22 12:16:23 -04:00
Vik Paruchuri
96f145b8f6 Update error message 2013-05-22 12:00:36 -04:00
Vik Paruchuri
3bd04290f5 Add tests, address review comments 2013-05-22 11:58:03 -04:00
Vik Paruchuri
a44eacd474 Make fields stringy, remove false dict 2013-05-22 10:54:52 -04:00
Vik Paruchuri
21f7e222f7 Fix exception clause 2013-05-22 10:51:11 -04:00
Vik Paruchuri
9a52a17aab Merge remote-tracking branch 'origin/master' into feature/vik/oe-editor 2013-05-21 14:54:45 -04:00
Vik Paruchuri
c5f9d94cc4 Add in comments, fix behavior 2013-05-21 14:46:22 -04:00
Vik Paruchuri
c91fa2f45a Add in some comments 2013-05-21 14:23:24 -04:00
Vik Paruchuri
956669de21 If location cannot be found, move on 2013-05-21 14:21:46 -04:00
Vik Paruchuri
0887383ca7 Don't show peer grading button unless there is a peer grading element in the course 2013-05-21 14:18:00 -04:00
Nate Hardison
cc7b2942ee Handle Heroku's 503 maintenance mode response 
The LMS comment client previously would try to parse the response
as JSON, choke, and return a 500 to the client. Now, the LMS client
displays a message indicating that the forums are down for
maintenance.
 2013-05-21 10:03:51 -07:00
Chris Dodge
094e396556 Merge branch 'master' of github.com:edx/edx-platform into feature/cdodge/autoprovision-forums-master 2013-05-21 09:47:11 -04:00
Vik Paruchuri
d0e8965a3c Fix pep8/pylint issues 2013-05-20 16:42:27 -04:00
Vik Paruchuri
3b3cf19c47 Fix tests and add in jasmine test 2013-05-20 15:52:19 -04:00
Vik Paruchuri
23269359c1 Jasmine tests, fix some review issues 2013-05-20 15:31:56 -04:00
e0d
a7b02e0029 actually needs to be 255 given unicode requirements 2013-05-20 14:40:05 -04:00
Vik Paruchuri
7699c1794c Merge remote-tracking branch 'origin/master' into feature/vik/oe-editor 2013-05-20 14:16:04 -04:00
Vik Paruchuri
16e1ecf686 fix some pylint violations 2013-05-20 12:46:12 -04:00
e0d
0e37564490 pep8 fixes 2013-05-20 12:01:25 -04:00
e0d
a54ecb98c6 resizing uri column 2013-05-20 11:59:56 -04:00
Vik Paruchuri
55fda26fd8 Fix tests, fix xqueue error, minor polish 2013-05-20 11:29:19 -04:00
Chris Dodge
a44e816877 remove_open_ended_panel_tab() -> remove_extra_paneltab(). Also, update new forums test factors to use refactored Models.py 2013-05-20 10:33:52 -04:00
Chris Dodge
fbbae44988 Merge branch 'master' of github.com:edx/edx-platform into feature/cdodge/autoprovision-forums-master 
Conflicts:
	cms/djangoapps/contentstore/views/course.py
	lms/djangoapps/django_comment_client/base/views.py
	lms/djangoapps/django_comment_client/management/commands/show_permissions.py
	lms/djangoapps/django_comment_client/models.py
	lms/djangoapps/django_comment_client/tests/test_utils.py
	lms/envs/common.py
 2013-05-20 10:22:36 -04:00
Vik Paruchuri
4c80325db3 Start working on COE editor, fix name checking in module_render 2013-05-20 08:11:54 -04:00
Greg Price
de5b4d7d27 Merge branch 'master' into drupal-new 2013-05-17 16:10:56 -04:00
Greg Price
db3189d5ad Disable marketing registration button for courses that user cannot enroll in 2013-05-17 14:10:04 -04:00
Kevin Chugh
ef3204da69 Merge pull request #2059 from edx/feature/zoldak/forum-testing 
Feature/zoldak/forum testing
 2013-05-17 10:10:55 -07:00