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

28558 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
zubair-arbi
adbb9f9562 Merge pull request #3216 from edx/zub/bugfix/std1506-savedate 
save dates on enter key press
 2014-04-09 18:51:25 +05:00
chrisndodge
718bca63b7 Merge pull request #3279 from edx/waheed/lms2521-staff-grading-panel-broken-fixed 
Fixed import of "dog_stats_api" in staff_grading_service.py.
 2014-04-09 09:37:15 -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
Valera Rozuvan
fc84fd75cf Merge pull request #3273 from edx/valera/hendrixx 
Tweaking automatic screenshots in acceptance tests.
 2014-04-09 14:34:00 +03:00
Oleg Marshev
38bd00b2ba Merge pull request #3277 from edx/oleg/custom-params-fix 
Do not allow user overwrite some LTI parameters using custom parameters field. BLD-989.
 2014-04-09 14:23:21 +03:00
polesye
c0110c2ba6 Removed unused helpers. 2014-04-09 12:16:22 +03:00
polesye
192af7a8e0 Update docstrings. 2014-04-09 12:16:22 +03: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
Valera Rozuvan
b2543bfa95 Tweaking automatic screenshots in acceptance tests. 2014-04-09 11:37:32 +03:00
Oleg Marshev
c515b9cb38 Remove params from list. 2014-04-09 11:35:59 +03:00
zubiar-arbi
0b884cc3b8 save dates on enter key press 
STUD-1506
 2014-04-09 13:02:11 +05:00
Waheed Ahmed
363c38a84b Merge pull request #3232 from edx/waheed/stud1283-added-message-when-timeout-on-import 
Warning message changed for course import when timeout.
 2014-04-09 12:45:01 +05:00
Waheed Ahmed
09972c7973 Message changed for course import when timeout. 
STUD-1283
 2014-04-09 11:54:06 +05:00
Greg Price
4b25f4e62f Merge pull request #3270 from edx/gprice/openid-dialog-text 
Update OpenID dialog text
 2014-04-08 17:59:52 -04:00
Ned Batchelder
5673a6a99b Merge pull request #3268 from edx/ned/fix-terman-name 
Fix Chris Terman's email address
 2014-04-08 16:48:51 -04: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
Ned Batchelder
db747dfd81 Fix Chris Terman's email address 2014-04-08 15:52:55 -04:00
Julia Hansbrough
745924b7ab Merge pull request #3265 from edx/flowerhack/refund-message-patch 
Revert refund instruction message
 2014-04-08 15:52:34 -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
srpearce
344a6d13ae Merge pull request #3260 from edx/sylvia/documentation/DOC-228 
Remove "Appendix E" from doc title; add warning re: identical URLs for O...
 2014-04-08 14:55:12 -04:00
Sylvia Pearce
9e82f4c6ad Small correction 2014-04-08 14:54:26 -04:00
Sarina Canelake
0d1545a8e1 Merge pull request #3214 from edx/sarina/remove-weird-i18n-strings 
Sarina/remove weird i18n strings
 2014-04-08 14:01:13 -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
Sylvia Pearce
8e08275b0c Remove "Appendix E" from doc title; add warning re: identical URLs for ORA 2014-04-08 12:16:52 -04:00
Diana Huang
9c0ec682af Merge pull request #3256 from edx/diana/fix-grading-service-login 
Return correct response when using _try_with_login
 2014-04-08 12:02:40 -04:00
Christina Roberts
550f9d7e0b Merge pull request #3244 from edx/christina/latex-bug-release 
Fix source editor for the case of no CodeMirror editor.
 2014-04-08 11:43:18 -04:00
Sarina Canelake
d296eea6a8 Merge pull request #3253 from edx/sarina/fix-capa-calls 
Explicitly declare `tags` in dog stats increment calls
 2014-04-08 11:30:55 -04:00
Anton Stupak
ac49101eb3 Merge pull request #3252 from edx/anton/disable-flaky-acceptance-tests 
Video: Disable flaky acceptance tests.
 2014-04-08 18:21:41 +03:00
Diana Huang
ef3a2b8545 Use the correct response when using login. 2014-04-08 11:18:55 -04:00
Valera Rozuvan
acff3cbe73 Update testing.md file. 
Added information on output folder for auto screenshots.
 2014-04-08 17:46:04 +03:00
cahrens
e008de88e6 Fix source editor for the case of no CodeMirror editor. 
In the HTML component, there is no longer a tabbed CodeMirror Editor. STUD-1516.
 2014-04-08 10:43:33 -04:00
Sarina Canelake
f617047f28 Explicitly declare tags in dog stats increment calls 2014-04-08 10:38:14 -04:00
Valera Rozuvan
e7a2349cdc Update testing.md file. 
How to better debug acceptance tests in local Vagrant dev.
 2014-04-08 17:32:04 +03:00
polesye
6c72cce59e Disable flaky acceptance tests. 2014-04-08 17:23:35 +03:00
Stephen Sanchez
3f0a40513e Updating ORA2 requirements for patch fix 2014-04-08 10:11:42 -04:00
Stephen Sanchez
7e8d92069f Merge pull request #3248 from edx/sanchez/ora2-2014-04-08 
Updating ORA2 requirements for patch fix
 2014-04-08 10:10:41 -04:00
Will Daly
ffeb2f22bc Merge pull request #3242 from edx/will/studio-import-private-fix 
Allow import of native XBlocks in draft
 2014-04-08 10:02:31 -04:00
Stephen Sanchez
3f184082f5 Updating ORA2 requirements for patch fix 2014-04-08 09:29:09 -04:00