Commit Graph

7057 Commits

Author SHA1 Message Date
Ahsan Ulhaq
badbc3e3b7 Merge pull request #7499 from edx/ahsan/tnl-1784-every-keystroke-triggers-aria-live-region-announcements
DOM updates on every keystroke are triggering aria-live region announcements
2015-04-02 15:07:10 +05:00
Greg Price
c860f790c2 Merge pull request #7508 from edx/gprice/export-import-val
Include VAL data in video module export/import
2015-03-31 20:28:31 -04:00
Greg Price
cfcb304885 Include VAL data in video module export/import
This is required so that an a video module exported by one Open edX
deployment and imported by another will work correctly if it contains an
edx_video_id but does not populate other URL fields.

JIRA: MA-110
2015-03-31 19:35:06 -04:00
Calen Pennington
e394c18188 Merge pull request #7476 from cpennington/bulk-assert-all-assertions
Make BulkAssertionTest.bulk_assertions work with any assert* method
2015-03-31 15:19:44 -04:00
Calen Pennington
462cdfd9b4 Pass standard list of xblock mixins to MixedModulestore in tests 2015-03-31 13:31:30 -04:00
Sarina Canelake
11f75e04fc Merge pull request #7512 from johnespinosa/patch-1
Fixed i18n Problem with xBlock Menu
2015-03-31 12:04:52 -04:00
Calen Pennington
8f133f6696 Merge pull request #6035 from edx/jeskew/xmodule_to_xblock_vertical
Convert Vertical XModule to pure Vertical XBlock.
2015-03-31 11:10:22 -04:00
Calen Pennington
3d7bd9aa7b Make BulkAssertionTest.bulk_assertions work with any assert* method 2015-03-31 10:57:15 -04:00
Calen Pennington
a0bae0c794 Convert VerticalModule/VerticalDescriptor to a pure XBlock: VerticalBlock 2015-03-31 09:43:52 -04:00
Calen Pennington
85fce7e3b7 Move more common operations (which work in both XBlocks and XModules) into XModuleMixin 2015-03-31 09:43:51 -04:00
Calen Pennington
391db6a848 Linting cleanups 2015-03-31 09:43:51 -04:00
Calen Pennington
da2964421e Extract a pure-XBlock version of XmlDescriptor 2015-03-31 09:43:51 -04:00
Calen Pennington
62a90db1a7 Extract a pure-XBlock version of StudioEditingModule 2015-03-31 09:43:51 -04:00
Calen Pennington
ee401f15f4 Make mongo/draft.py pass the active descriptor system through item loading 2015-03-31 09:43:51 -04:00
Calen Pennington
bf62c4b70e Extract a pure-XBlock version of MakoModuleDescriptor 2015-03-31 09:43:51 -04:00
johnespinosa
53f4b418cb Fixed i18n Problem with xBlock Menu
Addressed bug in the following issue:
https://openedx.atlassian.net/browse/TNL-1296?filter=12810

There were strings that were not i18n in the xblock problem menu. The fix I made seems a little hacky. The yaml files controlled what the titles ended up being in menu. Since yaml has no i18n capabilities, and since mako does not allow for hashtables (unless they are introduced from the function/class that renders them) the commit I made was the best solution I could think of. If you know how to introduce i18n strings into yaml files or where this file is being rendered so I can pass in a hashtable that would be great! More discussion/information on this issue can be found in the issue thread linked above.

Observe bad behavior:
1. Load Studio.
2. Log in as staff@example.com.
3. Click "Content" and go to "Outline" in the dropdown.
4. In Example Week 1 click on "Homework."
5. Click on any question from the dropdown.
6. Click on "Problem."
7. Clicking on both "Common Problem Types" and "Advanced," notice how some options are not i18n.

~Please keep this webpage open after viewing the bad results~

View Correction:
1. Put my code into your edx-platform folder.
2. Kill the studio process.
3. While logged in as edxapp enter the following into your commandline:
paver i18n_extract && paver i18n_dummy && paver i18n_generate && paver devstack studio
4. Reload the studio page and notice how the strings are in the correct i18n format.

