Commit Graph

10770 Commits

Author SHA1 Message Date
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
Matt Drayer
d9611dcd9f Merge pull request #7382 from edx/mattdrayer/SOL-461
mattdrayer/SOL-461: Student dashboard clean-up
2015-03-31 10:53:45 -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
Marco Morales
bd5b0b31a0 Matt - javascript and test changes, Marco - styling feedback from initial reviews 2015-03-31 08:47:17 -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
Waqas Khalid
01bdfb125e Merge pull request #7403 from edx/waqas/tnl1717-discussion-404
View discussion of user profile return 404
2015-03-30 14:36:25 +05:00
Martyn James
70819203f8 Merge pull request #7443 from edx/mjevtic/SOL-336
Fixed flaky test(s) - SOL-336 - merging updates
2015-03-27 14:58:25 -04:00
Sarina Canelake
68ba17867f Merge pull request #7496 from open-craft/studio-display-name-consistency
Consistently use display_name_with_default in Studio
2015-03-27 14:57:22 -04: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
marjev
29bceffcea Fixed flaky test(s) - (SOL-336) 2015-03-27 14:48:36 +01:00
Braden MacDonald
19bd7005e6 Consistently use display_name_with_default in Studio 2015-03-26 13:24:11 -07: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
Ben Patterson
5615f0bfed Merge pull request #7494 from edx/benp/flag-cohort-test-flaky
Fix empty promise. It was always evaluating to true.
2015-03-26 13:55:04 -04:00
Adam
c2dcbd70d1 Merge pull request #7492 from edx/release
Release
2015-03-26 12:56:41 -04:00
Matt Drayer
58618d8cee Updated dashboard HTML, dropdown menu interactions, and tests 2015-03-26 12:50:26 -04:00
Ben Patterson
dae5cdfceb Fix empty promise. It was always evaluating to true.
This addresses TNL-1808 (and likely other flaky tests
in this area).
2015-03-26 12:27:30 -04:00
Ben Patterson
b03c4eca63 Opening wiki editor should be extracted into a method. 2015-03-26 11:05:55 -04:00
Ben Patterson
6e2e40cc14 Add course wiki acceptance tests. 2015-03-26 11:05:55 -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
Marco Morales
dfcb3f2b6e Dashboard styling cleanup/changes, including:
- reversing the positions of the sidebar and course listing
- html for new social icons (not currently wired up)
- new actions dropdown for unenrollment and email settings
- partial reorganization of dashboard.scss styles
- text fix for unenrollment
- added missing endif, p/hgroup closures
- reverted la.course-item
- removed extra operator
- fixed broken bok choy test
2015-03-25 10:51:45 -04:00
Mark Sadecki
e1251bfecd Merge pull request #7416 from edx/cptvitamin/UX-1838-dashboard-heading-structure-n-context
adds additional context for SR users and corrects heading order
2015-03-24 13:51:33 -04:00
Christine Lytwynec
7f137487cc Merge pull request #7463 from edx/clytwynec/flaky-mathjax
wait for both window.MathJax and window.MathJax.onReady
2015-03-24 13:50:57 -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
Christine Lytwynec
5204fd6519 wait for both window.MathJax and window.MathJax.onReady 2015-03-24 11:03:09 -04:00
Eugeny Kolpakov
dadc78aabd Merge pull request #7336 from open-craft/eugeny/course-team-to-backbone
Unified Course Team and Library Users page. Converted both to Backbone.
2015-03-24 17:06:38 +03:00
E. Kolpakov
9a56b800ee Unified Course Team and Library Users page. Converted both to Backbone.
Converted lettuce Course Team page tests to bok choy
2015-03-24 12:09:19 +03: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
Will Daly
072dbcd50f Merge pull request #7412 from edx/will/ecom-1233
A11y fixes for EdX header.
2015-03-23 11:34:54 -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
Will Daly
cb21a0819c A11y fixes for EdX header.
Update <nav> elements to correctly group links
for screen readers.

Fix RTL display issue with responsive header
on the login/registration page.
2015-03-23 08:47:35 -04:00