Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,986 Commits 1 Branch 0 Tags
dffd8648b3e464bdb45458f18f87cc217432c653
Commit Graph

27986 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Will Daly
e11cb4a34d Add EASE to edx-platform requirements 2014-05-29 11:04:20 -04:00
Don Mitchell
701eac33ec get_courses doesn't return ErrorDescriptor 2014-05-29 11:01:56 -04:00
Jay Zoldak
721732bf27 Merge pull request #3920 from edx/zoldak/increase-test-async-timeout 
Increase async script timeout in lettuce tests
 2014-05-29 10:44:37 -04:00
Jay Zoldak
e16fb6a630 Merge pull request #3921 from edx/zoldak/increase-test-wait-for-default-timeout 
Increase the default timeout for waiting in lettuce tests
 2014-05-29 10:43:57 -04:00
Calen Pennington
a2ce703327 Don't access course.id on ErrorDescriptors when listing courses from mongo 2014-05-29 10:25:32 -04:00
Calen Pennington
81d785d192 Merge pull request #3862 from cpennington/external-opaque-keys 
Extract opaque_keys into a separate library
 2014-05-29 10:21:48 -04:00
Don Mitchell
c37e241230 Make reverse matching robust to errored courses 
Conflicts:
	cms/djangoapps/contentstore/tests/test_course_listing.py
 2014-05-29 10:17:24 -04:00
David Baumgold
502b285bc2 Merge pull request #3893 from louyihua/tinymce-ie-fix 
Make TinyMCE's HTML source code editor work under Internet Explorer
 2014-05-29 10:13:15 -04:00
Jay Zoldak
40884a5085 Increase the default timeout for waiting in lettuce tests 2014-05-29 09:35:51 -04:00
Alison Hodges
6ddc3761d2 Merge pull request #3909 from edx/ahodges/documentation/DOC362 
DOC-362, another set of students who don't get email
 2014-05-29 09:15:12 -04:00
Adam Palay
5b769df452 No longer chunk queries when sending out bulk email (LMS-2718) 
refactor _generate_items_for_subtask not to chunk queries

use django's iterator methor for querysets

remove bulk email query settings

use read_replica if available, since this is read-only

update changelog
 2014-05-29 09:10:25 -04:00
David Baumgold
0f580a7e46 Merge pull request #3892 from louyihua/ie-fix 
Fix exception on Internet Explorer when adding first transcript language
 2014-05-29 09:09:05 -04:00
Jay Zoldak
11fbaa19bf Increase async script timeout in lettuce tests 2014-05-29 09:05:31 -04:00
Anton Stupak
50e820db4e Merge pull request #3916 from edx/anton/fix-choice-text-response 
Fix ChoiceTextResponse.
 2014-05-29 15:56:30 +03:00
jmclaus
223ef2f9cf Merge pull request #3918 from edx/jmclaus/i18n-javascript-response 
JavascriptResponse i18n.
 2014-05-29 14:39:52 +02:00
jmclaus
f45dc94930 JavascriptResponse i18n. [BLD-737] 2014-05-29 13:49:04 +02:00
Ben Patterson
f9bae3c420 Ensure no old gems are left behind between test runs. 2014-05-29 07:43:37 -04:00
Usman Khalid
eceb8318f9 Merge pull request #3833 from edx/usman/lms2738-verify-student-urls 
Added trailing slashes to verify_student app urls.
 2014-05-29 16:22:00 +05:00
Usman Khalid
3aa4598956 Merge pull request #3879 from edx/usman/lms2747-anonymous-ids-collection 
Do not persist anonymous ids when exporting for all students of a course.
 2014-05-29 16:18:43 +05:00
Anton Stupak
79a0cd2445 Merge pull request #3902 from edx/anton/i18n-choice-group 
ChoiceGroup  i18n.
 2014-05-29 11:47:09 +03:00
polesye
1f7d59de5b BLD-1103: Fix ChoiceTextResponse. 2014-05-29 11:03:15 +03:00
louyihua
7df6f3e275 i18n: Make .underscore files translatable 
Currently the strings in .underscore files are not extracted
by i18n/extract.py, which causes most strings in such files
are not translatable. As there is no existing tools which can
extract messages from these files, a simple shell command is
written to do such job.
 2014-05-29 16:01:05 +08:00
louyihua
c0511bd1a9 Build 'window.location.origin' for Internet Explorer 
As TinyMCE's CodeMirror plug-in uses 'window.location.origin' which is not supported by Internet Explorer, the HTML or raw code editor does not work under Internet Explorer.
We need to create one in order to make these vendor codes work under Internet Explorer.
 2014-05-29 12:50:11 +08:00
