Commit Graph

7596 Commits

Author SHA1 Message Date
Calen Pennington
d58358a484 Merge pull request #2555 from cpennington/xblock-acid-acceptance-tests
Add acceptance tests of the Acid block in both LMS and Studio
2014-02-13 14:23:31 -05:00
Usman Khalid
21d8b40576 Added feature setting 'DISPLAY_HISTOGRAMS_TO_STAFF' to configure display of histograms in Staff Debug Info panel.
Generating histograms requires scanning the courseware_studentmodule table on
each view. This can make staff access to courseware very slow on large courses.

Default is False.

LMS-1199
2014-02-13 17:15:20 +05:00
Usman Khalid
f6d7cb5065 Renamed feature setting 'DISPLAY_HISTOGRAMS_TO_STAFF' to 'DISPLAY_DEBUG_INFO_TO_STAFF' to better communicate its purpose.
Default is True.

LMS-1199
2014-02-13 17:15:19 +05:00
Julia Hansbrough
d6c0ce161e Merge branch 'release' 2014-02-12 21:24:19 +00:00
Greg Price
1c188c9f89 Send language preference to the comments service 2014-02-12 15:25:34 -05:00
Greg Price
5841d460f0 Clean up usage of CS API key 2014-02-12 15:24:30 -05:00
Calen Pennington
17fda08c8d Enable XBlocks in bok_choy tests 2014-02-12 13:41:14 -05:00
Sarina Canelake
75a7d69050 Add Catalan (Valencia) 2014-02-12 10:18:34 -05:00
Anton Stupak
9b0c8d266e Merge pull request #2557 from edx/anton/revert-download-transcript-rc
Video: Revert Download transcript button behavior.
2014-02-12 12:41:43 +02:00
polesye
f957b34427 BLD-811: Revert functionality. 2014-02-12 12:05:02 +02:00
chrisndodge
25b127ef45 Merge pull request #2482 from edx-solutions/splash-screen
splash-screen: Add ability to redirect to a splash screen URL
2014-02-11 23:40:33 -05:00
Sarina Canelake
ba0fbf0762 i18n points possible display LMS-2201 2014-02-11 18:25:00 -05:00
Xavier Antoviaque
e6f4f4f4f8 splash-screen: Add ability to redirect to a splash screen URL
Checks for the presence of a cookie with specific values when activated,
and redirect the user to a configurable URL when it is not found, or not
with an accepted value.

To be used to display a splash screen to users upon the first visit.
It's the responsability of the splash page at the redirected URL to set
the proper cookie value before sending users back to the LMS.
2014-02-11 14:26:19 -05:00
polesye
cebc0c47fd BLD-824: Download Video link missing from video player. 2014-02-11 20:17:22 +02:00
Jay Zoldak
d0a1701b2a Merge pull request #2549 from edx/zoldak/things-not-to-translate
Do not translate checkbox values in html files
2014-02-11 09:51:57 -05:00
polesye
102d1cb253 Persist student progress in video.
Student logins to edx, plays video, selects position, closes
browser, opens video, position is restored.

