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

5519 Commits

Author SHA1 Message Date
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
Julia Hansbrough
5131818153 Merge pull request #2597 from edx/release 
Release
 2014-02-13 15:17:38 -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
Alexander Kryklia
d2f17235d9 Fix for saving video in studio when saving position. BLD-834 2014-02-13 13:12:23 +02: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
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
Sarina Canelake
47426f46e6 i18n Sequence XModule 2014-02-11 12:22:24 -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
Oleg Marshev
79ffcb7e94 Refactor stub implementation of LTI Provider. BLD-601. 2014-02-11 12:50:22 +02: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
Ned Batchelder
2f67d0aab4 Remove tabs. 2014-02-10 15:13:11 -05:00
Dave St.Germain
4810bd6d1c Improved sequence navigation accessibility 2014-02-10 14:34:28 -05:00
Calen Pennington
25c0776ca5 Merge pull request #2540 from cpennington/fix-pylint-errors 
Fix pylint violations
 2014-02-10 14:33:31 -05:00
Calen Pennington
64008200f3 Fix pylint violations 2014-02-10 13:34:25 -05:00
Mark Hoeber
678749fbad Merge pull request #2522 from edx/markhoeber/image-modal-title-change 
Updated title and template for image modal html component
 2014-02-10 11:08:47 -05:00
Mark Hoeber
43ac1d23a8 Updated title and template for image modal html component 
LMS-2215
 2014-02-10 09:18:00 -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
Calen Pennington
db17bf4c15 Add tests of XML exporting to test_xblock_wrappers 2014-02-07 15:50:34 -05:00
David Baumgold
e09990ff30 Merge pull request #2413 from edx/bugfix/ichuang/do-not-import-tilde-files 
Skip tilde files when importing
 2014-02-07 15:42:02 -05:00
David Baumgold
d1dc8c9191 Add README to tilde fixture, fix pylint/pep8 issues 2014-02-07 15:03:37 -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
David Baumgold
ff910028fd Merge pull request #2465 from glowe/fix-sequence-position 
Fix goto_position in sequence coffeescript.
 2014-02-07 10:46:33 -05:00
David Baumgold
83b0eda4a4 Add test for ignoring tilde static files on import 2014-02-07 10:26:02 -05:00
David Baumgold
cc091f833a Add test for ignoring tilde files on import of extra content 2014-02-07 10:25:46 -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
ichuang
09bdcbbc6f skip ~ files in static content import 2014-02-06 14:21:40 -05:00
ichuang
33f86a7af1 skip *~ files in import of extra content (e.g. info and about pages) 2014-02-06 14:21:40 -05:00
David Baumgold
698aedc329 better pylint formatting 2014-02-06 11:56:46 -05:00
David Baumgold
2d59d44bb5 Clarify DATA_DIR path 2014-02-06 11:55:41 -05:00
Calen Pennington
85c31dd24b Refactor test_xblock_wrappers to use Factories 2014-02-06 11:52:07 -05:00
Graham Lowe
c659b1c5f4 Fix goto_position in sequence coffeescript. 
Replace single-quotes with double-quotes so that #{@ajaxUrl} is
interpolated.
 2014-02-06 11:36:11 -05:00
Jason Bau
b525f40377 Start datetime localization in LMS 
Currently just coerces the time displayed for due dates
(accordion.html and progess.html) to settings.TIME_ZONE
 2014-02-06 07:57:56 -08:00
Calen Pennington
4321572708 Switch test_xblock_wrappers to use ddt, and to considate logic 2014-02-06 10:15:46 -05:00