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

353 Commits

Author SHA1 Message Date
David Baumgold
36e77c7463 Fixing pep8 issues 2014-12-11 13:04:49 -05:00
Sarina Canelake
db09c5529f Replace 'mit_dome.jpg' and 'simple_graph.png' with a default placeholder image 2014-12-09 22:28:09 -05:00
Will Daly
8580620b52 Revert "If feature flag is enabled, replace the old login/registration pages with the new combined login/registration page." 
This reverts commit f40447b3c8.

Conflicts:
	lms/urls.py

Revert "Add support for external auth on the combined login/registration page"

This reverts commit 988753395f.

Conflicts:
	lms/templates/courseware/mktg_course_about.html
	lms/urls.py
 2014-12-05 10:41:42 -05:00
Will Daly
988753395f Add support for external auth on the combined login/registration page 
Add support for redirect URLs in third party auth for combined login/registration page

Remove old login/registration acceptance tests

Add deprecation warnings to old login and register views

Move third party auth util to student_account

Add exception for microsites
 2014-12-04 09:34:51 -05:00
Sarina Canelake
20e2ee9a57 s/pylint: disable=E0611/pylint: disable=no-name-in-module/ 2014-12-01 11:22:09 -05:00
Sarina Canelake
e0f1d3f3f3 s/pylint: disable=C0111/pylint: disable=missing-docstring/ 2014-12-01 11:22:09 -05:00
Sarina Canelake
0dad9da5e4 s/pylint: disable=W0621/pylint: disable=redefined-outer-name/ 2014-12-01 11:22:08 -05:00
stv
5a69feadeb Fix PEP8: E123 closing bracket does not match 
indentation of opening bracket's line
 2014-11-24 20:46:44 -05:00
stv
500499b678 Fix PEP8: E231 missing whitespace after '[:,]' 2014-11-10 19:31:05 -08:00
stv
cf9308144d Fix PEP8: E302 expected 2 blank lines, found 1 2014-11-10 11:00:11 -08:00
stv
d5d6e3f0d8 Fix PEP8: W293 blank line contains whitespace 2014-11-10 10:59:53 -08:00
stv
d87cfa90bf Fix PEP8: W292 no newline at end of file 2014-11-10 10:59:44 -08:00
Sarina Canelake
725e4908e3 Remove more pep8 violations 2014-11-04 07:37:41 -05:00
Jim
3ceb0e5c6a Commenting out flaky string input test case 2014-10-30 14:33:36 -07:00
Will Daly
f9b5a9173f Redirect users to the track selection page or ?next page when using third party auth 
Set marketing site logged in cookie from third party auth.
 2014-10-28 10:28:30 -04:00
Jim
6d19a0c87c Support and tests for adding a reset button to units 
Users may want to start anew when answering a question. This commit decouples reset from randomization while still preserving backward compatibility. Users can clear their input.
Instructors can set course-wide and problem-specific settings for reset button display.
 2014-10-23 12:14:27 -07:00
Will Daly
e7609597bc Change text of registration to enrollment 2014-10-20 12:32:57 -04:00
Jesse Zoldak
dd35005132 Fix sychronization issues in LTI test 
Better verification for troubleshooting LTI test failures
Dismiss any lingering alerts after lettuce scenarios
 2014-10-17 12:22:34 -04:00
Renzo Lucioni
bd7715a393 Clean up after track selection experiment 2014-10-14 13:56:49 -04:00
stephensanchez
afaaca969a Adding new styles for dashboard notifications. 
Change the reverification failure message styling.

Changing templates so new styles do not appear in courseware.

Removing unused aria tag.

PR comments on cleaning up SASS

Fix signup LMS test.

Copy changes per review on PR

Updating based on PR comments

Style and HTML changes for notifications
 2014-10-07 15:44:47 +00:00
Don Mitchell
4f795f8270 Fix hardcoded course urls 2014-10-03 10:56:00 -04:00
Don Mitchell
edffa73512 Convert acceptance to opaque keys 2014-10-03 10:55:58 -04:00
Don Mitchell
8fe55c9aee Fix acceptance tests to work w/ split 
11300
 2014-09-29 11:25:55 -04:00
Waheed Ahmed
29aa933140 Converted annotation lettuce test into bok-choy test. 
TNL-353
 2014-09-29 13:12:06 +05:00
Paul Medlock-Walton
b797c6bd09 username and email request for lti module 
allow username and email can be passed to a lti third party app
ask user permission when lti button is clicked
allow course editor to customize text on lti launch button
 2014-09-24 20:05:42 +03:00