Fixed i18n Problem with xBlock Menu

Addressed bug in the following issue:
https://openedx.atlassian.net/browse/TNL-1296?filter=12810

There were strings that were not i18n in the xblock problem menu. The fix I made seems a little hacky. The yaml files controlled what the titles ended up being in menu. Since yaml has no i18n capabilities, and since mako does not allow for hashtables (unless they are introduced from the function/class that renders them) the commit I made was the best solution I could think of. If you know how to introduce i18n strings into yaml files or where this file is being rendered so I can pass in a hashtable that would be great! More discussion/information on this issue can be found in the issue thread linked above.

Observe bad behavior:
1. Load Studio.
2. Log in as staff@example.com.
3. Click "Content" and go to "Outline" in the dropdown.
4. In Example Week 1 click on "Homework."
5. Click on any question from the dropdown.
6. Click on "Problem."
7. Clicking on both "Common Problem Types" and "Advanced," notice how some options are not i18n.

~Please keep this webpage open after viewing the bad results~

View Correction:
1. Put my code into your edx-platform folder.
2. Kill the studio process.
3. While logged in as edxapp enter the following into your commandline:
paver i18n_extract && paver i18n_dummy && paver i18n_generate && paver devstack studio
4. Reload the studio page and notice how the strings are in the correct i18n format.

Update add-xblock-component-menu-problem.underscore

Reverted File

Modified capa_base.py to make Blank Advanced Problem i18n
2015-03-31 01:58:31 +02:00
Calen Pennington
b50876fc32 Make XBlockToXModuleShim use json-init-args to record the XModule constructor to shim to 2015-03-30 16:37:53 -04:00
Calen Pennington
1f17538d42 Clean up tests in preparation for switching Vertical from an XModule to an XBlock 2015-03-30 16:37:53 -04:00
Calen Pennington
9ec94cf3d2 Merge pull request #7504 from cpennington/xblock-duration-histogram
Record durations of xblock views and handlers
2015-03-30 14:28:00 -04:00
Calen Pennington
b6e1e25b93 Record durations of xblock views and handlers 2015-03-30 12:10:32 -04:00
Martyn James
2e380c7110 Merge pull request #7435 from edx/mjames/SOL-499
Update course_publish event actions - Logged SOL-611 for follow up work
2015-03-30 11:32:33 -04:00
Ahsan Ulhaq
0b3790a024 DOM updates on every keystroke are triggering aria-live region announcements
TNL-1784
2015-03-30 16:03:06 +05:00
Ned Batchelder
33361a05e4 Merge pull request #7490 from edx/ned/dont-put-test-data-in-working-tree
Don't use the working tree as storage for test-created files.
2015-03-27 11:30:04 -04:00
John Eskew
34adb256a6 Add datadog counters everywhere a "VS[compat]" comment exists.
Conflicts:
	common/lib/xmodule/xmodule/xml_module.py
2015-03-26 16:18:15 -04:00
Adam
c2dcbd70d1 Merge pull request #7492 from edx/release
Release
2015-03-26 12:56:41 -04:00
Ned Batchelder
84f6e11830 Don't use the working tree as storage for test-created files. 2015-03-26 09:38:09 -04:00
Adam Palay
43abe399f1 default discussion modules' discussion_id field to xblock's UNIQUE_FIELD (TNL-1771) 2015-03-26 08:49:21 -04:00
Matt Drayer
8107f803f5 Merge branch 'release' 2015-03-25 13:38:43 -04:00
Ned Batchelder
6401f453ca Change how conf/locale/eo is cleaned up, so that it always happens 2015-03-24 11:18:45 -04:00
Greg Price
0f0ee6a394 Merge pull request #7455 from edx/aleffert/video_web_only
Add web-only setting to video module
2015-03-23 15:38:18 -04:00
Martyn James
838060f30c Update course_publish event to:
* Only fire on bulk operation if something therein was published
* Wrap calls that use the following repeated pattern:
    if self.signal_handler and not bulk_record.active:
        self.signal_handler.send()
