Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,537 Commits 1 Branch 0 Tags
36be4e543c41284172031585ae8fe0dc825166bc
Commit Graph

8030 Commits

Author SHA1 Message Date
Dave St.Germain
0a19c96a08 updated pdf viewer 2014-04-14 14:28:06 -04:00
Chris Dodge
27d7c19c40 Merge branch 'release' 
Conflicts:
	cms/templates/widgets/source-edit.html
 2014-04-14 14:17:03 -04:00
David Adams
28bf623490 Merge pull request #3240 from edx/dcadams/enhanced_metric_reporting 
This makes the metrics tab "bars" clickable.
 2014-04-14 09:42:33 -07:00
jmclaus
f05c0aa8f9 HD control is hidden initially. On first play of video, when 
player.getAvailableQualityLevels returns a non-empty array, it will eventually display, if HD qualities are available (highres, hd1080, hd720). [BLD-937]
 2014-04-14 10:26:30 -04:00
Valera Rozuvan
615ce23930 Update acceptance tests to use real duration of YouTube video. 2014-04-14 10:37:56 +03:00
Sarina Canelake
9a586edf02 InstDash: check Auto-Enroll and Email Students boxes by default 2014-04-11 18:43:43 -04:00
Sarina Canelake
338a242e22 Fix course urls in enrollment emails (LMS-2217) 2014-04-11 18:43:43 -04:00
David Adams
0f37ee6924 This makes the metrics tab "bars" clickable. 
Clicking on any of the bars displays a list of students for that
  particular action (either opened the subsection or attempted the
  problem).
  Students are listed for the sub-sections.
  Students, grade and percent are listed for the problems.
  The on-screen list displays only the first 250 students with
  an overflow message if there are more students than that.
  The csv download lists all students.
 2014-04-11 13:56:49 -07:00
Anton Stupak
24b631f702 Merge pull request #3231 from edx/anton/refactor-speed-control 
Video: Refactor speed control.
 2014-04-11 19:38:04 +03:00
jsa
72c3c87c84 in Studio, render compact placeholders for inline discussions. 
JIRA: FOR-429
 2014-04-10 15:44:30 -04:00
Greg Price
f233fcff4b Merge pull request #3307 from edx/gprice/deleted-thread-404 
Return 404 instead of 500 for missing forum thread
 2014-04-10 15:27:21 -04:00
Jay Zoldak
76297c3050 Merge pull request #3305 from edx/zoldak/no-lettuce-with-discussion 
Disable discussion service setting for lettuce tests
 2014-04-10 13:56:09 -04:00
Greg Price
ecf9923e96 Return 404 instead of 500 for missing forum thread 
Also show a more specific error message in the front end. This change
only has an effect if using cs_comments_service commit 1d71330 or later.
 2014-04-10 13:17:58 -04:00
muhammad-ammar
2318ce18c4 Merge pull request #3217 from edx/ammar/convert-lettuce-video-tests-to-bok-choy 
Convert lettuce video tests to bok choy
 2014-04-10 21:38:00 +05:00
Jay Zoldak
9957b1aa8e Disable discussion service setting for lettuce tests 2014-04-10 11:51:20 -04:00
David Baumgold
15a49f8782 Merge pull request #2440 from glowe/prevent-duplicate-checks 
Temporarily disable CAPA problem "Check" button.
 2014-04-10 11:37:52 -04:00
Muhammad Ammar
5b6f3f8fbf Convert first batch of lettuce video tests to bok-choy. 2014-04-10 15:18:03 +00:00
Jay Zoldak
2c500a2b67 Merge pull request #3289 from edx/zoldak/quiet-acceptance-test-logs 
Quiet some noisy loggers for lettuce acceptance tests
 2014-04-10 09:29:52 -04:00
Andy Armstrong
8059547ed8 Merge pull request #2981 from edx/andya/container-editing 
Add "Edit" button to each leaf xblock on the container page
 2014-04-10 09:29:32 -04:00
Greg Price
8c8367b055 Merge pull request #3183 from edx/gprice/inline-response-pagination 
Add repsonse pagination to inline discussions
 2014-04-09 17:55:15 -04:00
Jay Zoldak
66a8685866 Merge pull request #3281 from edx/zoldak/fix-video-feature-name 
Fix video feature name so the test results roll up correctly
 2014-04-09 15:36:37 -04:00
Jay Zoldak
579e66fe88 Quiet some noisy loggers for lettuce acceptance tests 2014-04-09 14:40:50 -04:00
Andy Armstrong
7770d9d427 Implement editing from the Studio container page. 
STUD-1306
 2014-04-09 10:32:11 -04:00
