Commit Graph

4005 Commits

Author SHA1 Message Date
Alexander Kryklia
04f224fc16 Fix typo. 2013-10-23 13:06:12 +03:00
Alexander Kryklia
2c90fd18f4 Rename IsoTime to RelativeTime. 2013-10-23 13:06:12 +03:00
polesye
ed97000d4b Fix acceptance test. 2013-10-23 13:04:31 +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
9b33bdfc00 Fix for test. 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
polesye
9dd6c56f9f Add isoTime js view. 2013-10-23 13:00:36 +03:00
polesye
6c08708131 Merge pull request #1111 from edx/anton/video_subtitles
Add Timed Transcripts Editor.
2013-10-23 02:38:39 -07:00
Valera Rozuvan
ba5f337fdb Fix bug. Add validation to HTML5 sources field. 2013-10-23 11:52:22 +03:00
David Baumgold
303ac5bd49 import: handle case where result has not responseText 2013-10-22 17:34:45 -04:00
Christina Roberts
9936fc0a15 Merge pull request #1448 from edx/christina/checklists
Change checklist URL.
2013-10-22 12:49:54 -07:00
cahrens
2c07bf7124 checklist_index is an integer. 2013-10-22 15:26:19 -04:00
Anton Stupak
aecc20af6b Add Timed Transcripts Editor. 2013-10-22 21:45:03 +03:00
Don Mitchell
1f0ab9e01f Remove as_old_location methods
They were incorrect if there were periods in the org or name.
2013-10-22 14:10:20 -04:00
Don Mitchell
4ed8322293 Test that instructors can access courses 2013-10-22 14:10:14 -04: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
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
8902a89fbc Have urls.py fully parse locator url 2013-10-22 10:44:03 -04:00
Don Mitchell
1db76191ac Merge pull request #1434 from edx/dhm/bug_has_access
Use known translation if exists to get groupname
2013-10-22 07:18:32 -07:00
Don Mitchell
4f60a30afc Remove as_old_location methods
They were incorrect if there were periods in the org or name.
2013-10-21 17:17:20 -04:00
Jay Zoldak
ecea49ba2d Refactor wait_for methods in ui_helpers for acceptance tests. 2013-10-21 17:14:01 -04:00
Don Mitchell
7aae62230e Test that instructors can access courses 2013-10-21 17:06:00 -04:00
Don Mitchell
6b896a6999 Use known translation if exists to get groupname 2013-10-21 16:12:06 -04:00
Don Mitchell
1561ca917f Use known translation if exists to get groupname 2013-10-21 15:50:18 -04:00
John Jarvis
8ca156bd00 adding STATIC_ROOT to cms 2013-10-21 14:41:00 -04:00
Don Mitchell
8dc9fa8861 Test providing a collection in doc_store_config to contentstore. 2013-10-21 12:15:51 -04:00
Carlos Andrés Rocha
0be9daf9d5 Merge pull request #1419 from rocha/fix-config-root-env
Fix error when reading tokens on aws configuration
2013-10-21 08:24:15 -07:00
e0d
a5715bf243 Merge pull request #1425 from edx/e0d/remove-default
The default value was removed from common.
2013-10-21 07:57:38 -07:00
polesye
fa23543682 Merge pull request #1418 from edx/anton/restore-cc-button-mouseover
Added back on hover CC button functionality.
2013-10-21 07:47:55 -07:00
e0d
e6955c641f The default value was removed from common. 2013-10-21 10:45:05 -04:00
David Baumgold
68f6aa8c98 Merge pull request #1404 from edx/db/requirejs-configure-mathjax
Configure MathJax using require.js
2013-10-21 07:33:08 -07:00
e0d
fb62f0c52a Merge pull request #1417 from edx/e0d/config-fix
E0d/config fix
2013-10-21 07:29:52 -07:00
e0d
5adf524ad6 removing redundant default. 2013-10-21 09:55:27 -04:00
Christina Roberts
475cf07700 Merge pull request #1393 from edx/christina/checklists-restful
Include tail from header tag in course update.
2013-10-21 06:28:36 -07:00
Calen Pennington
12cc4a19c0 Merge pull request #1224 from cpennington/lms-xblock-js-execution
Add an XBlock javascript runtime, and use it to run XModules
2013-10-21 05:53:36 -07:00
Carlos Andrés Rocha
b764b9b4cf Fix error when reading tokens on aws configuration
The error was caused by the CONFIG_ROOT environmental variable,
which was incorrectly assumed to be a path.py valid path.
2013-10-21 03:19:22 -04:00
polesye
a1f8aca6c9 Restore functionality. 2013-10-19 09:32:36 +03:00
Calen Pennington
ce6fbae693 Add an XBlock javascript runtime, and use it to run XModules
[LMS-57]
2013-10-18 16:31:32 -04:00
e0d
5995a76254 sanity restored. 2013-10-18 16:26:23 -04:00
e0d
a008cc6b74 path fix. 2013-10-18 16:12:51 -04:00
cahrens
a8ad56fa0e Remove pipeline config not needed with RequireJS.
Was re-introduced in a bad merge.
2013-10-18 15:57:50 -04:00
e0d
6700a3ec14 Fixes for the AWS environment config. 2013-10-18 15:56:15 -04:00
Will Daly
2109fdb33f Disable test seen to fail in master 2013-10-18 15:45:49 -04:00