Commit Graph

6513 Commits

Author SHA1 Message Date
Dmitry Viskov
209ddc700d Difficulty selectbox in Studio (based on new XBlockAside functionality). Include:
- adaptation asides to be imported from the XML
- updating SplitMongo to handle XBlockAsides (CRUD operations)
- updating Studio to handle XBlockAsides handler calls
- updating xblock/core.js to properly init XBlockAsides JavaScript
2016-03-02 03:37:13 +03:00
Renzo Lucioni
d481768571 Merge pull request #11691 from edx/jeskew/shared_modulestore_test_case_conversion
WIP: Lots of Python unittest speedups
2016-03-01 16:50:27 -05:00
John Eskew
80ac3fcca2 Remove the concept of having more than one course export format tagged. 2016-03-01 12:59:59 -05:00
clrux
650c95f9c3 Merge pull request #11501 from edx/clrux/ac-328-uxpl
AC-328 adding UXPL classnames to headings
2016-03-01 07:23:07 -05:00
John Eskew
b777530dac Add SharedModuleStoreTestCase.setUpClassAndTestData() context manager
for use when a test class has a setUpTestData() method which uses
variables set up in the setUpClass() method.
Change base teams API test class to use the context manager.
2016-02-29 18:02:57 -05:00
Chris Rodriguez
c619e1ec6b Adding UXPL classnames to headings 2016-02-29 15:43:17 -05:00
Kevin Falcone
6f9a3911e5 Implement a BaseStudentModuleHistory
This abstract class contains most of the fields (aside from the id and
foreign key to StudentModule that the subclasses need to manage).  It
also provides a get_history method that abstracts searching across
multiple backends.

Move router code to openedx/core
We need to use it from cms and lms.
Ensure aws_migrate can be used for migrating both the lms and cms.

Handle queries directed to student_module_history vs default and the
extra queries generated by Django 1.8 (SAVEPOINTS, etc).

Additionally, flag testing classes as multi_db so that Django will
flush the non-default database between unit tests.

Further decouple the foreignkey relation between csm and csmhe

When calling StudentModule().delete() Django will try to delete CSMHE
objects, but naively does so in the database, not by consulting the
database router.

Instead, we disable django cascading deletes and listen for post_delete
signals and clean up CSMHE by hand.

Add feature flags for CSMHE
One to turn it on/off so we can control the deploy.
The other will control whether or not we read from two database tables
or one when searching.

Update tests to explicitly use this get_history method rather than
looking directly into StudentModuleHistory or
StudentModuleHistoryExtended.

Inform lettuce to avoid the coursewarehistoryextended app

Otherwise it fails when it can't find features/ in that app.

Add Pg support, this is not tested automatically.
2016-02-29 13:59:27 -05:00
Calen Pennington
dd90c55602 Create a new CSMHExtended table to hold our new data
This is a clone (copy) of CSMH's declaration and methods with an added
id of UnsignedBigInAutoField

We should be able to delete the save_history code, but needs testing.

Add error logging when capa failures happen

Put StudentModuleHistory into its own database

Bump out the primary key on CSMHE

This gives us a gap to backfill as needed.
Since the new table's pk is an unsigned bigint, even for people who don't
consolidate CSMH into CSMHE, the lost rows are unlikely to matter.

Remove StudentModuleHistory cleaner
2016-02-29 13:58:39 -05:00
Carol Tong
049fbb18fd Merge pull request #11668 from edx/carol/DOC-2703
DOC-2703: replace instances of “courseware” in Advanced Settings help
2016-02-26 17:33:33 -05:00
David Ormsbee
9984bbc29a Make Capa problems do initial load without AJAX.
Before this commit, calling the student_view on a capa problem would
cause it to render an empty placeholder <div>, wait for the
DOMContentLoaded event to be fired, and then make AJAX requests to the
the problem_get handlers to retrieve the HTML it needed to render the
actual problems. This can significantly increase the end user load
times for pages, particularly when there are many problems in a
vertical.

This commit takes a very conservative approach and has the server side
add the rendered HTML into a new data-content attribute on the <div>
enclosing the problem. When Capa's JS initialization runs, it grabs
from that data-content attribute rather than reaching over the network
for an AJAX request.

