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

18982 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
brianhw
e1b39774de Merge pull request #1458 from edx/brian/email-dupe-retry 
Check for requeued subtasks when in RETRY state.
 2013-10-23 07:04:37 -07:00
David Baumgold
e2cdc751ee Merge pull request #1456 from edx/db/handle-bad-import 
import: handle case where result has not responseText
 2013-10-23 06:41:23 -07:00
Diana Huang
813c8c4cec Merge pull request #1426 from edx/diana/django-wiki-colors 
Better indication of what mode is active in the wiki.
 2013-10-23 06:13:50 -07:00
Valera Rozuvan
4a921e4740 Merge pull request #1397 from edx/valera/add_visual_feedback_start_end_time_video 
Add visual indicator to the interface for start/end times
 2013-10-23 05:30:29 -07:00
Valera Rozuvan
1a9214b2f3 Fixing merge conflicts in tests.EOF 
Fixing merge conflicts in tests.
 2013-10-23 15:12:24 +03:00
Usman Khalid
0a9db94004 Merge pull request #1316 from edx/usman/lms930-unregister-button-broken 
Setup leanModel handlers on jQuery.ready() so that the rest of the scripts get a chance to load before modals can be activated.
 2013-10-23 04:36:49 -07:00
Valera Rozuvan
a16fe3430f Added entry to CHANGELOG.rst file. 2013-10-23 13:01:13 +03:00
Valera Rozuvan
e1adae186e Chaining jQuery UI slider() methods. 2013-10-23 13:01:13 +03:00
Valera Rozuvan
723772abd0 Rewrote Jasmine tests for slider range to reuse function. More compact and concise. 2013-10-23 13:01:13 +03:00
Valera Rozuvan
159099541a Updated code as suggested by reviewers. 2013-10-23 13:01:13 +03:00
Valera Rozuvan
03d4838bc0 Updated code as suggested by reviewers. 2013-10-23 13:01:13 +03:00
Valera Rozuvan
6f9a232979 Removed accidental files. 2013-10-23 13:01:13 +03:00
Valera Rozuvan
9b33bdfc00 Fix for test. 2013-10-23 13:01:13 +03:00
Valera Rozuvan
bb5c70df59 CSS width, and left properties can be decimal numbers. 2013-10-23 13:01:13 +03:00
Valera Rozuvan
2d9ef610ac Fixed acceptance test for start time / end time slider range. 
It turned out to be that when you run the tests in
cms/djangoapps/contentstore/features/video.feature
all at once, then test # 11 starts with transcripts already turned on. When you
run just the test # 11, then transcripts are not available (from previous tests).
That's why to make width consistent, we have to make sure that transcripts are
hidden.
 2013-10-23 13:01:12 +03:00
Valera Rozuvan
41cbd04d7c Updated test for range slider in time slider. 
Instead of raw comparison against an HTML string to get style information,
now proper selenium function is used to get value of CSS property.
 2013-10-23 13:01:12 +03:00
Valera Rozuvan
1941474a6c Fixing test for range element in slider. 2013-10-23 13:01:12 +03:00
Valera Rozuvan
644af346a9 Initial sketch of acceptance test for start end time range in slider. 2013-10-23 13:01:11 +03:00
Valera Rozuvan
348b037bf2 Fixing Jasmine tests. Adding tests for start end time checking. 2013-10-23 13:01:11 +03:00
Valera Rozuvan
0d580d009a Fine grain control of when to show the range. 
Also moved all static styling to SCSS.
 2013-10-23 13:01:11 +03:00
Valera Rozuvan
d0fbd502fb Initial commit for feature BLD-391: Add arrows to the interface for start/end times. 
If end time is specified (which means that there is also a start time), we
add an extra DOM element to the slider that will show the are in time between
start time and end time. Unfortunately, this visual aid will become available
ony after start of playback. This is because until then we don't know the length
of the video.
 2013-10-23 13:01:10 +03:00
Usman Khalid
91fbc6610e dashboard.html: Made strings translatable 2013-10-23 14:52:13 +05:00
Usman Khalid
cfaf1275a7 leanModel is setup on jQuery.ready() 2013-10-23 14:52:13 +05:00
polesye
6c08708131 Merge pull request #1111 from edx/anton/video_subtitles 
Add Timed Transcripts Editor.
 2013-10-23 02:38:39 -07:00
