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

304 Commits

Author SHA1 Message Date
Sarina Canelake
e77dffcbcd Fix location.url [LMS-2786] 2014-05-29 18:01:29 -04:00
Usman Khalid
eceb8318f9 Merge pull request #3833 from edx/usman/lms2738-verify-student-urls 
Added trailing slashes to verify_student app urls.
 2014-05-29 16:22:00 +05:00
Muhammad Ammar
510d0ae153 Bok-Choy Tests for Video Start Time, End Time and Finish Time 2014-05-27 10:37:26 +00:00
Usman Khalid
1ecfac3f84 Added trailing slashes otherwise the course_id regex sometimes eats up get parameters. 
LMS-2738
 2014-05-26 15:50:23 +05:00
Sarina Canelake
110719deae StaffFactories accept course_keys, not courses. Make that clear in the interface. 2014-05-24 18:49:06 -04:00
Calen Pennington
240d91daeb Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master 
Conflicts:
	cms/djangoapps/contentstore/management/commands/tests/test_import.py
	cms/djangoapps/contentstore/tests/test_import.py
	common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py
	common/lib/xmodule/xmodule/modulestore/xml_importer.py
	lms/djangoapps/bulk_email/tests/test_course_optout.py
	lms/djangoapps/bulk_email/tests/test_email.py
	lms/djangoapps/bulk_email/tests/test_err_handling.py
	lms/djangoapps/class_dashboard/tests/test_dashboard_data.py
	lms/djangoapps/courseware/courses.py
	lms/djangoapps/django_comment_client/base/views.py
	lms/djangoapps/instructor/tests/test_email.py
	lms/djangoapps/instructor/tests/test_legacy_anon_csv.py
	lms/djangoapps/instructor/tests/test_legacy_download_csv.py
	lms/djangoapps/instructor/tests/test_legacy_email.py
	lms/djangoapps/instructor/tests/test_legacy_enrollment.py
	lms/djangoapps/instructor/tests/test_legacy_forum_admin.py
	lms/djangoapps/instructor/tests/test_legacy_gradebook.py
	lms/djangoapps/instructor/tests/test_legacy_raw_download_csv.py
	lms/djangoapps/instructor/tests/test_legacy_reset.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/instructor/views/instructor_dashboard.py
	lms/djangoapps/instructor/views/legacy.py
	lms/templates/courseware/instructor_dashboard.html
 2014-05-13 15:30:56 -04:00
Sarina Canelake
b7a0de7f3b Change URL patterns for instructor dashboard 
Fix acceptance and unit tests

LMS-1296
 2014-05-12 10:18:28 -04:00
Sarina Canelake
09442ef4ac Port spoc gradebook to new instructor dash 
LMS-1296
 2014-05-12 10:18:28 -04:00
Calen Pennington
155ffe37ca Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master 
Conflicts:
	cms/djangoapps/contentstore/views/item.py
	cms/djangoapps/contentstore/views/tests/test_container.py
	cms/djangoapps/contentstore/views/tests/test_tabs.py
	common/lib/xmodule/xmodule/modulestore/mongo/draft.py
	lms/djangoapps/certificates/management/commands/gen_cert_report.py
	lms/djangoapps/certificates/queue.py
	lms/djangoapps/certificates/views.py
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/tests/test_module_render.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/instructor/views/instructor_dashboard.py
	lms/djangoapps/instructor/views/legacy.py
	lms/djangoapps/shoppingcart/tests/test_models.py
	lms/djangoapps/verify_student/views.py
 2014-05-09 15:29:32 -04:00
Muhammad Ammar
aa0e8041af Bok-Choy Video Tests Batch6 2014-05-09 07:22:03 +00:00
Muhammad Ammar
af6c5efbb3 Bok-Choy video tests batch4 2014-05-08 10:53:08 +00:00
Muhammad Ammar
411a13b56c Convert lettuce video tests specifically using youtube stub 2014-05-07 06:11:07 +00:00
Calen Pennington
9811926d97 Make course ids and usage ids opaque to LMS and Studio [partial commit] 
This commit updates lms/djangoapps/courseware.

These keys are now objects with a limited interface, and the particular
internal representation is managed by the data storage layer (the
modulestore).

For the LMS, there should be no outward-facing changes to the system.
The keys are, for now, a change to internal representation only. For
Studio, the new serialized form of the keys is used in urls, to allow
for further migration in the future.

Co-Author: Andy Armstrong <andya@edx.org>
Co-Author: Christina Roberts <christina@edx.org>
Co-Author: David Baumgold <db@edx.org>
Co-Author: Diana Huang <dkh@edx.org>
Co-Author: Don Mitchell <dmitchell@edx.org>
Co-Author: Julia Hansbrough <julia@edx.org>
Co-Author: Nimisha Asthagiri <nasthagiri@edx.org>
Co-Author: Sarina Canelake <sarina@edx.org>

[LMS-2370]
 2014-05-06 10:08:32 -04:00
Waqas
a07da78a0f Add the "VERIFIED_CERTIFICATES" toggle on dashboard 2014-05-05 20:10:26 +05:00
Gabe Mulley
36269bd5a8 Integrate event-tracking in to the LMS 
Support incremental conversion of events from the old API to the new, in order to ensure the new system is working, enrollment events have been modified to make use of the new API.
 2014-05-01 14:04:35 -04:00
