Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,310 Commits 1 Branch 0 Tags
331fbcd585b52fd1f5d5d2f7e32235c8381d4797
Commit Graph

3376 Commits

Author SHA1 Message Date
Adam
7b3376f944 Merge pull request #2575 from edx/adam/i18n-self-assessment-2 
Adam/i18n self assessment 2
 2014-02-18 09:07:24 -05:00
Alexander Kryklia
23a2177da3 Enable download_track for existing courses if self.track. 2014-02-18 12:31:06 +02:00
Adam Palay
97f5b25e2c i18n for self-assessment (ORA-314) 
make openendedchild and open_ended_module_v1 act enough like xblocks to get xblock 18n
 2014-02-14 17:27:32 -05:00
Julia Hansbrough
7d81a510bc Moved UserPreferences to common 2014-02-14 10:32:11 -05:00
polesye
faab4caeef BLD-837: Fix download transcript behavior. 2014-02-14 11:51:51 +02:00
Christina Roberts
0c74d6ac54 Merge pull request #2562 from edx/christina/lms-mixed 
Clean up of modulestore references (primarily LMS).
 2014-02-13 20:05:31 -05:00
Greg Price
9ae6bb0b73 Check for forum data errors in LMS 
Some messages generated by the comments service are not readily
translated because they come from third-party libraries. Thus, we plan
to try to avoid showing any comments service generated message to the
user. This check preempts the only end-user-visible CS-generated error
message that we are presently aware of.
 2014-02-13 15:44:57 -05:00
Julia Hansbrough
5131818153 Merge pull request #2597 from edx/release 
Release
 2014-02-13 15:17:38 -05:00
Calen Pennington
3a7b265c8a Add trailing commas to multiline lists, to prevent string concatenation bugs 2014-02-13 13:12:42 -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
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
Sarina Canelake
ba0fbf0762 i18n points possible display LMS-2201 2014-02-11 18:25:00 -05:00
cahrens
09d90b16af Clean up of modulestore references (primarly LMS). 
STUD-1151
 2014-02-11 14:29:22 -05:00
polesye
cebc0c47fd BLD-824: Download Video link missing from video player. 2014-02-11 20:17:22 +02: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
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
Ned Batchelder
aff3c47754 i18n fixes for wiki templates. 2014-02-10 15:23:13 -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
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
Ned Batchelder
1bd213beba Remove unused imports. 2014-02-10 14:07:50 -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
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
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
Jason Bau
fc8efc3017 fix tests that were breaking on dev envs due to TIME_ZONE='UTC' 2014-02-06 23:07:26 -08:00
Feanil Patel
716b789e06 Merge remote-tracking branch 'origin/release' 2014-02-05 17:26:39 -05:00
Don Mitchell
1de9d55844 Review-driven changes (to-be-squashed) 2014-02-05 16:34:24 -05:00
Julia Hansbrough
a0efe6e0de Make receipt-ids actually generate UUIDs 
LMS-2192
 2014-02-05 20:41:30 +00:00
Calen Pennington
b0bed170de Enable (and test) xml export of pure XBlocks 
[LMS-179]
[LMS-209]
[LMS-1345]
 2014-02-05 13:02:40 -05:00
Dave St.Germain
a6797899da Removed inappropriate section tags. Because screen readers announce each section, they should not be used unless they are actually defining meaningful sections. 2014-02-05 11:32:08 -05:00
Don Mitchell
b8ea7f3c43 update_item and other refactorings continued 2014-02-05 10:24:24 -05:00
Don Mitchell
c601b75675 MixedModulestore wraps most getters, update_item, delete_item 
with code to translate between addressing schemes based on app
and persistence layer addressing scheme specification.

STUD-1206
 2014-02-05 09:34:30 -05:00
Calen Pennington
6d67d0c677 Merge pull request #1949 from cpennington/xblock-studio-js-and-css 
Enable XBlock js and css in Studio
 2014-02-05 08:19:45 -05:00
chrisndodge
3f43fb6436 Merge pull request #1967 from edx/feature/cdodge/cap-num-enrollments 
Add ability to cap number of enrollments in a course
 2014-02-04 13:38:52 -08:00
Chris Dodge
ad7348ec11 Allow author to cap enrollments in course 
add a test case for enrollment caps

pep8 fix
 2014-02-04 15:32:36 -05:00
Julia Hansbrough
aeb7bbf260 Merge pull request #2461 from edx/flowerhack/fix/csv-using-read-replica 
Fixed 500ing CSV reports
 2014-02-04 11:56:54 -08:00
Usman Khalid
0eb9c34341 Merge pull request #2396 from edx/usman/lms2090-instructor-task-transactions 
instructor_task: Distribute extra items among subtasks of last query.
 2014-02-04 11:17:20 -08:00
Usman Khalid
95a112a3dd instructor_task: Distribute extra items among subtasks of last query. 
When creating an instructor task total_num_items may change between the
time it and the number of subtasks is calculated and the time the
subtasks are actually queued (all of this cannot happen in one transaction).
In such a case the extra items are distributed among the subtasks of the
last query.

LMS-2090
 2014-02-04 23:30:02 +05:00
Carson Gee
69097e7b4a Merge pull request #2032 from carsongee/cg/ssl-studio 
More fully integrate and test ssl external auth in CMS
 2014-02-04 09:54:17 -08:00
Julia Hansbrough
891465d1b0 Fixed 500ing CSV reports 2014-02-04 16:38:08 +00:00
Carson Gee
8cbe263ca0 Rename of feature AUTH_USE_MIT_CERTIFICATES to AUTH_USE_CERTIFICATES across platform. 
Caution! This is backwards incompatible
 2014-02-04 10:50:48 -05:00
Calen Pennington
49217ebe8b Allow multiple client-side runtimes on a single page 
Make XBlock client-side runtimes proper classes, so that handlerUrl can
be defined in a per-runtime way, and we can have multiple runtimes on a
single page.

[LMS-1630][LMS-1421][LMS-1517]
 2014-02-04 08:55:36 -05:00
Feanil Patel
5e5c59cab2 Merge remote-tracking branch 'origin/release' 
Conflicts:
	common/lib/xmodule/xmodule/modulestore/xml.py

Took the changes that were on the release branch.
 2014-02-03 16:39:40 -05:00