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

7518 Commits

Author SHA1 Message Date
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
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
Calen Pennington
4403eb7209 Fix STUD-1311 (Don't overwrite published content w/ draft content accidentally) 2014-02-12 11:11:01 -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
David Adams
e5354f24be Merge pull request #2403 from edx/dcadams/tinymce_mods 
Addition of 3 TinyMCE plugins to toolbar
 2014-02-11 13:54:00 -08:00
frances botsford
ab4432db72 Merge pull request #2561 from edx/frances/studio/bug-editor-number-layout 
Fixed missing polyfill buttons and adjusted layout of number input 
UX-381
 2014-02-11 15:22:53 -05:00
Frances Botsford
34ea03c887 fixed missing polyfill buttons, adjusted layout of number input in component editor 
UX-381
 2014-02-11 15:20:00 -05:00
cahrens
09d90b16af Clean up of modulestore references (primarly LMS). 
STUD-1151
 2014-02-11 14:29:22 -05:00
Diana Huang
770df00921 Merge pull request #2493 from danielcebrian/daniel-branch-fix 
fixed conflict between Annotator and internationalitation
 2014-02-11 13:32:57 -05:00
polesye
cebc0c47fd BLD-824: Download Video link missing from video player. 2014-02-11 20:17:22 +02:00
Sarina Canelake
47426f46e6 i18n Sequence XModule 2014-02-11 12:22:24 -05:00
Sarina Canelake
58565c6dc4 Merge pull request #2538 from edx/sarina/fixup-symmath 
pep8/pylint cleanup on symmath/formula.py
 2014-02-11 10:16:18 -05:00
Will Daly
8880faedbd Merge pull request #2558 from edx/will/more-robust-ora-page 
Ora page object retries even if rubric doesn't load
 2014-02-11 10:01:05 -05:00
Sarina Canelake
27c3ba4a4d pep8/pylint cleanup on symmath/formula.py 2014-02-11 09:46:24 -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
polesye
faa97379b7 BLD-658: Add view for field type Dict in Studio. 2014-02-11 14:53:57 +02:00
Will Daly
fdda638f57 Merge pull request #2536 from edx/will/bok-choy-coverage-name 
Change bok-choy coverage XML filename
 2014-02-11 07:50:04 -05:00
Oleg Marshev
79ffcb7e94 Refactor stub implementation of LTI Provider. BLD-601. 2014-02-11 12:50:22 +02:00
Will Daly
4a9202bd1c Ora page object retries even if rubric doesn't load 2014-02-10 23:36:13 -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
Ned Batchelder
aab6c54a51 Merge pull request #2545 from edx/ned/remove-tabs 
Remove tabs.
 2014-02-10 15:54:11 -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
David Baumgold
3938e84d6a Merge pull request #2526 from edx/db/refactor-student-view 
Refactor student views
 2014-02-10 15:22:53 -05:00
Ned Batchelder
2f67d0aab4 Remove tabs. 2014-02-10 15:13:11 -05:00
David Baumgold
1dfd3310f7 Refactor student views 
Fix pylint/pep8 warnings, use JsonResponse instead of HttpResponse where useful,
put in TODOs to change HTTP status codes to be more accurate.
 2014-02-10 14:50:57 -05:00