I had attempted to make it somewhat smarter and push the rendered
problem straight into the document instead of relying on the
data-content attribute. This was faster, and should be our long term
goal. However, it caused odd bugs, particularly around MathJAX
rendering, and I never quite tracked the issue down. I'm still going
forward with these changes because it's significantly better than the
current situation that students have to deal with, and we can make the
JS more performant in a future iteration.

[PERF-261]
2016-02-26 16:15:07 -05:00
Carol Tong
cc0c577884 Replace instances of courseware in Advanced Settings help with "course" 2016-02-26 15:20:29 -05:00
Braden MacDonald
cfa7cd3d87 Revert "Pass DOM element, not jQuery object to XBlock initialisation." 2016-02-26 09:06:13 -08:00
Christine Lytwynec
0f66d852c2 Merge pull request #11581 from edx/clytwynec/ac-327
Sequence navigation tooltip mechanism updated
2016-02-23 09:28:32 -05:00
Bound3R
b0b977ba7f missing change the url path to the sass variable 2016-02-22 15:30:53 -05:00
Christine Lytwynec
3f6b7cb004 Sequence navigation tooltip mechanism updated 2016-02-22 14:13:36 -05:00
Alison Hodges
364463160f Merge pull request #11589 from edx/ahodges/DOC-2717
Fixes DOC-2717 for Jennifer
2016-02-22 13:14:30 -05:00
Alison Hodges
5e62e937d6 Fixes DOC-2717 for Jennifer 2016-02-22 12:26:11 -05:00
Nimisha Asthagiri
4bbe9a2021 Merge pull request #11326 from edx/mobile/remove-dead-code
Mobile API: remove unused endpoints
2016-02-19 15:14:13 -05:00
Adam
4dbcf9a1d3 Merge pull request #11587 from edx/release
Release
2016-02-18 17:19:29 -05:00
Adam Palay
e57487db83 update mathjax to 2.6 (TNL-4104) and (TNL-4094)
update mathjax class names to support common html, html-css, and svg
2016-02-18 14:13:34 -05:00
Nimisha Asthagiri
fa8ca11d8c Remove unused Mobile Social Facebook endpoint 2016-02-18 12:12:04 -05:00
Sven Marnach
8280e224f5 Merge pull request #11433 from open-craft/smarnach/studio-add-xblock
Pass DOM element, not jQuery object to XBlock initialisation.
2016-02-15 17:24:10 +01:00
sanfordstudent
d5cee7b376 Merge pull request #11471 from edx/sstudent/MA-1881-null-translation-check
ma-1881 handling empty translations and testing
2016-02-10 16:59:09 -05:00
Sanford Student
24c4c8abed ma-1881 handling empty translations and testing
using lists for json serializability, if that's a word
2016-02-10 15:56:42 -05:00
Sven Marnach
982c3e623b Pass DOM element, not jQuery object to XBlock initialisation.
The function initializeXBlock() expects a DOM element, and is passed one in most
cases.  However, when adding a new XBlock component in Studio, the function is
passed a jQuery object, which ends up being forwarded to the actual
initialisation function of the XBlock.
2016-02-10 18:54:30 +01:00
Ned Batchelder
9fd6bef39f Merge pull request #11496 from open-craft/capa-explanation-i18n
Make 'Explanation' CAPA header translatable.
2016-02-10 11:13:40 -05:00
Matjaz Gregoric
d067429c40 Make 'Explanation' CAPA header translatable.
CAPA <explanation> nodes get transformed into a HTML <div> block
that contains the word 'Explanation'.