David Adams
9818cc7c66 Fixes some stuff in metrics tab 
Fixes some 500s after opaque-keys
  Adds a test which would have caught the 500s
  Fixes Transifex problem on the string % of students
 2014-05-28 17:31:32 -07:00
Matjaz Gregoric
b755863639 Don't hardcode https protocol in enrollment emails. 
Use http or https, depending on the value of `request.is_secure()`.
That is how links in most other emails are handled.
 2014-05-28 22:44:42 +02:00
Julia Hansbrough
0d854bd51e Moved hardcoded defaults into settings 2014-05-28 20:44:26 +00:00
Alison Hodges
9cc5cf0e62 Merge pull request #3910 from edx/ahodges/documentation/images 
Two image references incorrectly preceded by a comment
 2014-05-28 16:28:59 -04:00
Alison Hodges
11a62326e1 Two image references incorrectly preceded by a comment 2014-05-28 16:22:51 -04:00
Alison Hodges
c6b18f90f1 DOC-362, another set of students who don't get email 2014-05-28 16:03:29 -04:00
Dave St.Germain
0173eaf9d2 Updated payload for new matlab endpoint. 2014-05-28 15:32:46 -04:00
Dave St.Germain
964e73f053 Allow courses to set Matlab API key globally, in advanced settings. 2014-05-28 15:32:46 -04:00
David Adams
54e1faea47 Merge pull request #3394 from edx/dcadams/parse_query_params 
Parse urls with query params for ^/static
 2014-05-28 10:59:54 -07:00
jmclaus
ac26130ef7 Merge pull request #3897 from edx/jmclaus/i18n_image_response 
i18n of Image Response [BLD-723]
 2014-05-28 19:35:57 +02:00
David Adams
384bac2f0e Parse urls with query params for ^/static 
Query params with a value that starts with /static should have their values converted to the full location.
  Query params with a value that does not start with /static should be left unchanged.
 2014-05-28 10:21:55 -07:00
jmclaus
d6a54c697d i18n of Image Response [BLD-723] 2014-05-28 18:37:16 +02:00
Don Mitchell
ca66d98236 Merge pull request #3900 from edx/dhm/test_has_course 
Add tests for has_course
 2014-05-28 11:56:32 -04:00
Don Mitchell
eeac479c02 Merge pull request #3901 from edx/dhm/opaque-dont-skip 
Dhm/opaque dont skip
 2014-05-28 11:56:03 -04:00
Usman Khalid
3824e234fe Do not persist anonymous ids when exporting for all students of a course. 
For large courses this causes export to take a long time and to time out.

LMS-2747
 2014-05-28 20:48:43 +05:00
louyihua
551301a7ac Fix exception on Internet Explorer when adding first transcript language 
Internet Explorer throws an "Invalid argument" exception when uses an empty string as the parameter in ```namedItem``` method.
Change empty string into null value can maintain browser consistency.
 2014-05-28 23:44:50 +08:00
Calen Pennington
ed7a631c80 Extract opaque_keys into a separate library 
[LMS-2571]
 2014-05-28 11:40:19 -04:00
muhammad-ammar
8809c5f0e0 Merge pull request #3487 from edx/ammar/fix-paver-python-prereq-paths 
Fix paver python prereq paths
 2014-05-28 20:17:19 +05:00
Alison Hodges
1208f27102 Merge pull request #3903 from edx/ahodges/documentation/data_chg_log 
Fixed change log table format & pdf errors
 2014-05-28 11:06:35 -04:00
Andy Armstrong
9148d2e1ff Merge pull request #3875 from louyihua/translation-fix 
i18n: Make values that has 'display_name' be displayed localized in editor
 2014-05-28 10:59:04 -04:00
Alison Hodges
e34cff4fb3 Fixed change log table format & pdf errors 2014-05-28 10:26:47 -04:00
polesye
71b90a918d BLD-725: ChoiceGroup i18n. 2014-05-28 16:03:14 +03:00
Don Mitchell
58198b91d4 Merge pull request #3899 from edx/opaque-keys 
Opaque keys
 2014-05-28 08:58:01 -04:00
Don Mitchell
62e7ecc5dd Merge pull request #3745 from edx/dhm/no-package-id 
Dhm/no package
 2014-05-28 08:37:08 -04:00
Don Mitchell
c536846291 Add tests for has_course 
and negative tests for get_course.
 2014-05-28 08:34:44 -04:00
Don Mitchell
62bccd4e93 Split mongo correctly serializes and deserialized references 
STUD-1592, STUD-1603, LMS-2642
 2014-05-28 08:29:13 -04:00
Don Mitchell
4944cc763b Get rid of skiptests 2014-05-28 08:20:17 -04:00