Commit Graph

19363 Commits

Author SHA1 Message Date
Alexander Kryklia
32f0f555e9 Use more clean expression. 2013-10-23 13:06:13 +03:00
Alexander Kryklia
3c4f71bbe5 Update variable names and fix typo. 2013-10-23 13:06:13 +03:00
Alexander Kryklia
ab5653d7c1 Fix checking exception message. 2013-10-23 13:06:13 +03:00
Alexander Kryklia
0188207819 Fix to_json of RelativeTime to support Isotime format. 2013-10-23 13:06:12 +03:00
Alexander Kryklia
040b4da124 Change str of RelativeTime. 2013-10-23 13:06:12 +03:00
Alexander Kryklia
14dc814e2a Fix typo 2013-10-23 13:06:12 +03:00
Alexander Kryklia
a236632c95 Fix typo. 2013-10-23 13:06:12 +03:00
Alexander Kryklia
04f224fc16 Fix typo. 2013-10-23 13:06:12 +03:00
Alexander Kryklia
4c2ab39826 Changed help text for start and end time. 2013-10-23 13:06:12 +03:00
Alexander Kryklia
2c90fd18f4 Rename IsoTime to RelativeTime. 2013-10-23 13:06:12 +03:00
Alexander Kryklia
ece4cb6645 Add test for IsoTime 2013-10-23 13:04:31 +03:00
polesye
ed97000d4b Fix acceptance test. 2013-10-23 13:04:31 +03:00
Alexander Kryklia
f46433e764 Add tests fro IsoTime methods. 2013-10-23 13:03:55 +03:00
Alexander Kryklia
0da81e2a56 Update IsoTIme to be timedelta and update tests. 2013-10-23 13:03:55 +03:00
polesye
28f229b7c9 Add comment. 2013-10-23 13:03:35 +03:00
polesye
ef3acaa773 Add js unit tests. 2013-10-23 13:03:35 +03:00
polesye
8e86d7b589 Refactor js. 2013-10-23 13:01:23 +03: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
polesye
7cbdac7322 Add new python field. 2013-10-23 13:00:36 +03:00
Alexander Kryklia
6511dad131 Video modul changes 2013-10-23 13:00:36 +03:00
polesye
9dd6c56f9f Add isoTime js view. 2013-10-23 13:00:36 +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
Greg Price
bfd2957194 Merge pull request #1457 from edx/gprice/add-newrelic-instrumentation
Add newrelic instrumentation to forum views
2013-10-22 15:23:15 -07: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
Greg Price
85f5c9328f Add newrelic instrumentation to forum views 2013-10-22 14:51:38 -04:00