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

23589 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Patterson
1b67aebbe5 Run bundle clean after bundle install 
Running it beforehand was resulting in a corrupted state
if it was the first time bundle install was run.
 2014-05-30 07:40:18 -04:00
Ben Patterson
f9bae3c420 Ensure no old gems are left behind between test runs. 2014-05-29 07:43:37 -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
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
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
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
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
Anton Stupak
29ec66facd Merge pull request #3885 from edx/anton/fix-video-outline 
Remove Video player outline.
 2014-05-27 16:41:30 +03:00
Diana Huang
eb8f696964 Merge pull request #3886 from edx/diana/clean-up-outdated-files 
Remove some outdated code.
 2014-05-27 09:35:22 -04:00
Andy Armstrong
6b64b157a8 Merge pull request #3877 from louyihua/translation-fix-cms 
i18n: Make XBlock buttons & components have localizable display names
 2014-05-27 09:06:37 -04:00
Andy Armstrong
c5d23b4aa7 Merge pull request #3876 from louyihua/localization-fix-video 
i18n: Fix an i18n string extraction problem in 02_html5_video.js
 2014-05-27 09:05:48 -04:00
muhammad-ammar
fb16e013fd Merge pull request #3694 from edx/ammar/bok-choy-video-time-tests 
Bok-Choy Video Time Tests
 2014-05-27 17:08:21 +05:00
polesye
dc818d41a0 BLD-975: Remove Video player outline. 2014-05-27 15:04:28 +03:00
Anton Stupak
5d03cad700 Merge pull request #3883 from edx/anton/fix-youtube-regexp 
Fix youtube regular expression in video player editor
 2014-05-27 14:48:24 +03:00
Muhammad Ammar
510d0ae153 Bok-Choy Tests for Video Start Time, End Time and Finish Time 2014-05-27 10:37:26 +00:00
polesye
db213bf325 BLD-967: Fix regExp. 2014-05-27 13:31:18 +03:00
louyihua
1208908b57 i18n: Fix an i18n string extraction error in 02_html5_video.js 
Replace a string concation to a single string to prevent the partial extraction of the string.
 2014-05-27 12:59:23 +08:00
louyihua
559a2c8888 i18n: Make XBlock buttons & components have localizable display names 
1. Current code uses type name as the display names for XBlock buttons, so the name of these five buttons can't be localized. This fix contains code that adds a 'display_name' field for the buttons, and makes their names localizable.
2. The display names of components in advanced, html and problem types can be localized now.
 2014-05-27 11:16:54 +08:00
Andy Armstrong
926ce567a6 Merge pull request #3878 from louyihua/master 
i18n: More extractable & localizable strings in xmodules
 2014-05-26 15:08:14 -04:00
Anton Stupak
c08e21c391 Merge pull request #3678 from edx/anton/refactor-volume-control 
Video: refactor volume control.
 2014-05-26 12:04:30 +03:00
louyihua
63ef3bd05a i18n: More extractable & localizable strings in xmodules 2014-05-26 15:30:01 +08:00
polesye
8c26fc6805 Refactor video volume control. 2014-05-26 09:48:27 +03:00
louyihua
f048a58408 i18n: Make values that has 'display_name' be displayed localized in editor 
Dictionary values like Boolean, or some other value types which has 'display_name' can now be displayed with the localized version.
 2014-05-25 14:27:41 +08:00