Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,365 Commits 1 Branch 0 Tags
2c83dc3f09b49d740407daaffe05ab8fd549ed8a
Commit Graph

24365 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Alison Hodges
eacdc3b6ec Merge pull request #3842 from edx/ahodges/documentation/LMS2748 
Updates to problem location for opaque keys
 2014-05-28 08:11:55 -04:00
Waheed Ahmed
5ba3acb3cf Merge pull request #3847 from edx/waheed/cheatsheet-code-refactor 
Cheatsheet visibility code refactored.
 2014-05-28 14:35:25 +05:00
Waheed Ahmed
6ad6f77ca2 Cheatsheet visibility code refactored. 2014-05-28 12:07:59 +05:00
Julia Hansbrough
b2656bb24e Merge pull request #3891 from edx/flowerhack/changelog 
Updated changelog
 2014-05-27 17:18:27 -04:00
Julia Hansbrough
7467e6cde0 Updated changelog 2014-05-27 21:17:02 +00:00
Diana Huang
779480ba39 Merge pull request #3889 from edx/diana/fix-gen-cert 
Fix gen_cert_report to use CourseKeys.
 2014-05-27 17:10:24 -04:00
Fred Smith
797a1643ec Merge pull request #3890 from edx/derf/parameterize_cms_migrations 
copied from LMS aws_migrate settings
 2014-05-27 16:39:03 -04:00
Diana Huang
019374a41e Fix gen_cert_report to use CourseKeys. 2014-05-27 16:13:45 -04:00
Fred Smith
a5daa10eda copied from LMS aws_migrate settings 2014-05-27 16:06:29 -04:00
clytwynec
ddfffdafc0 Merge pull request #3859 from edx/clytwynec/rake2paver-quality-take2 
Clytwynec/rake2paver quality take2
 2014-05-27 12:52:02 -04:00
Don Mitchell
9d2db736df Merge pull request #3869 from edx/dhm/bug_get_children 
Redirect most studio access through draft modulestore
 2014-05-27 11:57:15 -04:00
Sarina Canelake
0a909a9b24 Merge pull request #3868 from edx/sarina/inst-dash-cleanup 
Make SPOC gradebook an API feature
 2014-05-27 11:53:29 -04:00
Greg Price
f25dd8dd8b Merge pull request #3888 from edx/dhm/bug_get_children 
Redirect most studio access through draft modulestore
 2014-05-27 11:51:50 -04:00
Ned Batchelder
465b2bb7f8 Merge pull request #3887 from edx/ned/add-authors 
Add some missing AUTHORS
 2014-05-27 11:24:40 -04:00
Don Mitchell
1be1283f26 Redirect most studio access through draft modulestore 
rather than have caller figure out whether to call draft or direct.
Fixes get_children to always find draft children in studio.
STUD-1662
 2014-05-27 11:16:29 -04:00
Greg Price
c0e1c21c35 Merge pull request #3874 from edx/sarina/opaque-keys-cleanup 
Sarina/opaque keys cleanup
 2014-05-27 11:12:05 -04:00
Sarina Canelake
1cd94cf5e5 Remove gradebook code from legacy.py (moved to instructor/views/api.py) 2014-05-27 10:59:16 -04:00
Sarina Canelake
1a4fcb055b Make SPOC gradebook an API implementation 
rather than just hacked in to the instructor_dashboard base file.
Also move the tests from the legacy implementation to the new dash API implementation.
 2014-05-27 10:59:16 -04:00
Ned Batchelder
0a230d93cd Add some missing AUTHORS 2014-05-27 10:56:39 -04:00
Sarina Canelake
736c316ad5 Merge pull request #3884 from edx/sarina/052714-translations 
Update translations
 2014-05-27 10:35:16 -04:00