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

18997 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Don Mitchell
268dee2533 Merge pull request #1471 from edx/dhm/bug_course_case 
Require course ids to be case-insensitively unique
 2013-10-23 13:55:31 -07:00
Don Mitchell
277f327690 Require course ids to be case-insensitively unique 2013-10-23 15:47:07 -04:00
Adam
2ad088095e Merge pull request #1469 from edx/adam/fix/courses-500 
set courses_are_browsable flag to False, fix unicode error
 2013-10-23 12:11:31 -07:00
Adam Palay
ab5863a4db fixes unicode error in course image filenames on /courses page 2013-10-23 15:06:53 -04:00
Jay Zoldak
5e39ff65db Merge pull request #1463 from edx/zoldak/fix-tests 
Improve problems acceptance tests
 2013-10-23 11:44:22 -07:00
Will Daly
031f307424 Merge pull request #1464 from edx/will/wait-for-section-clickable 
Wait for js/base in CMS acceptance tests to ensure click handlers are installed
 2013-10-23 11:41:26 -07:00
Jay Zoldak
45f87b30c0 Improve problems acceptance tests. Disable brittle video test. 2013-10-23 13:53:11 -04:00
Will Daly
68d6d276ab Merge pull request #1466 from edx/will/disable-brittle-test 
Disable test seen to fail on PRs
 2013-10-23 10:26:33 -07:00
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
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
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