BLD-385
2014-02-11 13:53:24 +00:00
Oleg Marshev
79ffcb7e94 Refactor stub implementation of LTI Provider. BLD-601. 2014-02-11 12:50:22 +02:00
Ned Batchelder
ce5fd88baa Merge pull request #2488 from edx/ned/i18n-for-wiki
Finish wiki i18n
2014-02-10 17:05:44 -05:00
Diana Huang
8a95474537 Merge pull request #2544 from edx/diana/drupal-registration-i18n
Don't internationalize strings we use for enrollment.
2014-02-10 16:16:47 -05:00
jmclaus
72ea40d7b6 Merge pull request #2381 from edx/jmclaus/feature_video_speed_control_improved_a11y
Keyboard events and ARIA markup added to speed control
2014-02-10 22:07:27 +01:00
Don Mitchell
16f0d12a1f Merge pull request #2356 from edx/dhm/mixed_ms_wrapper
MixedModulestore wraps most getters, update_item, delete_item
2014-02-10 16:01:50 -05:00
Jay Zoldak
7e9abd2e84 Do not translate checkbox values 2014-02-10 15:50:09 -05:00
Diana Huang
4a16846426 Don't internationalize strings we use for enrollment.
LMS-2218
2014-02-10 15:29:09 -05:00
jmclaus
31ffce4b05 Keyboard events and ARIA markup added to speed control. Replaced anonymous event handlers by named functions. Menu stays open on mouseleave when a speed entry has focus. In that case, the menu can be closed by clicking anywhere outside of it. [BLD-402, BLD-363] 2014-02-10 21:24:50 +01:00
Ned Batchelder
6990b5ba41 Tests should explicitly ask for English. 2014-02-10 15:23:13 -05:00
Ned Batchelder
aff3c47754 i18n fixes for wiki templates. 2014-02-10 15:23:13 -05:00
Ned Batchelder
6635233b3c Merge pull request #2529 from edx/ned/second-dummy-language
Add a second fake translation language
2014-02-10 15:19:27 -05:00
Sarina Canelake
6f32324e28 Merge pull request #2537 from edx/sarina/add-greek
Add Greek language translations
2014-02-10 15:17:28 -05:00
Ned Batchelder
30aede6fb2 Merge pull request #2541 from edx/ned/remove-unused-imports
Remove unused imports.
2014-02-10 15:00:49 -05:00
Dave St.Germain
70b602fbfe Merge pull request #2498 from edx/dcs/a11y-sequence-nav
Accessibility improvements to the sequence navigation
2014-02-10 14:51:59 -05:00
Dave St.Germain
01ac04ca60 Merge pull request #2496 from edx/dcs/a11y-hide-things
For a11y, modal dialogs and script templates should be hidden...
2014-02-10 14:50:30 -05:00
Sarina Canelake
0ea941da69 Add Greek language translations 2014-02-10 14:40:11 -05:00
Dave St.Germain
4810bd6d1c Improved sequence navigation accessibility 2014-02-10 14:34:28 -05:00
Ned Batchelder
1bd213beba Remove unused imports. 2014-02-10 14:07:50 -05:00
Sarina Canelake
46897d8b40 Merge pull request #2528 from edx/sarina/lms-2197
i18n word cloud LMS-2197
2014-02-10 09:44:40 -05:00
Ned Batchelder
ece123e90f More than one dummy language 2014-02-08 10:37:01 -05:00
Calen Pennington
e0f6b1a24a Merge pull request #2221 from cpennington/xblock-xml-serialization
Enable (and test) xml export of pure XBlocks
2014-02-07 16:46:46 -05:00
Sarina Canelake
ad8ee2f2fc i18n word cloud LMS-2197 2014-02-07 16:42:14 -05:00
Jason Bau
50f7c0ebed Merge pull request #2510 from edx/jbau/fix-timezone-test-breakage
fix tests that were breaking on dev envs due to TIME_ZONE='UTC'
2014-02-07 12:28:36 -08:00
Greg Price
b1fc36d513 Merge pull request #2514 from edx/gprice/fix-single-thread-recursive
Avoid requesting unnecessary thread responses
2014-02-07 15:01:44 -05:00
Giulio Gratta
5e67612e9b Image Modal CMS HTML Block subtype
- Added YAML file for the HTML template code for the modal to work
- Added CSS and JS code for modal to look and function properly
- Updated code to take comments into account.
- Simplified HTML template and expanded JS to set up image modal on load.
- Added preliminary drag script.
- Converted jQuery UI draggable to Draggabilly
2014-02-07 09:21:20 -08:00
Dave St.Germain
44109d16ab For a11y, modal dialogs and script templates should be hidden from
screen readers. Also, the mathjax message should be wrapped to prevent
non-IE browsers from complaining about a feature that is IE-only.
2014-02-07 11:12:41 -05:00
Greg Price
bc0ca63f7e Avoid requesting unnecessary thread responses
The front-end code for rendering a thread always makes an AJAX request
for the resopnses, regardless of how the thread was accessed (directly
by URL or by selecting it from the thread list). Previously, when
a user accessed a thread directly by URL, the LMS would initially
request the thread from the comments service with responses, but that
response data was never actually used. Now, the responses are not
fetched with that initial query.
2014-02-07 10:50:59 -05:00
Dave St.Germain
98a5ce3261 Merge pull request #2499 from edx/dcs/a11y-slight-rearrange
Added an alt tag to the footer logo; added charset meta tag; moved
2014-02-07 10:05:52 -05:00
Brian Talbot
08f448389a Merge pull request #2410 from ionis-education-group/courseware-none-bodyclass
Add '' default to bodyclass in courseware templates
2014-02-07 10:00:59 -05:00
David Baumgold
a93ef64a68 Merge pull request #2454 from ionis-education-group/theme-template-paths
Prepend theme template paths
2014-02-07 09:25:34 -05:00
Jason Bau
fc8efc3017 fix tests that were breaking on dev envs due to TIME_ZONE='UTC' 2014-02-06 23:07:26 -08:00
John Jarvis
6c5ad2b74a Merge pull request #2448 from edx/jarv/db-env-override
Jarv/db env override
2014-02-06 17:53:26 -05:00
Jason Bau
c3e1184211 Merge pull request #2269 from edx/jbau/lms-localize-datetime
make LMS accordion and progress datetime display respect settings.TIME_ZONE
2014-02-06 12:48:10 -08:00
Brian Talbot
a41bdb46db Merge pull request #2476 from ionis-education-group/bodyclass-without-js
Stop using JavaScript to set the body's CSS class
2014-02-06 11:28:09 -05:00