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

5549 Commits

Author SHA1 Message Date
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
Don Mitchell
1de9d55844 Review-driven changes (to-be-squashed) 2014-02-05 16:34:24 -05: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
Christina Roberts
235d10ddc6 Merge pull request #2434 from edx/christina/preview_handler 
preview_handler changes to support Locators
 2014-02-05 12:53:11 -05:00
Diana Huang
7acc116128 Merge pull request #2477 from edx/diana/fix-sequence-titles 
Prevent bad sequential titles
 2014-02-05 12:49:31 -05:00
thedeadparrot
539cd053d1 Prevent bad sequential titles 
Don't try to set the title if we don't have anything in
the sequential

LMS-2168
 2014-02-05 12:11:52 -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
cahrens
1dcd5fe6e9 Deleting unused methods. 2014-02-05 10:49:37 -05:00
Don Mitchell
b8ea7f3c43 update_item and other refactorings continued 2014-02-05 10:24:24 -05:00
Don Mitchell
53f7c50731 Added test for defaulting use_locations 2014-02-05 09:34:30 -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
Dave St.Germain
ea594a2980 Merge pull request #2464 from edx/dcs/default-css-class 
The default course CSS class should be empty string rather than None.
 2014-02-05 09:34:05 -05:00
Valera Rozuvan
7339f568d4 Merge pull request #2358 from Szczork/szczork/log-speed-change-video 
add condition - log speed change / loading video
 2014-02-05 12:46:25 +02:00
ichuang
5541aa9c5d Merge pull request #2412 from edx/bugfix/ichuang/formulaequation-msg2 
add message output to formulaequationinput.html (capa)
 2014-02-04 18:57:41 -08:00
Jason Bau
70762d1ab7 Merge pull request #2307 from edx/jbau/allow-unset-course-startdate 
Handle taking registrations on a course with TBD start date
 2014-02-04 16:07:23 -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
Dave St.Germain
0e5f3e4f08 The default course CSS class should be empty string rather than None. 2014-02-04 14:37:38 -05:00
Szczork
08ce047fe2 add unit test for speed_change_video event 2014-02-04 14:35:11 +01:00
Jason Bau
7ac13bf81e Don't show course start date if it hasn't been set. 
If neither start nor advertised_start has been changed from default
don't show the course start date.

This allows us to accept course registrations for courses whose start
date is yet TBD.
 2014-02-03 16:20:39 -08: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
ichuang
239985ef68 add message output to formulaequationinput.html (capa) 2014-02-03 16:12:20 -05:00