Commit Graph

3109 Commits

Author SHA1 Message Date
Sanford Student
3893f3f069 MA-2164 add youtube when mobile video encoding missing 2016-03-17 19:59:33 -04:00
cahrens
dd2a203677 Upgrade underscore to newest version.
FEDX-24
2016-03-16 17:08:27 -04:00
Jesse Zoldak
f01f36a541 Merge pull request #11822 from edx/zoldak/revert-pr11613
Revert "ziafazal/WL-328: Multi-Site Comprehensive Theming"
2016-03-16 13:23:42 -04:00
Jesse Zoldak
f891d27cbb Revert "ziafazal/WL-328: Multi-Site Comprehensive Theming"
This reverts commit 954dae584a.
2016-03-16 11:19:36 -04:00
Diana Huang
091dc27c4f Use is-hidden instead of hidden. 2016-03-15 17:17:56 -04:00
Matt Drayer
a25caf31c3 Merge pull request #11613 from edx/ziafazal/WL-328
Ziafazal/wl-328 multi-tenancy support in Comprehensive Theming
2016-03-14 15:21:54 -04:00
Zia Fazal
954dae584a ziafazal/WL-328: Multi-Site Comprehensive Theming
ziafazal: improvements need for multi-tenancy
ziafazal: fixed broken tests
ziafazal: no need to add setting in test.py
ziafazal: added hostname validation
ziafazal: changes after feedback from mattdrayer
ziafazal: fixed branding and microsite broken tests
ziafazal: make STATICFILES_DIRS to list
ziafazal: added theme directory to mako lookup for tests
ziafazal: added more protection in test_util
saleem-latif: Enable SCSS Overrides for Comprehensive Theming
saleem-latif: Incoporate feedback changes, Correct test failures, add tests and enable theming for django templates
saleem-latif: Correct errors in python tests
mattdrayer: Fix invalid release reference
mattdrayer: Update django-wiki reference to latest release
2016-03-14 13:42:53 -04:00
Diana Huang
01ef2c9a45 Merge pull request #11776 from edx/efischer/tnl-4132
Flaky Matlab Tests
2016-03-14 13:42:04 -04:00
Eric Fischer
41e1e27df5 Wait for element visibility instead of AJAX. 2016-03-14 11:19:37 -04:00
Eric Fischer
c46e5c1cb0 Fix flaky discussion tests
Ajax callbacks are used in a lot of places in discussions; our tests
need to wait for those callbacks to finish in several places.
2016-03-14 10:27:15 -04:00
Ben Patterson
04cc6969ef Flagging other library import bok-choy test as flaky. 2016-03-12 12:48:13 -05:00
Ben Patterson
94c0a54664 Flag two tests as flaky. See inline comments for JIRA tickets. 2016-03-11 13:18:54 -05:00
Christine Lytwynec
5b5b4eb4fc Merge pull request #11393 from edx/clytwynec/ac-238
Improve accessibility for dashboard course settings dropdown
2016-03-10 12:30:20 -05:00
Eric Fischer
a647169a90 Merge pull request #11167 from edx/christina/ora-data-download
WIP: Asynchronous download button for ORA2 data
2016-03-10 11:09:36 -05:00
dylanrhodes
2b1a7eece2 Asynchronous download button for ORA2 data
Conflicts:
	lms/djangoapps/instructor/tests/test_api.py
	lms/djangoapps/instructor/utils.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/instructor/views/api_urls.py
	lms/djangoapps/instructor/views/instructor_dashboard.py
	lms/djangoapps/instructor_task/api.py
	lms/djangoapps/instructor_task/tasks.py
	lms/djangoapps/instructor_task/tasks_helper.py
	lms/djangoapps/instructor_task/tests/test_api.py
	lms/djangoapps/instructor_task/tests/test_tasks.py
	lms/djangoapps/instructor_task/tests/test_tasks_helper.py
	lms/envs/aws.py
	lms/envs/common.py
	lms/static/coffee/src/instructor_dashboard/data_download.coffee
	lms/templates/instructor/instructor_dashboard_2/data_download.html
2016-03-10 09:58:55 -05:00
Muzaffar yousaf
770a45b720 Merge pull request #11363 from edx/notes-pagination
Notes pagination
2016-03-10 17:26:54 +05:00
Hasnain
5e24225cd8 Removing Flaky decorator from lms instructor dashboard test 2016-03-09 10:18:10 -05:00
Peter Fogg
fd2f3b69ef Prevent ordering closed courses, and give a good user message.
When Drupal attempts to enroll a user in a closed course, a 406 will
be returned. This causes the marketing site to redirect to the track
selection page for that course, which will then redirect to the
dashboard with a nice message.

