Commit Graph

29414 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
David Ormsbee
2fea7b4ce5 Merge pull request #7510 from edx/ormsbee/remove_timer_expiration_duration
Remove timer_expiration_duration (leftover from Pearson proctored exams)
2015-03-31 10:45:03 -04:00
Sarina Canelake
092c86e097 Merge pull request #7520 from louyihua/fix-studio-name
Fix two missing replacements of {studio_name}
2015-03-31 10:40:58 -04:00
Calen Pennington
a0bae0c794 Convert VerticalModule/VerticalDescriptor to a pure XBlock: VerticalBlock 2015-03-31 09:43:52 -04:00
Calen Pennington
8341f1b7c8 Move type-checking of position earlier in courseware.views.index 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
louyihua
2c75b5d725 Fix two missing replacements of {studio_name}
Located in ```howitworks.html``` and ```import.html```.
2015-03-31 13:04:54 +08: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
frances botsford
10d58d3644 Merge pull request #7507 from edx/frances/base-gray-a11y
Make LMS base gray AA compliant
2015-03-30 17:20:17 -04: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
Sarina Canelake
13b43a96ff Merge pull request #7513 from johnespinosa/patch-2
Add John Espinosa to AUTHORS
2015-03-30 10:25:56 -04:00
Sarina Canelake
f6a70d4924 Merge pull request #7511 from louyihua/fix-studio-name
Fix error when STUDIO_NAME uses non-ascii characters
2015-03-30 10:25:31 -04:00
Christine Lytwynec
41d7d52bc6 Merge pull request #7515 from edx/clytwynec/lms-onload-beacon
Fix code comment showing in rendered page
2015-03-30 10:03:22 -04:00
Sarina Canelake
f0fa88bea0 Merge pull request #7514 from edx/sarina/20150330-update-translations
Update translations (autogenerated message)
2015-03-30 09:10:10 -04:00
Sarina Canelake
5a04a38106 Update translations (autogenerated message) 2015-03-30 09:09:31 -04:00
Christine Lytwynec
b33edbc060 Fix code comment showing in rendered page 2015-03-30 09:05:28 -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
johnespinosa
f5b7dd3dd1 Add John Espinosa to AUTHORS
Added Myself To The Authors List
2015-03-30 05:35:03 +02:00
louyihua
9d3b65282e Fix error when STUDIO_NAME uses non-ascii characters
The replacement strings need to be unicode, so that when STUDIO_NAME contains non-ascii characters python can handle it correctly without raising exceptions.
Also, the value of STUDIO_SHORT_NAME can be read from cms.env.json.
2015-03-28 21:47:59 +08:00
David Ormsbee
91b5521d3a Remove timer_expiration_duration (leftover from Pearson proctored exams). 2015-03-27 20:54:36 -04:00
Adam
dad4b673e2 Merge pull request #7505 from edx/release
Release
2015-03-27 16:46:33 -04:00
chrisndodge
f441671ca0 Merge pull request #7428 from stvstnfrd/env/course/display
Override COURSE_*_VISIBILITY_PERMISSION from ENV_TOKENS
2015-03-27 16:41:42 -04:00
Christine Lytwynec
4d6c47c456 Merge pull request #7503 from edx/clytwynec/lms-onload-beacon
onload performance beacon for LMS pages
2015-03-27 16:28:30 -04:00
Frances Botsford
72e9b82480 make base gray AA compliant 2015-03-27 16:20:04 -04: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
Adam
0c31da2a15 Merge pull request #7501 from edx/hotfix/2015-03-27
update ORA2 to fix TNL-1758
2015-03-27 14:33:35 -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
Christine Lytwynec
06b3110ea0 onload performance beacon for LMS pages 2015-03-27 11:08:25 -04:00
Clinton Blackburn
9a8ecc65a7 Removed invalid kwarg 2015-03-27 10:37:04 -04:00
Adam Palay
cb9c89e168 update ORA2 to fix TNL-1758 2015-03-27 10:35:46 -04:00
marjev
29bceffcea Fixed flaky test(s) - (SOL-336) 2015-03-27 14:48:36 +01:00
John Eskew
c5e198f754 Merge pull request #7469 from edx/jeskew/datadog_events_vs_compat
Squashed and tests passed - merging.
2015-03-26 17:19:00 -04: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
Christopher Lee
4423510807 Merge pull request #7480 from edx/clee/MA-169_MA-77
Clee/ma 169 ma 77
2015-03-26 13:31:49 -04:00