Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,558 Commits 1 Branch 0 Tags
7c02782f90934d201d94de8de368da56121d45cf
Commit Graph

10211 Commits

Author SHA1 Message Date
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
marcore
8c2f3fd744 The link to TECH_SUPPORT_EMAIL should have a mailto: protocol ! 2014-04-07 18:26:09 +02:00
Anton Stupak
1b28b6a7a7 Merge pull request #3215 from edx/anton/fix-test-video-position 
Video: Fix flaky test.
 2014-04-07 18:02:52 +03:00
Dave St.Germain
ad186e236e Merge pull request #2986 from edx/dcs/a11y-pdfreader 
Accessible PDF textbook viewer
 2014-04-07 10:32:28 -04:00
polesye
6a207714a3 BLD-970: Fix flaky test. 2014-04-07 17:03:40 +03:00
Jay Zoldak
d45cd90df1 Merge pull request #3218 from edx/zoldak/bok-choy-contentstore 
Fix the pointer to the contentstore in the bok-choy settings
 2014-04-05 20:21:58 -04:00
Filippo Valsorda
1ce7a24572 Make the SHOW_PROGRESS_SUCCESS_BUTTON feature more flexible 
The button text default is now in the template and i18n-able, a
PROGRESS_SUCCESS_BUTTON_TEXT_OVERRIDE option is offered in settings.
The button url now uses string formatting.
 2014-04-05 18:16:28 +02:00
Filippo Valsorda
da5ab6d222 Add SHOW_PROGRESS_SUCCESS_BUTTON feature 
Show a button at the top of lms/templates/courseware/progress.html if the
lowest nonzero grade cutoff has been reached. Introduce two settings:
PROGRESS_SUCCESS_BUTTON_URL is the href of that button (the course id is
appended); PROGRESS_SUCCESS_BUTTON_TEXT is the text, defaults to
"Download your certificate"
 2014-04-05 18:13:00 +02:00
chrisndodge
c407e89889 Merge pull request #2781 from edx/cdodge/password-history-enforcements 
Add some optional policies around password resets, such as password reus...
 2014-04-04 16:14:43 -04:00
Giulio Gratta
d2bac9bf8d Merge pull request #2552 from edx/giulio/edit-in-cms-links 
Add "View in Studio" links throughout LMS
 2014-04-04 11:25:28 -07:00
frances botsford
562875e635 Merge pull request #3184 from edx/frances/fix/lms-wiki-icons 
Remove double icons on LMS wiki page
 2014-04-04 13:32:37 -04:00
Giulio Gratta
3456c1173b Added "Edit in CMS" links throughout courseware 2014-04-04 10:23:51 -07:00
Jay Zoldak
72259b2fe1 Fix the pointer to the contentstore in the bok-choy settings 2014-04-04 12:30:09 -04:00
polesye
d55554705f BLD-958: Force video player in flash mode. 2014-04-04 14:53:14 +03:00
Usman Khalid
da470afc4f Merge pull request #3187 from edx/adam/fix-alter-xblock-student-state 
Adam/fix alter xblock student state
 2014-04-04 15:29:34 +05:00
Dave St.Germain
011a2fcf13 This should enable logging of codejail on prod 2014-04-03 16:33:37 -04:00
Usman Khalid
12c2e1bfee Test TemplateLookup dirs are not cleared during lms startup. 
LMS-2498
 2014-04-03 20:23:44 +05:00
Stephen Sanchez
751bd71a7b Merge remote-tracking branch 'origin/release' 2014-04-03 11:06:09 -04:00
Alexander Kryklia
70db47a73d Merge pull request #3201 from edx/alex/fix_971 
Fix flaky video test #21: increase timeout.
 2014-04-03 16:13:09 +03:00
Alexander Kryklia
668134de4a Merge pull request #3169 from edx/alex/fix_more_flaky_tests 
Alex/fix more flaky tests
 2014-04-03 15:34:18 +03:00
Alexander Kryklia
41695def9e Merge pull request #3136 from edx/alex/display_native_language_2 
Alex/display native language 2
 2014-04-03 15:06:04 +03:00
Alexander Kryklia
cf3e2c860b Fix flaky video tests: speed up youtube api loading and wait for controls. 2014-04-03 14:37:17 +03:00