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
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
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
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
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
Vik Paruchuri
16e1ecf686
fix some pylint violations
2013-05-20 12:46:12 -04:00
Vik Paruchuri
55fda26fd8
Fix tests, fix xqueue error, minor polish
2013-05-20 11:29:19 -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
Diana Huang
dadcdd0599
Fix lettuce signup feature to match Drupal site.
2013-05-17 10:51:38 -04:00
Diana Huang
acfcd0f8a4
Fix the login lettuce feature for the new Drupal site.
2013-05-17 10:51:38 -04:00
Ned Batchelder
f856b69ab5
Merge branch 'feature/ned/sandboxed-python'
2013-05-17 10:28:06 -04:00
Greg Price
37ec01dd8d
Handle ItemNotFoundError from the modulestore to avoid 500 errors
2013-05-16 16:50:03 -04:00
Diana Huang
b6c0081064
Look for the existence of the links, not for
...
the actual urls
2013-05-16 16:30:29 -04:00
Diana Huang
22cf0dfa97
Fix bug in lettuce tests where the unregister dialog wasn't
...
getting closed fast enough.
2013-05-16 16:30:29 -04:00
Diana Huang
1c2175304e
Merge branch 'master' into drupal-new
2013-05-16 16:27:36 -04:00
Ned Batchelder
e947218285
Merge master to here.
2013-05-16 14:21:51 -04:00
Arthur Barrett
1fbe43a650
Merge branch 'master' into feature/abarrett/lms-notes-app
2013-05-16 13:23:12 -04:00
Chris Dodge
6cec66979a
fix broken tests. Also drive by fix for the sporadic failure on tests which may go to a textbook page. The URL formatting was incorrect in the test
2013-05-15 11:16:47 -04:00
Arthur Barrett
be98b5fa3e
merged master. resolved conflict in cms/djangoapps/contentstore/views.py (added word_cloud to advanced_modules list)
2013-05-13 13:26:55 -04:00
Greg Price
7dd2973eca
Return 404 for course about pages if the marketing site is enabled
...
It would be better to redirect to the marketing site course about pages, but
the URLs for those are not easily computed, and we do not have time to set up
a full mapping in the LMS config.
2013-05-10 11:03:16 -04:00
Greg Price
a0fb4d6c85
Merge branch 'master' into drupal-new
...
Conflicts:
lms/envs/aws.py
lms/envs/common.py
lms/static/sass/base/_base.scss
lms/templates/forgot_password_modal.html
2013-05-10 10:30:10 -04:00
Chris Dodge
1b0eff52ed
create test cases to simulate error exporting/importing textbooks
2013-05-10 10:01:10 -04:00
John Jarvis
0b7af27b4b
be more forgiving about the iframe url
...
If anything after mktg/ does not parse as a course-id return "coming soon"
This will prevent 404 errors when urls are incorrect on the marketing
site.
2013-05-07 16:00:00 -04:00
Arthur Barrett
cd4bec8750
merged master branch into feature/abarrett/lms-notes-app
2013-05-07 12:32:22 -04:00
Jay Zoldak
2ffaea7ade
Merge pull request #1949 from edx/fix/zoldak/modulestore-tests
...
Fix tests that intermittently fail when run in concurrent jobs on jenkins.
2013-05-06 13:32:27 -07:00
Arthur Barrett
ceefdf0161
user must be authenticated to view notes tab
2013-05-06 15:52:32 -04:00
Arthur Barrett
04e75485ba
merged master branch into feature/abarrett/lms-notes-app. resolved conflicts in lms/envs/common.py and lms/templates/static_htmlbook.html.
2013-05-06 13:40:38 -04:00
Greg Price
00729a8c13
Add an omnipresent help tab to the LMS
...
The help tab opens a modal dialog that directs the user at various resources
(e.g. the site FAQ and course forums) and allows the user to submit feedback
to the feedback endpoint (which will ultimately create a ticket for the
student support team).
2013-05-06 13:35:52 -04:00
jarv
f18321cda2
Merge pull request #1919 from edx/feature/gprice/drupal-auto-enroll-on-registration
...
Update course registration flow for non-modal registration and login
2013-05-06 10:31:29 -07:00
John Jarvis
d69bbf272e
using new template for "coming-soon"
2013-05-06 12:30:18 -04:00
John Jarvis
424d295686
syntax errors
2013-05-06 12:00:46 -04:00