Jesse Zoldak
76517de87d Disable intermittently failing annotation acceptance test TNL-353 2014-09-15 12:23:47 -04:00
Renzo Lucioni
cc6e63dd22 Prepare track selection page for new audit track 2014-09-12 13:58:13 -04:00
Ben Patterson
dc75f6870a Acceptance tests (lettuce): hardcode sleeps to fix flakiness 
This is a quick fix (because the long fix was taking far too long
due to animation). The truer fix is to port these tests to bok-choy.
 2014-09-10 13:44:49 -04:00
Stephen Sanchez
9ee15bf007 Updating the footer for edx.org and open edx. 
Move the open edx logo inside the div

Adding a bunch of placeholder views.

indenting.

Making some styles work against LMS sass.

Adding back the old edx footer and associated icons, with a feature flag.
 2014-08-25 15:33:43 +00:00
Ned Batchelder
dea5c7d3db Add a test of login with params on the next URL 2014-07-24 16:11:33 -07:00
clytwynec
1807948f2e Merge pull request #4391 from edx/clytwynec/clean_up_lettuce_output 
Clytwynec/clean up lettuce output
 2014-07-14 09:09:25 -04:00
Christine Lytwynec
0581d0c5a1 disabling zendesk in lettuce tests and removing help/feedback lettuce tests in favor of the existing JS ones 2014-07-11 12:01:03 -04:00
Nimisha Asthagiri
8855b12b76 Update tests to allow LMS tests to use published branch setting. 
Conflicts:
	cms/djangoapps/contentstore/views/tests/test_container_page.py
	common/djangoapps/external_auth/tests/test_shib.py
	common/djangoapps/student/tests/test_login.py
	common/lib/xmodule/xmodule/modulestore/tests/django_utils.py
	common/lib/xmodule/xmodule/modulestore/tests/factories.py
	common/lib/xmodule/xmodule/modulestore/xml_importer.py
	lms/djangoapps/branding/tests.py
	lms/djangoapps/courseware/tests/test_submitting_problems.py
	lms/djangoapps/courseware/tests/test_video_handlers.py
	lms/djangoapps/instructor_task/tests/test_base.py
	lms/djangoapps/instructor_task/tests/test_integration.py
 2014-07-09 21:10:12 -04:00
Justin Helbert
e78a398f45 This emits enrollment mode changes events 2014-07-09 20:27:00 +00:00
Nimisha Asthagiri
a9213509c3 Enable Mixed Modulestore STUD-1540 
Refactor get_parent_locations STUD-1663
 2014-06-26 18:00:11 -04:00
Muhammad Ammar
15839147c2 Youtube Video Quality Button Tests 2014-06-20 13:48:27 +00:00
Muhammad Ammar
3f88ff662e Remove Flash Test Scenarios 2014-06-18 10:47:32 +00:00
Minh-Tue Vo
ca045aaa3d Merge pull request #4139 from edx/mvo/removing-dots 
Removing dot in scenario names
 2014-06-17 14:43:03 -04:00
muhammad-ammar
95769fe442 Merge pull request #4123 from edx/ammar/reduce-captions-wait-time 
Reduce captions wait time.
 2014-06-17 20:15:47 +05:00
Muhammad Ammar
346164189f Improve certificates test time 2014-06-17 08:54:52 +00:00
Muhammad Ammar
d907d24fa5 Reduce captions wait time. 2014-06-17 07:39:12 +00:00
Minh Tue Vo
ae9955b290 changing dot into v 2014-06-16 17:40:28 -04:00
Diana Huang
2dbf9442a6 Revise course mode choose page. 
LMS-2796
 2014-06-16 14:08:40 -04:00
Muhammad Ammar
d9fe111c5b Bok-Choy Video Tests Batch9 2014-06-02 11:48:40 +00:00
Waheed Ahmed
cb2af13418 Fixed staff debug info endpoints for staff member. 
LMS-2737
 2014-06-02 12:26:27 +05:00
Julia Hansbrough
6ccb11f03e Change Location, CourseLocator, etc to reference opaque-keys library 2014-05-30 20:32:38 +00:00
Sarina Canelake
5c9fe4bb7a Merge pull request #3929 from edx/sarina/lms-2786 
Fix location.url [LMS-2786]
 2014-05-29 21:01:46 -04:00
Sarina Canelake
e77dffcbcd Fix location.url [LMS-2786] 2014-05-29 18:01:29 -04:00
Calen Pennington
cfcbdc0145 Move to OpaqueKey implementations from the external library 
[LMS-2757]
 2014-05-29 17:03:35 -04:00
Muhammad Ammar
7afcb9348c Check YouTube Availabitlity for Video Tests 2014-05-29 15:08:47 +00:00