* Ensure consistent firing of signal between split and draft implementations
* Updated tests to use typical course nesting structures
* Added tests within bulk operations
2015-03-23 15:17:23 -04:00
Greg Price
438ce5f7a4 Add web-only setting to video module
This is needed for courses that license video content where the license
allows only for viewing on the web, not on mobile apps.

JIRA: MA-307
2015-03-23 14:45:17 -04:00
Ned Batchelder
a84735057d Move common/lib/*.py to openedx/core/lib
This makes these files importable, and puts them into the new best guess
as to where files should live.
2015-03-23 12:40:24 -04:00
Chris Dodge
b6a333f323 do the ORG filtering as part of the mongo query. Also, don't trigger metadata inheritence calculations when just trying to load 'about' information, which is not tied into the course tree anyhow (i.e. no parent/child relationship) 2015-03-23 12:28:20 -04:00
Usman Khalid
6fb48eb159 Merge pull request #6706 from edx/ammar/tnl-181
Allow Instructor To Rename Cohorts And Set Cohort Assignment Method.
2015-03-23 19:49:03 +05:00
Martyn James
775de9e818 Merge pull request #7150 from edx/dcikatic/courseware_search_tracking
SOL-217 Adding basic analytics events logging for courseware search - In discussing with @mulby, we agreed to allow this to go in , and we'll add a story to improve the tests at a later time.
2015-03-23 10:37:23 -04:00
muzaffaryousaf
e6c75529c0 Cohort discussion topics via UI in instructor dashboard.
TNL-1256
2015-03-23 14:28:22 +05:00
Usman Khalid
d59be9949e Use cohort settings from CourseCohortSettings.
TNL-1258
2015-03-23 09:43:00 +05:00
Braden MacDonald
7764f364cd Fix two content library analytics issues (SOL-521) 2015-03-20 20:47:03 -07:00
Ned Batchelder
f396c11579 Fix unidiomatic type checking 2015-03-20 15:48:54 -04:00
Adam
d012428c34 Merge pull request #7426 from edx/adam/merge-release-to-master
Adam/merge release to master
2015-03-20 10:42:22 -04:00
Ahsan Ulhaq
60cb7cf33a Merge pull request #7325 from edx/ahsan/tnl-1693-standarize-button-on-assessment-types
Standrize buttons in assessment problems
2015-03-20 18:50:27 +05:00
Martyn James
5d54036090 Fix pylint violation 2015-03-20 10:41:56 +01:00
Dino Cikatic
ee90c5fe36 SOL-217 Remove Google Analytics calls 2015-03-19 21:52:24 +00:00
Martyn James
dd34bada71 pylinty minty 2015-03-19 21:52:24 +00:00
Dino Cikatic
2117d168a4 SOL-217 Adding basic analytics events logging for courseware search and index 2015-03-19 21:52:23 +00:00
Adam Palay
b5c4b6388c Merge remote-tracking branch 'origin/release' into adam/merge-release-to-master
Conflicts:
	common/djangoapps/cors_csrf/helpers.py
	common/djangoapps/enrollment/views.py
	lms/djangoapps/commerce/constants.py
	lms/djangoapps/commerce/tests.py
	lms/djangoapps/commerce/views.py
2015-03-19 16:30:46 -04:00
Martyn James
7c942dddb5 Merge pull request #7219 from edx/mjames/SOL-289
Addresses problem with 'up' and 'down' errors within SOL-289
2015-03-19 09:51:36 -04:00
alawibaba
9b79797b28 Created performance logging endpoint, changed CDN experiment to point to it. 2015-03-19 07:53:01 -04:00
Ned Batchelder
6ac1b82bb2 Merge pull request #7356 from edx/ned/fix-or-remove-teardown
Fix or remove tearDown methods that don't use super.
2015-03-18 17:36:17 -04:00