ECOM-2317
2016-03-08 16:45:49 -05:00
muzaffaryousaf
b095651655 Escape html/js with other bug fixes .
TNL-4164
2016-03-08 18:07:52 +05:00
Jesse Zoldak
01e6fa81af Merge pull request #11654 from edx/zoldak/TE-1201
Convert tests for adding advanced problem components from lettuce to bok-choy
2016-03-04 15:14:25 -05:00
John Eskew
d398f50786 Merge pull request #11490 from edx/jeskew/PLAT_736_fix_content_lib_export_import
Fix content library export with empty problems.
2016-03-04 11:03:27 -05:00
Ned Batchelder
57d2d62335 Merge pull request #11741 from edx/ned/flaky-SOL-1654
Mark a flaky test, SOL-1654
2016-03-04 10:11:39 -05:00
Ned Batchelder
6071d4f363 Merge pull request #11742 from edx/ned/flaky-TNL-4190-4191
Mark two tests flaky. TNL-4190 TNL-4191
2016-03-04 10:11:02 -05:00
John Eskew
80fc91bf1a - Add test content library XML.
- Ensure that only a course import is saved to the draft branch and then
published. A content library has only a single 'library' branch.
- Add a fields parameter to the create_library call so the call has the
correct number of parameters.
- Add tests which import content libraries using different test methods
and with different branch settings.
- Add test which imports a content library and then exports it.
- Use XBlock module version that supports XML-serialized String of None.
- Add re-import of content library and equality comparison to test.
- Allow get_items to be called on LibraryLocators.
2016-03-04 09:53:27 -05:00
Ned Batchelder
b653e28e5c Mark two tests flaky. TNL-4190 TNL-4191 2016-03-03 13:14:12 -05:00
Ned Batchelder
e3522d1fae Mark a flaky test, SOL-1654 2016-03-03 12:44:18 -05:00
raeeschachar
010fb68e6a Added Falky decorator to Chrome flaky tests 2016-03-03 19:55:26 +05:00
Jesse Zoldak
9ebfc49b93 Wait for the Advanced problem tab to be active. Remove the __test__ signifier. 2016-03-02 16:16:45 -05:00
Jesse Zoldak
2c8148c7bc Convert tests for adding advanced problem components from lettuce to bok-choy
TE-1201
2016-03-02 11:08:59 -05:00
Muddasser
aaa3d972c6 Merge pull request #11707 from edx/muddasser/bokchoy-test_accepting_redirects
Check both url and title for the presence of code
2016-03-01 19:56:37 +05:00
Ben Patterson
acae281f82 Merge pull request #11677 from edx/benp/tnl-4151-fix2
Ensuring page is loaded belongs in the page object.
2016-03-01 08:56:37 -05:00
clrux
650c95f9c3 Merge pull request #11501 from edx/clrux/ac-328-uxpl
AC-328 adding UXPL classnames to headings
2016-03-01 07:23:07 -05:00
Muddasser
724058a5ad Check both url and title for the presence of code 2016-03-01 16:03:25 +05:00
Chris Rodriguez
c619e1ec6b Adding UXPL classnames to headings 2016-02-29 15:43:17 -05:00
Kevin Falcone
b4ac588ce1 Update reset-test-db.sh for bok-choy
This now correctly migrates and dumps files for both databases.

Run lettuce migrations for both databases
2016-02-29 13:59:29 -05:00
Calen Pennington
dd90c55602 Create a new CSMHExtended table to hold our new data
This is a clone (copy) of CSMH's declaration and methods with an added
id of UnsignedBigInAutoField

We should be able to delete the save_history code, but needs testing.

Add error logging when capa failures happen

Put StudentModuleHistory into its own database

Bump out the primary key on CSMHE

This gives us a gap to backfill as needed.
Since the new table's pk is an unsigned bigint, even for people who don't
consolidate CSMH into CSMHE, the lost rows are unlikely to matter.

Remove StudentModuleHistory cleaner
2016-02-29 13:58:39 -05:00
Muddasser
bc2914eef4 Merge pull request #11655 from edx/muddasser-chrome-bokchoy-test_can_add_remove_allowance
Test should wait for ajax calls to finish before checking the changes
2016-02-29 18:46:08 +05:00
Ben Patterson
18e1aaa320 Ensuring page is loaded belongs in the page object.
TNL-4151 had previously been fixed to avoid a flaky condition; however,
that only passed the flaky condition to a later point in the
test. The proper fix is to ensure the page has loaded. Putting the
definition in this method will mean that the page will wait
to load with other functions, such as `DashboardPage.visit()`.
2016-02-27 12:37:20 -05:00
raeeschachar
b4cbc66d96 Fixed test_cancelling_redirects failing on Chrome 2016-02-26 21:12:32 +05:00
Muddasser
1e8163e283 Test should wait for ajax calls to finish before checking the changes 2016-02-25 12:43:08 +05:00
Michael Frey
860dd1bd5a Merge pull request #11651 from edx/release
Release
2016-02-24 16:15:16 -05:00
Adam Palay
c63dcf0dfe render mathjax in svg by default (TNL-4145)
mathjax preview should be inline by default
2016-02-24 12:51:30 -05:00
Adam Palay
2cb48742b2 mark discussion deletion test as flaky 2016-02-24 12:51:09 -05:00
Awais Jibran
d114be732f Merge pull request #11514 from attiyaIshaque/ai/tnl4067-auto-register-course
User automatically registered to course.
2016-02-24 11:24:58 +05:00
muzaffaryousaf
ee637c58ea Set notes page size to 25
TNL-4108
2016-02-24 11:03:17 +05:00
muhammad-ammar
ce57700d68 hide paging footer when only one page 2016-02-24 11:03:15 +05:00
muzaffaryousaf
71ec1b94f6 Fixing & adding Bokchoys for edx notes pagination.
TNL-3910
2016-02-24 11:03:15 +05:00
muhammad-ammar
13b14e0a60 Paginate edxnotes frontend
TNL-3908
2016-02-24 11:03:14 +05:00
Ben Patterson
1ba360d987 Merge pull request #11629 from edx/benp/TNL-4151-flaky-test
Flag test as flaky. See TNL-4151.
2016-02-23 10:05:33 -05:00
Christine Lytwynec
0f66d852c2 Merge pull request #11581 from edx/clytwynec/ac-327
Sequence navigation tooltip mechanism updated
2016-02-23 09:28:32 -05:00