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

7544 Commits

Author SHA1 Message Date
Will Daly
331fbcd585 Merge pull request #2612 from edx/will/fix-xqueue-stub-test 
Fixed intermittent failure in XQueue stub unit test
 2014-02-18 14:59:06 -05:00
Dave St.Germain
3d08bfd208 Fixes devstack settings to work with new version of debug toolbar 2014-02-18 14:50:36 -05:00
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
Julia Hansbrough
64f1cae64b Merge pull request #2419 from edx/talbs/lms-languagemenu 
LMS: Adds Language Selection Menu
 2014-02-14 18:32:12 -05:00
thedeadparrot
ff0a6fb778 Update cms urls for language preferences 2014-02-14 22:35:14 +00:00
Julia Hansbrough
05537540d1 Fix acceptance tests 
Fixed bok-choy acceptance tests
 2014-02-14 22:35:14 +00:00
thedeadparrot
b61649f9eb Refactor out new lang_pref djangoapp 2014-02-14 22:35:14 +00:00
Julia Hansbrough
efe7bdacfc Fixed broken acceptance tests 2014-02-14 22:35:13 +00:00
thedeadparrot
afdd8d68cb Better dashboard display behavior 
* Don't show sidebar if only one language is present
* only add in the default language code if it's not already present
 2014-02-14 22:35:13 +00:00
thedeadparrot
f6e14e62b5 Change setlang url 2014-02-14 22:35:12 +00:00
thedeadparrot
7e38c3ad6b Use a given default for getting a preference 2014-02-14 22:35:12 +00:00
thedeadparrot
48686793d7 Clean up tests. 2014-02-14 22:35:12 +00:00
Diana Huang
a07d243fdb Clean up the display and dialog to use user preferences 
instead of the current language.
 2014-02-14 22:35:11 +00:00
Diana Huang
e94b1a5cfa If we run into issues with languages, use default 2014-02-14 22:35:10 +00:00
Diana Huang
be189e607e Store user preferences for languages 
Also, refactor tests such that we're not deleting users or prefs
 2014-02-14 22:35:07 +00:00
Julia Hansbrough
77cce3aa1a Added acceptance test for language persistence 
Will pass once the language persistence stuff gets merged in
 2014-02-14 22:34:46 +00:00
Julia Hansbrough
552572694f Added middleware for handling language changes 2014-02-14 22:34:29 +00: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
Will Daly
b8187fb173 Fixed intermittent failure in XQueue stub unit test 2014-02-14 16:43:13 -05:00
Will Daly
6f2ee0dc5c Merge pull request #2609 from edx/will/revert-paver 
Revert "Replace rake functions with python paver functions"
 2014-02-14 14:29:28 -05:00
Will Daly
c85c4b22ed Revert "Replace rake functions with python paver functions" 
This reverts commit df2e410f2a.
 2014-02-14 14:25:28 -05:00
Julia Hansbrough
48383de870 Merge pull request #2606 from edx/release 
Hotfix for Feb 14 2012
 2014-02-14 14:18:38 -05:00
marcotuts
6fcd35cfe6 Merge pull request #2507 from edx/marco/studio/container-view 
styling for a generic container view in Studio built on top of base styles for xblocks rendered in Studio. Also includes UX reference template area for unit and container pages.
 2014-02-14 13:37:18 -05:00
marco
a8417df7ba styling for recursive xblock rendering structure to be used in the container page, pulling from general xblock styles in a separate file. 2014-02-14 12:57:06 -05:00
David Glance
df2e410f2a Replace rake functions with python paver functions 
Deprecated rake functions issue a warning and then call paver
replacements

Bring Paver commands up to date with master for servers, assets, and docs.
Revert deprecation of quality, tests, and i18n for a future pull request.
Deprecate workspace migration
 2014-02-14 11:25:55 -05:00
Ned Batchelder
b23e9fb62f Merge pull request #2405 from edx/ned/remove-massemail 
Remove unused massemail commands.
 2014-02-14 10:50:57 -05:00
Julia Hansbrough
7d81a510bc Moved UserPreferences to common 2014-02-14 10:32:11 -05:00
Julia Hansbrough
d867e87b72 Acceptance test for language selector 
Tests language selection feature for student dashboard
 2014-02-14 10:32:11 -05:00
Will Daly
a5207708f8 Added dark lang database fixture to bok choy tests 2014-02-14 10:32:11 -05:00
Julia Hansbrough
cb6b52f890 wiring for language selector 2014-02-14 10:32:10 -05:00
polesye
d9ec9cecf4 BLD-837: Fix download transcript behavior. 2014-02-14 09:03:54 -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
Adam Palay
227197ec18 fixes css to render properly poll module (BLD-839) 2014-02-13 16:53:59 -05:00
Julia Hansbrough
5131818153 Merge pull request #2597 from edx/release 
Release
 2014-02-13 15:17:38 -05:00
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
Calen Pennington
6125d97301 Add acceptance tests using the AcidBlock for LMS and Studio 
[LMS-1645]
[LMS-2062]
[LMS-2063]
[LMS-2064]
 2014-02-13 13:22:10 -05:00
Dave St.Germain
c7c807f270 Merge pull request #2426 from edx/dcs/a11y-labels 
Add labels to CAPA inputtypes.
LMS-1895
 2014-02-13 13:19:31 -05:00
Dave St.Germain
4fa1f1163e Added labels to CAPA input types, with markdown syntax for adding them 
in studio.
LMS-1895 and others
 2014-02-13 13:18:24 -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
bab6e9b881 Merge pull request #2425 from edx/usman/lms1199-make-histograms-optional 
Added feature setting to disable histograms in Staff Debug Info panel.
 2014-02-13 18:21:14 +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
Alexander Kryklia
d2f17235d9 Fix for saving video in studio when saving position. BLD-834 2014-02-13 13:12:23 +02:00
Julia Hansbrough
48e35d8da2 Removed unused image 2014-02-12 21:49:05 +00:00
Julia Hansbrough
d6c0ce161e Merge branch 'release' 2014-02-12 21:24:19 +00:00
cahrens
894c40b89d Change Reference and ReferenceList instances on import to new namespace. 
STUD-149
 2014-02-12 15:22:12 -05:00
Christina Roberts
89ac19e81f Merge pull request #2503 from edx/christina/conditional 
Conditional module changes to support Locator/Location conversion.
 2014-02-12 15:03:29 -05:00
cahrens
276c6e918e Store locations in ReferenceLists so they can be converted to locators. 
STUD-1027
 2014-02-12 14:08:24 -05:00