This patch makes it translatable.
2016-02-10 10:49:38 +01:00
Andy Armstrong
84773d2ff7 Merge pull request #11482 from edx/release
Merge release back to master
2016-02-09 12:49:41 -05:00
Adam Palay
ae279569db address mathjax rendering bug (TNL-4080) 2016-02-08 10:32:22 -05:00
David Ormsbee
9ae0dada4c Merge pull request #11445 from edx/ormsbee/clear_cache_in_tests
Clear caches between tests for ModuleStoreTestCase/SharedModuleStoreTestCase
2016-02-08 10:23:54 -05:00
John Eskew
07c542d8cb Merge pull request #11420 from edx/jeskew/ensure_indexes_fix
Make ensure_indexes mgmt cmd semi-idempotent.
2016-02-08 09:55:05 -05:00
David Ormsbee
be25bb8aba Clear caches between tests for ModuleStoreTestCase/SharedModuleStoreTestCase
Cached values were leaking across tests, causing difficult to debug errors,
particularly when using Config Models. As part of this work, certain tests
that had query counts that relied on those values being cached needed to
be adjusted up.
2016-02-06 00:01:15 -05:00
John Eskew
77d2456542 Make MongoDB index creation idempotent by catching errors about existing
indexes with different options. Emit warning instead and continue.
2016-02-05 14:04:41 -05:00
Ned Batchelder
6f9fd5d357 Move JSON samples out of translated strings so translators can't make mistakes 2016-02-04 10:07:05 -05:00
Peter Fogg
77aa07544e Internationalize course info sidebar default. 2016-02-03 13:58:23 -05:00
Peter Fogg
71a00bf946 Revert "Move Course Handouts to Course Resources and Tools."
This reverts commit e8909e4439f22a7568d95a7672ab60d4a36f7322.
2016-02-03 13:58:23 -05:00
Bill DeRusha
e75f7950d4 Updates XBlock renders its own template. Adds expand and collapse JS + jasmine tests.
ECOM-2809
2016-02-03 13:58:23 -05:00
Peter Fogg
c22677c171 Move Course Handouts to Course Resources and Tools.
The existing course handouts section is moved underneath Course
Updates and News, with updated styling.

ECOM-2808
2016-02-03 13:58:22 -05:00
Ahsan Ulhaq
96d030b6d9 Reverse and Rename Courseware and Course Info Tabs
ECOM-2678
2016-02-03 12:20:53 -05:00
clrux
8a2d989369 Merge pull request #11247 from edx/clrux/ac-313-fixup
CMS: Removing H1 and H2 from editor options; updating editor icons
2016-02-03 09:28:44 -05:00
Chris Rodriguez
4ae40e7bdd Updating icons on problem type editor 2016-02-02 15:41:04 -05:00
Chris Rodriguez
81d86eea42 Changing H2 to H3 in problem templates 2016-02-02 15:41:02 -05:00
Toby Lawrence
78370f3644 Merge pull request #11400 from edx/PERF-258
Add the ability to exclude files from URL canonicalization.
2016-02-02 11:28:05 -05:00
Calen Pennington
dffbc69a3c Merge pull request #11329 from cpennington/fix-cert-type-names
Fix the help text for cert_name_short and cert_name_long
2016-02-02 11:19:09 -05:00
Calen Pennington
1d60c40bd2 Merge pull request #11215 from CredoReference/xblock_aside_example
XBlockAsides: little example of usage
2016-02-02 10:45:20 -05:00
Toby Lawrence
e57d1a2006 Add leading period so we don't get partial matches on extensions. 2016-02-02 10:07:13 -05:00
Toby Lawrence
1183f6cec9 Add the ability to exclude files from URL canonicalization.
To be able to more easily deal with same-origin issues, due to some course assets being loaded in an iframe, we're adding the ability to specify file extensions that should be excluded from URL canonicalization.  The default value is simply 'html', which means we won't rewrite asset links that point to files ending in .html.  Thus, they'll be loaded from the same origin as the parent page, and voila, no SOP issues.
2016-02-01 21:44:35 -05:00
Peter Desjardins
2a5b6c9aa3 Edited wording of UI labels for configuring subsection prerequisites (gating) 2016-02-01 17:32:48 -05:00
Calen Pennington
8acb93690f Fix the help text for cert_name_short and cert_name_long
This resolves the textual issue in [ECOM-2907] (https://openedx.atlassian.net/browse/ECOM-2907).
There will also be a data fix.
2016-02-01 17:02:14 -05:00
Douglas Hall
7c923355b2 Remove gating api import from course xmodule to avoid importing django related code into non-django related code 2016-01-29 18:42:04 -05:00