Jay Zoldak
ca2977ab5f Fix video feature name so the test results roll up correctly 2014-04-09 10:17:56 -04:00
Waheed Ahmed
9067ebe815 Fixed import of "dog_stats_api" in staff_grading_service.py. 
LMS-2521
 2014-04-09 18:11:40 +05:00
polesye
f454e10e71 Add fixes. 2014-04-09 12:16:22 +03:00
polesye
f0492b3bb1 Refactor speed control. 2014-04-09 12:16:22 +03:00
polesye
31e9152936 BLD-753: Add i18n for LTI. 2014-04-09 12:12:52 +03:00
Greg Price
e1de25e128 Update OpenID dialog text 
We want to indicate more clearly that the information that we transmit
to the third party is governed by their terms of service and privacy
policy.
 2014-04-08 16:43:38 -04:00
Dave St.Germain
e5d7976867 Merge pull request #2775 from edx/dcs/wiki-no-middleware 
Refactored course_nav middleware to isolate the django-wiki hack, remove unnecessary code, and clarify what it's doing.
 2014-04-08 15:51:17 -04:00
Julia Hansbrough
d71aa87748 Revert refund instruction message 2014-04-08 19:34:55 +00:00
Dave St.Germain
660244201f Refactored course_nav middleware to isolate the django-wiki hack, 
remove unnecessary code, and clarify what it's doing.
 2014-04-08 15:24:48 -04:00
John Jarvis
b591455d7a Merge pull request #3261 from edx/jarv/limit-to-active-users 
Only display active users for the certificate report
 2014-04-08 15:22:22 -04:00
John Jarvis
ff8c14e88d Only display active users for the certificate report 
Also removes the unnecessary pre-fetch.
For certificate generations we will continue to generate certs for
both active and inactive users.

For the report we only display active users since it was confusing
due to the instructor dashboard only displaying active users.
 2014-04-08 13:30:53 -04:00
Sarina Canelake
9a352b9125 Unicode support for course names in reverification flow 2014-04-08 13:11:41 -04:00
Sarina Canelake
034105d2e7 Put mailto and em tags outside i18n strings 
Signup modal

Contact us form

courseware-error message
 2014-04-08 13:09:08 -04:00
Sarina Canelake
2d08b3a394 Fix i18n'd strings to be easier for translators to understand 
Signup modal

Just translate discussion sr text

Markdown editor help

Help modal and reverify dash
 2014-04-08 13:09:07 -04:00
David Baumgold
b18a06751c Merge pull request #3238 from marcore/master 
The link to TECH_SUPPORT_EMAIL should have a mailto: protocol !
 2014-04-08 13:05:29 -04:00
Chris Dodge
a904fa09bd Revert "updated pdf viewer" 
This reverts commit b0a7443570.
 2014-04-08 12:59:04 -04:00
polesye
6c72cce59e Disable flaky acceptance tests. 2014-04-08 17:23:35 +03:00
Anton Stupak
f2dd6eac24 Merge pull request #3247 from edx/anton/disable-flaky-video-test 
Disable flaky acceptance test.
 2014-04-08 16:20:25 +03:00
polesye
a9b26afd7b Disable flaky test. 2014-04-08 15:40:32 +03:00
Oleg Marshev
015bd57d02 Remove double quoting. 2014-04-08 15:21:31 +03:00
Oleg Marshev
8a2024241e Add context_id. 2014-04-08 14:09:52 +03:00
Oleg Marshev
882a1e0f29 Change resource_link_id on import (BLD-768). 
LTI: Update resource_link_id to change on import to another system or context (BLD-768).
 2014-04-08 13:03:22 +03:00
Valera Rozuvan
668c476acb Add auto screenshot functionality. 2014-04-08 10:41:39 +03:00
Sarina Canelake
c51d418163 Merge pull request #3235 from edx/sarina/040714-language-update 
Sarina/040714 language update
 2014-04-07 14:44:41 -04:00
Dave St.Germain
25f722d35d Merge pull request #3212 from edx/dcs/log-codejail 
This should enable logging of codejail on prod
 2014-04-07 14:14:02 -04:00
Sarina Canelake
d7f499f276 Don't pull unreviewed languages from Transifex 2014-04-07 13:19:25 -04:00
Graham Lowe
5e0849d214 Temporarily disable CAPA problem "Check" button. 
- update appropriate jasmine tests so that stubbed $postWithPrefix
respects a subset of jQuery promise API.
- add customization for checking state.
- display checking state while button is disabled.
- ensure checking state lasts for at least a second.
 2014-04-07 13:17:43 -04:00