David Baumgold
aa57f925c6
Merge pull request #1465 from edx/Szczork/translation-overrides
...
Translation overrides
2013-10-23 10:25:03 -07:00
Will Daly
55ffacaf51
Disable test seen to fail on PRs
2013-10-23 13:24:45 -04:00
Will Daly
a8fe4151ae
Wait for js/base in CMS acceptance tests to ensure click handlers are
...
installed.
2013-10-23 13:20:52 -04:00
Szczork
b3844af28d
Translation overrides
...
Usefull variables for translation
2013-10-23 12:39:31 -04:00
Sarina Canelake
90baa0c9af
Change footer color in bulk email template
2013-10-23 11:37:51 -04:00
John Jarvis
cda168dacf
Merge pull request #1459 from edx/jarv/fix-static-root
...
Jarv/fix static root
2013-10-23 08:01:32 -07:00
John Jarvis
68d31b9808
adding STATIC_ROOT_BASE to lms/envs/aws.py
2013-10-23 10:30:05 -04:00
John Jarvis
25c6f9455b
fixes static_root override
2013-10-23 10:28:09 -04:00
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
Alexander Kryklia
c351c3dae7
Fix typos.
2013-10-23 13:06:13 +03:00
Alexander Kryklia
e902ff6548
Fix error printing: use repr.
2013-10-23 13:06:13 +03:00
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