polesye
ee7c71817a Add special cases to doc. 2013-10-23 12:37:11 +03:00
Valera Rozuvan
ba5f337fdb Fix bug. Add validation to HTML5 sources field. 2013-10-23 11:52:22 +03:00
Brian Wilson
16b85c0c2a Check for requeued subtasks when in RETRY state. 2013-10-22 18:17:00 -04:00
David Baumgold
303ac5bd49 import: handle case where result has not responseText 2013-10-22 17:34:45 -04:00
Jason Bau
6e1b8749b2 Merge pull request #1440 from edx/jbau/COE-sanitize-with-bleach 
Jbau/coe sanitize with bleach
 2013-10-22 14:01:59 -07:00
Diana Huang
52ed7b277d Add i18n hooks. 
LMS-1306
 2013-10-22 16:32:10 -04:00
Christina Roberts
9936fc0a15 Merge pull request #1448 from edx/christina/checklists 
Change checklist URL.
 2013-10-22 12:49:54 -07:00
brianhw
2d1928753f Merge pull request #1438 from edx/brian/lock-email-task 
Add cache-based locking to subtasks to ensure that the same task is not ...
 2013-10-22 12:27:40 -07:00
cahrens
2c07bf7124 checklist_index is an integer. 2013-10-22 15:26:19 -04:00
Jason Bau
651ef209ac add autolinking 2013-10-22 12:04:37 -07:00
Anton Stupak
aecc20af6b Add Timed Transcripts Editor. 2013-10-22 21:45:03 +03:00
Brian Wilson
ecb58e863f Add cache-based locking to subtasks to ensure that the same task is not running in two workers at the same time. 2013-10-22 14:32:52 -04:00
Diana Huang
0752375e46 Indicate active status more clearly for people 
with vision impairments

* bold text when active
* add in some extra text for screen readers

LMS-1306
 2013-10-22 14:21:35 -04:00
Adam
1f7bb112bf Merge pull request #1401 from edx/adam/a11y-modal-management 
optimize keyboard focus management on dashboard's modals
 2013-10-22 11:17:10 -07:00
Brian Talbot
bd0522d5a4 Merge pull request #1450 from edx/talbs/lms-fix-passwordreset 
LMS: FIX - Resolves path to CSS assets on password reset views (resolves LMS-1357)
 2013-10-22 10:56:14 -07:00
Julia Hansbrough
8785889684 Merge pull request #1446 from edx/flowerhack/fix/legacyemailjs 
Fixed a bug where legacy instructor dash's email editor failed to load
 2013-10-22 10:48:07 -07:00
Julia Hansbrough
9123186050 Fixed indentation 2013-10-22 17:39:48 +00:00
Brian Talbot
c476614f21 LMS: adds correct css/style assets back to password reset and confirm views 2013-10-22 13:29:20 -04:00
Adam Palay
83b11a881c optimize keyboard focus management on dashboard's modals 
add license to a11y_tools.js

add tests, some reorganization of js tests

skip "toBeFocused" tests for now
 2013-10-22 13:26:18 -04:00
John Jarvis
c1c298618b Merge pull request #1449 from edx/jarv/gunicorn-version 
adding gunicorn to base requirements
 2013-10-22 09:52:26 -07:00
John Jarvis
c59ecc9068 Merge pull request #1433 from edx/jarv/static-root 
Jarv/static root
 2013-10-22 09:09:07 -07:00
John Jarvis
1ac732abb4 adding git.revision for cms 2013-10-22 12:08:48 -04:00
John Jarvis
4d21fa47d5 adding gunicorn to base requirements 2013-10-22 12:03:26 -04:00
cahrens
ca5d0e8973 Do need context_course variable for segment io. 2013-10-22 11:34:15 -04:00
cahrens
a6faa163f3 Convert checklists to new URL scheme. 2013-10-22 11:34:05 -04:00
Don Mitchell
9cbd231275 Merge pull request #1416 from edx/dhm/regex_courseid 
Parse locator url better
 2013-10-22 08:26:54 -07:00