Commit Graph

1601 Commits

Author SHA1 Message Date
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
Valera Rozuvan
8474336a3d Commenting out flaky acceptance tests. 2014-03-21 17:46:49 +02:00
Valera Rozuvan
bfee966cfe Commenting out a flaky acceptance test. 2014-03-21 16:51:44 +02:00
polesye
f3f1aa2943 Fix acceptance test. 2014-03-21 10:46:50 +02:00
Jay Zoldak
b695bceeeb Merge pull request #2997 from edx/zoldak/fix-pragma-pep8
Fix pylint disable pragmas that were pep8 violations
2014-03-20 13:56:00 -04:00
Jay Zoldak
c5a7911b87 Fix pylint disable pragmas that were pep8 violations 2014-03-20 10:18:40 -04: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
polesye
59ca4774fb Fix flaky acceptance test. 2014-03-19 11:11:17 +02: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
13ef23c308 Merge pull request #2786 from edx/alex/fix_download_html5_subs
Fix donwload subs for non youtube videos and non-en language.
2014-03-17 12:48:27 +02: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
Carlos Andrés Rocha
e5c042aa4f Improve dump_course_ids test for unicode course_ids 2014-03-14 10:21:31 -04:00
Carlos Andrés Rocha
67ab115169 Merge pull request #2920 from rocha/make-course-export-related-command-unicode-aware
Support unicode in course ids when dumping all courses
2014-03-13 10:30:08 -04:00
Carlos Andrés Rocha
9ecf2c00c0 Support unicode in course ids when dumping all courses
Fixes: AN-657
2014-03-12 18:02:05 -04:00
polesye
40c1090ca8 Upload files explicitly in tests. 2014-03-11 20:21:15 +02:00
polesye
ddf41ce9c5 BLD-915: Fix issues with different videoIDs. 2014-03-11 20:21:06 +02:00
polesye
2dad79db11 Upload files explicitly in tests. 2014-03-11 18:41:24 +02:00
polesye
43c16bd093 BLD-915: Fix issues with different videoIDs. 2014-03-11 17:38:29 +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
Sarina Canelake
2da9042cc6 Merge pull request #2863 from edx/sarina/violations
Fix some simple pep8 and pylint violations
2014-03-07 17:27:05 -05:00
jmclaus
3a740c0479 BLD-844: Add possibility to download transcripts in different formats. 2014-03-07 19:22:22 +01:00
Sarina Canelake
87495891b6 Fix some simple pep8 and pylint violations 2014-03-07 12:20:28 -05:00
polesye
fe8e6026a1 BLD-852: Fix video positioning in full view mode. 2014-03-07 15:17:39 +02: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
Calen Pennington
a2137cec35 Merge pull request #2603 from cpennington/xblock-acid-resources-test
Add tests of local_resource_url
2014-02-25 16:46:10 -05:00
Calen Pennington
9126777ed7 Add test of local_resource_url in AcidBlock 2014-02-25 14:01:37 -05:00
Gabe Mulley
fe21f47573 Add module display name to module related server events
This information will likely be used frequently for analytics purposes, so we would like to denormalize here to avoid having to join with the modulestore later.

Fixes: AN-594
2014-02-25 11:53:36 -05:00
Adam Palay
8d2db05635 add i18n scraping to tabs.py (LMS-2166)
add dummy strings
2014-02-24 15:46:03 -05:00
Alexander Kryklia
25407ef3e7 BLD-642: Allow multiple transcripts with video. 2014-02-24 21:57:08 +02:00
Don Mitchell
0b262e7cea Merge pull request #2660 from edx/dbarch/parse_course_id
Dbarch/parse course
2014-02-24 13:24:00 -05:00
Don Mitchell
81a92e4bfc Consolidate course_id triple parsing 2014-02-24 11:45:59 -05:00
Ned Batchelder
28e9ae0412 Tests of the localized start dates 2014-02-24 10:06:13 -05:00
Ned Batchelder
6bb0eee3c6 Make the i18n service available everywhere.
To get all dates localized, we need all runtimes to have the i18n
service, and since runtimes are made by the modulestores, we need to
pass it to them.

Soon (fingers crossed), modulestores won't be involved in making
runtimes, and many of these changes will go away.
2014-02-24 10:06:13 -05:00
Jay Zoldak
a620cc0004 Merge branch 'release'
Conflicts:
	lms/templates/courseware/accordion.html
2014-02-21 16:17:02 -05:00
Calen Pennington
dbc99ef8ad Implement children for pure XBlocks in edx-platform
This requires fixing the javascript api implementation, and adding
an implementation of get_block to the ModuleSystem api.

However, the implementation is incomplete, due to mismatches between
the expectations of XModule and XBlock.

Also adds tests using the Acid block to make sure that the javascript
and python apis for children are working correctly.
2014-02-21 15:01:20 -05:00