Commit Graph

480 Commits

Author SHA1 Message Date
Carson Gee
de637f329e Merge pull request #3725 from carsongee/cg/transcript_xmlmodulestore_fix
Fix bug affecting video transcripts in XMLModulesStore courses
2014-05-15 08:50:36 -04:00
Carson Gee
52d8317ab5 Fix bug affecting video transcripts in XMLModulesStore courses 2014-05-14 15:19:15 -04:00
Adam Palay
2b95b0ba36 add failing tests for non-ascii characters in grade cutoffs on progress page (LMS-2687) 2014-05-13 15:32:23 -04:00
Carson Gee
eadf3b59e2 Merge pull request #3464 from mitocw/cg/course_image_fixes
Additional logic to handle more course_image URL edge cases
2014-05-13 09:19:07 -04:00
Carson Gee
ff1564382d Corrected test names and doc strings 2014-05-12 13:41:23 -04:00
Carson Gee
c0644dc984 Only do static transcript redirect for english language, and don't offer static redirect for download
Rename video test to real YouTube-ID
2014-05-07 15:11:41 -04:00
Carson Gee
ab6c82342e Add last resort method to download and showing of video transcript 2014-05-07 15:11:41 -04:00
cahrens
7e05f3cdab pep8/pylint cleanup 2014-05-02 15:36:22 -04:00
cahrens
1e92a6c884 Do not show "View in Studio" links for child verticals of verticals.
STUD-1558
2014-05-02 13:36:44 -04:00
Jason Bau
f8c062b6ce lti 2.0 result service rest endpoint 2014-04-29 12:01:12 -07:00
Carson Gee
c4ea338035 Additional logic to handle more course_image URL edge cases
This changes logic to allow more missed use cases of course_image to
work properly.  The cases are:

. XML courses with the course_image attribute set
. Mongo courses that are imported without a contentstore
. Mongo courses that have course_image set but don't have a content store

It also exports default images_static_course.jpg to
images/static_course.jpg to handle a use case where a course author
uploaded an image to the default location in studio without using the
studio interface for adding course images, they then export the course, and then
import it without a contentstore
2014-04-24 16:54:40 -04:00
polesye
127bf7ed3f BLD-1000: Download handout. 2014-04-22 21:44:36 +03:00
Oleg Marshev
015bd57d02 Remove double quoting. 2014-04-08 15:21:31 +03:00
Oleg Marshev
8a2024241e Add context_id. 2014-04-08 14:09:52 +03:00
Oleg Marshev
882a1e0f29 Change resource_link_id on import (BLD-768).
LTI: Update resource_link_id to change on import to another system or context (BLD-768).
2014-04-08 13:03:22 +03:00
chrisndodge
c407e89889 Merge pull request #2781 from edx/cdodge/password-history-enforcements
Add some optional policies around password resets, such as password reus...
2014-04-04 16:14:43 -04:00
Giulio Gratta
3456c1173b Added "Edit in CMS" links throughout courseware 2014-04-04 10:23:51 -07:00
Alexander Kryklia
90437fa5e0 Display transcript translations for student in their source language. 2014-04-02 10:47:37 +03:00
Alexander Kryklia
64e286763d Revert "Transcript translations should be displayed in their source language."
This reverts commit b4ba04bae9.
2014-03-31 19:42:52 +03:00
Alexander Kryklia
2ec08921e5 Revert "Fix tests."
This reverts commit 1ed167d90a.
2014-03-31 19:42:44 +03:00
Alexander Kryklia
1ed167d90a Fix tests. 2014-03-31 19:41:08 +03:00
Alexander Kryklia
b4ba04bae9 Transcript translations should be displayed in their source language. 2014-03-31 19:40:56 +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
Chris Dodge
d5bb1b5cca Add some optional policies around password resets, such as password reuse, forced password resets, allowed frequency of password resets 2014-03-31 10:30:58 -04:00
Nimisha Asthagiri
d865e9096e Add the ability to reorder Pages and hide the Wiki page. 2014-03-28 05:39:03 -04:00
Will Daly
ba00a442d7 Merge pull request #3037 from edx/will/tim-installation-rebase
Install new ORA (edx-tim)
2014-03-25 10:59:05 -04:00
Will Daly
440d9ddb89 Install edx-ora2
Support for displaying submissions API scores in Progress page.
2014-03-25 09:42:55 -04:00
Valera Rozuvan
1c8eed853e Moved all YouTube related URLs to a separate namespace.
All YouTube urls are defined on backend side.
2014-03-24 18:40:28 +02:00
Nimisha Asthagiri
e86b4a12dc Changes for viewing built-in tabs in studio
Changed "Status Page" -> "Page".

