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

22441 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark Hoeber
8609345bc3 Merge pull request #3298 from edx/markhoeber/documentation/doc-79 
Fixed typo in drag & drop
 2014-04-09 17:29:49 -04:00
Mark Hoeber
581702e1cb Fixed typo in drag & drop 
numbers -> number
 2014-04-09 17:22:19 -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
Mark Hoeber
430827d394 Merge pull request #3286 from edx/markhoeber/documentation/doc-254 
Removal of JS input chapter
 2014-04-09 14:33:58 -04:00
Mark Hoeber
0abedac38f Removal of JS input chapter 
DOC-254
 2014-04-09 13:55:35 -04:00
srpearce
7154ecca9e Merge pull request #3266 from edx/sylvia/documentation/DOC-265 
Add info about accessing student progress through steps
 2014-04-09 12:11:01 -04:00
Sylvia Pearce
7c8dbcf53b Document Course Staff Information field 2014-04-09 12:09:17 -04:00
Anton Stupak
a84bca233f Merge pull request #3246 from edx/anton/i18n-lti 
LTI i18n
 2014-04-09 17:59:27 +03: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
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
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
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
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
Sylvia Pearce
8e08275b0c Remove "Appendix E" from doc title; add warning re: identical URLs for ORA 2014-04-08 12:16:52 -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
Valera Rozuvan
acff3cbe73 Update testing.md file. 
Added information on output folder for auto screenshots.
 2014-04-08 17:46:04 +03: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
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
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
Oleg Marshev
cd83906344 Merge pull request #3245 from edx/oleg/fix-doublequoting 
Fix doublequoting. BLD-812.
 2014-04-08 15:57:51 +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
d66e6cbcb7 Merge pull request #3052 from edx/oleg/add-context-id 
LTI context_id. BLD-584.
 2014-04-08 14:59:19 +03:00
Will Daly
08413afdfd Allow import of native XBlocks in draft 
Added tests for importing a pure XBlock
 2014-04-08 07:52:11 -04:00
Oleg Marshev
8a2024241e Add context_id. 2014-04-08 14:09:52 +03:00
Alexander Kryklia
be4e9cb576 Merge pull request #3040 from edx/oleg/fix-resource-link-id 
LTI resource_link_id. BLD-768.
 2014-04-08 13:54:45 +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