Commit Graph

10789 Commits

Author SHA1 Message Date
Jesse Zoldak
ab63243d01 Decorate flaky test SOL-618 2015-04-02 14:26:46 -04:00
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
Will Daly
bedba6a600 Merge pull request #7529 from edx/will/cors-iframe-proxy
Add proxy to allow IE9 to make xdomain requests
2015-04-01 14:18:42 -04:00
Christine Lytwynec
0370e90611 skip acid block tests 2015-04-01 12:23:31 -04:00
zubair-arbi
1f9ead5d46 Merge pull request #7547 from edx/zub/bugfix/ecom-1273-enrollment-api-catch-NoneType-courses
log and ignore invlaid/deleted courses in Enrollment API
2015-04-01 19:23:40 +05:00
Will Daly
fcc5b1e347 Add proxy to allow IE9 to make xdomain requests
Adds an /xdomain_proxy.html endpoint that serves
the proxy file from the xdomain library.  This
allows IE9 users to iframe in the proxy page
to simulate a cross-domain request with cookies.
2015-04-01 09:16:42 -04:00
zubair-arbi
ec2f4dc2fe Merge pull request #7523 from edx/zub/bugfix/ecom-579-change-education-level-option-label
change education level option label to read "Associate" degree
2015-04-01 17:17:58 +05:00
zubair-arbi
a9b13f0e72 log and ignore invlaid/deleted courses in Enrollment API
ECOM-1273
2015-04-01 16:26:24 +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
Jesse Zoldak
8bfc948b37 Merge pull request #7533 from cpennington/add-mixins-to-mixed-modulestore-tests
Pass standard list of xblock mixins to MixedModulestore in tests
2015-03-31 14:29:35 -04:00
Matt Drayer
cbf336e8e0 Merge pull request #7293 from edx/ziafazal/access-gating-for-entrance-exam
Entrance exam gating
2015-03-31 13:38:00 -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
4a4478fd8b Merge pull request #7526 from delftswa2014/readmes
added READMEs for top level directories
2015-03-31 13:16:29 -04:00
Zia Fazal
cc04bb990e Add new gating logic to restrict users from accessing courseware when an entrance exam is required
- added entrance exam check on course info
- staff can by pass gating and added tests
- refined gating logic
- changes after rebasing with Asad's branch
- check ENTRANCE_EXAMS feature is enabled
- updated test to reflect new logic
- catering anonymous user in entrance exam permission
- fixed broken tests
- change after feedback on 16/3
- fix for a broken test
- created new entrance_exams module
- fixed quality error and improved test coverage
- put get_required_content back in milestones helper
- Refactored entrance exams logic
- Refactored tabs logic
- Fixed broken unit test
- changes after feedback from dan-f on 3/27
- removed unnecessary user.is_anonymous check
- Addressed PR feedback
- Addressed commit-specific feedback
- Rework guard clauses
- Add coverage for course info case
2015-03-31 12:12:04 -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
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
Mayank Jain
cf7777a474 added READMEs for top level directories 2015-03-31 16:47:37 +02: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
zubair-arbi
d0126959fc change education level option label to read "Associate" degree
ECOM-579
2015-03-31 13:31:16 +05: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
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