UX:
    support for displaying built-in tabs
    restored drag and drop on Studio Pages
    additional styling for fixed state on Studio Pages
    add a new page action added to bottom of Studio Pages

Dev
    changes for viewing tabs in studio,
    refactored the tab code,
    decoupled the code from django layer.
    is_hideable flag on tabs
    get_discussion method is needed to continue to support
external_discussion links for now since used by 6.00x course.
    override the __eq__ operator to support comparing with
dict-type tabs.

Test
    moved test code to common,
    added acceptance test for built-in pages
    added additional unit tests for tabs.
    changed test_split_modulestore test to support serializing objects
that are fields in a Course.

Env:
    updated environment configuration settings so they are
    consistent for both cms and lms.
2014-03-21 13:58:01 -04:00
Usman Khalid
c086cbc38d Merge pull request #2816 from edx/usman/lms1192-module-render-exceptions
Catch module render exceptions
2014-03-21 21:12:30 +05:00
Dave St.Germain
0773f0687d Answer checks should offer feedback to assistive tech. This commit adds
a page level javascript SR object to enable reading of alert messages.
LMS-2158
2014-03-20 09:53:44 -04:00
Usman Khalid
ae73f3eaa0 Puts module.render() in try statements.
LMS-1192
2014-03-19 19:30:22 +05:00
Adam Palay
d6522cd123 refactor static tab tests 2014-03-18 10:43:57 -04:00
Calen Pennington
a5498bcbd7 Make progress page work with pure xblocks
[LMS-2349]
2014-03-17 10:45:14 -04:00
Calen Pennington
290fd03566 Add tests that verify progress page with pure XBlocks
This is known to be broken.

[LMS-2349]
2014-03-17 10:44:37 -04:00
Alexander Kryklia
dd20e84c84 Fix donwload subs for non youtube videos and non-en language.
Check for status in test.
Add test for track url.
Fix test to use cookie.
Use download_track in feature file.
Add new tests for get_transcript.
Add html5 test.
Add content check.
Add tests for available_translations dispatch.
Disable flaky cms test.
Add  w/o english transcript tests.
Add to changelog.
2014-03-14 18:30:42 +02:00
Sarina Canelake
119ffd4677 Bugfix for split test on sequential save
Bug would occur when comparing Groups or UserPartitions - because these types
lacked comparator methods, different objects would come up as different when
their values were equal.
2014-03-11 10:51:39 -04:00
jmclaus
3a740c0479 BLD-844: Add possibility to download transcripts in different formats. 2014-03-07 19:22:22 +01:00
polesye
65adb7b272 BLD-896: Fix cc button in HTML5 videos. 2014-03-07 11:24:30 +02:00
Sarina Canelake
29be1288ba Clean up quality violations in split_test module 2014-03-06 18:42:59 -05:00
Han Su Kim
bdfd81d2f3 Merge remote-tracking branch 'origin/master' into release, conflicts resolved
Conflicts:
	cms/envs/common.py
	common/lib/xmodule/xmodule/seq_module.py
	lms/envs/common.py
	requirements/edx/edx-private.txt
2014-03-06 16:56:16 -05:00
Diana Huang
bce7d9e43d Add tests and clean up A/B testing
Also fixes STUD-1351
2014-03-05 13:46:03 -05:00
Alexander Kryklia
6772faa0a5 Merge pull request #2796 from edx/alex/no_default_subs_en
Catch exception if for en no default subs is uploaded.
2014-03-05 16:49:54 +02:00
Alexander Kryklia
ccb776e928 Catch exception if for en no default subs is uploaded. 2014-03-04 15:41:46 +02:00
Jason Bau
35a3ebd92f Merge pull request #2761 from edx/jbau/add-userid-to-FieldDataCache
Move FieldDataCache assert to check both get and get_or_create
2014-03-03 12:08:09 -08:00
Chris Dodge
aa43689a93 This PR addresses the open feedback on the Microsites feature 2014-02-28 16:27:12 -05:00
Jason Bau
a160428b9b Move FieldDataCache assert to check both get and get_or_create 2014-02-27 20:06:16 -08:00
Adam Palay
89795191cb Merge remote-tracking branch 'origin/release'
Conflicts:
	cms/envs/common.py
	lms/envs/common.py
2014-02-27 17:33:40 -05:00
Calen Pennington
9d850eec2d Fix case where both old and new transcripts are uploaded, but transcript language isn't one of the new transcripts. 2014-02-27 15:42:19 -05:00
Waheed Ahmed
874d7360c1 Added validation for username and email max length.
LMS-1479
2014-02-26 16:25:37 +05:00