Jay Zoldak
5d371581f6 Disable unreliable test 2014-04-30 13:02:22 -04:00
Jason Bau
f8c062b6ce lti 2.0 result service rest endpoint 2014-04-29 12:01:12 -07:00
Muhammad Ammar
6f064e2b27 Configure youtube stub for bok-choy 2014-04-25 20:01:09 +00:00
Jay Zoldak
490d2fef8f Disable flaky video test 2014-04-25 09:12:02 -04:00
Christine Lytwynec
ea3c48cf02 Removed trailing periods in two scenario names 2014-04-24 12:00:51 -04:00
Muhammad Ammar
1bbfbedb1f Bok-Choy video tests batch2 2014-04-23 14:37:26 -04:00
Valera Rozuvan
450dfe17b0 TESTS: Add tests for fix of end-time in the video player. 
BLD-662
 2014-04-23 18:44:10 +03:00
Jay Zoldak
3fc19a35b0 Serve video HTML5 sources locally for acceptance tests 2014-04-15 10:40:53 -04:00
jmclaus
f05c0aa8f9 HD control is hidden initially. On first play of video, when 
player.getAvailableQualityLevels returns a non-empty array, it will eventually display, if HD qualities are available (highres, hd1080, hd720). [BLD-937]
 2014-04-14 10:26:30 -04:00
Valera Rozuvan
615ce23930 Update acceptance tests to use real duration of YouTube video. 2014-04-14 10:37:56 +03:00
Anton Stupak
24b631f702 Merge pull request #3231 from edx/anton/refactor-speed-control 
Video: Refactor speed control.
 2014-04-11 19:38:04 +03:00
Muhammad Ammar
5b6f3f8fbf Convert first batch of lettuce video tests to bok-choy. 2014-04-10 15:18:03 +00:00
Jay Zoldak
ca2977ab5f Fix video feature name so the test results roll up correctly 2014-04-09 10:17:56 -04:00
polesye
f454e10e71 Add fixes. 2014-04-09 12:16:22 +03:00
polesye
f0492b3bb1 Refactor speed control. 2014-04-09 12:16:22 +03:00
polesye
6c72cce59e Disable flaky acceptance tests. 2014-04-08 17:23:35 +03:00
polesye
a9b26afd7b Disable flaky test. 2014-04-08 15:40:32 +03:00
Valera Rozuvan
668c476acb Add auto screenshot functionality. 2014-04-08 10:41:39 +03:00
polesye
6a207714a3 BLD-970: Fix flaky test. 2014-04-07 17:03:40 +03:00
polesye
d55554705f BLD-958: Force video player in flash mode. 2014-04-04 14:53:14 +03:00
Alexander Kryklia
70db47a73d Merge pull request #3201 from edx/alex/fix_971 
Fix flaky video test #21: increase timeout.
 2014-04-03 16:13:09 +03:00
Alexander Kryklia
cf3e2c860b Fix flaky video tests: speed up youtube api loading and wait for controls. 2014-04-03 14:37:17 +03:00
Alexander Kryklia
221f4e2363 Fix flaky video test #21: increase timeout. 2014-04-03 14:34:12 +03:00
Alexander Kryklia
c3f9943802 Fix lms video #20: scroll view to be clickable. 2014-04-03 13:17:32 +03:00
Alexander Kryklia
2a39d28348 Fix flaky test #12 
"CC button works correctly w/o english transcript in HTML5 mode of Video component"
 2014-04-03 12:45:38 +03:00
polesye
92cd46277d BLD-950: Update captions logic on front-end. 2014-04-01 12:25:45 +03:00
Alexander Kryklia
dfa7c27e77 Add multiple transcripts editor. 
Fix donwload subs for non youtube videos and non-en language - continue.
Add acceptance tests.
Add detetion of assets on request.
Updated docstring.
Add fixes and acceptance tests.
Fix acceptance tests.
Update docsrtings and cleanup code, resful for language_id.
Specify exception type in POST.
Fix url in upload module.
Improve exception handling.
Remove 'en' and catching in editable_metadata.
Move descriptor.get_context test to lms tests.
Add query parameter to translation dispatch.
Response to format parameter of translatin GET request.
Fix Acceprance test: Metadata Editor.
move handlers to proper scores.
Split video player into smaller files.
Add ugettext and fix typoes.
Add changelog.
Support for downloading non-ascii filenames.
Change event binding.
Add content-language to download requests.
Reractor POST handler to not update self.transcripts.
 2014-03-31 18:49:56 +03:00
Valera Rozuvan
34ac619086 Addressing comments. 2014-03-31 14:47:11 +03:00
Valera Rozuvan
4610bd1b18 Add acceptance test for blocked YouTueb API with HTML5 sources 
When the video has both YouTube IDs and HTML5 sources, and
the YouTube API is blocked, then HTML5 sources should be
used.
 2014-03-31 14:47:11 +03:00
Carlos Andrés Rocha
7d618f26ca Merge branch 'release' 
Conflicts:
	lms/djangoapps/courseware/features/video.feature
 2014-03-29 20:37:49 -04:00
Valera Rozuvan
a4f6a67f0f Adding acceptance test for multiple videos. 
Part of BLD-972.
 2014-03-30 00:14:32 +02:00
Jay Zoldak
748fc120cd Disable failing video test 2014-03-28 16:20:04 -04:00
Jay Zoldak
1532badfe5 Skip video test that is failing in master 2014-03-28 15:01:29 -04:00
polesye
a1c957ecd3 BLD-951: Fix flaky tests. 2014-03-26 11:45:17 +02:00
polesye
bd4be00ae4 BLD-534: Add acceptance test. 2014-03-24 08:47:12 +02:00