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
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
Oleg Marshev
aeaddef301 Merge pull request #3917 from edx/oleg/add-span-tag-matlab 
Accept span tag from xqueue. BLD-1006.
 2014-05-30 12:02:07 +03:00
Oleg Marshev
daf4840cb6 Add span tag. 2014-05-30 10:30:23 +03:00
Nick Parlante
3ef1e0f7ad Temporarily disable capa name masking 
There is a bug I need to fix when a student re-visits a problem that they
had solved previously without masking enabled, their old state does not
load correclty.

It's simplest to turn off masking now, and re-enable it with the whole fix.

The change here is a small deletion to remove the masking=True logic, and more
lengthy changes to adjust the tests.
 2014-05-29 22:12:43 -07:00
Sarina Canelake
0a30f24e26 Merge pull request #3754 from theJohnnyBrown/empty-course-error 
show a friendly message for an empty course rather than an error page
 2014-05-29 21:07:42 -04:00
Sarina Canelake
5c9fe4bb7a Merge pull request #3929 from edx/sarina/lms-2786 
Fix location.url [LMS-2786]
 2014-05-29 21:01:46 -04:00
Sarina Canelake
0f2b4cd2b6 Merge pull request #3931 from edx/sarina/fixup-external-opaque-keys-impls 
Use external OpaqueKey implementations
 2014-05-29 18:23:08 -04:00
Sarina Canelake
e77dffcbcd Fix location.url [LMS-2786] 2014-05-29 18:01:29 -04:00
Johnny Brown
0bd2286e5b show a friendly message for an empty course rather than an error page 2014-05-29 16:55:40 -05:00
Andy Armstrong
5792e7e06a Fix the title of edit modals from the unit page. 2014-05-29 17:10:33 -04:00
Calen Pennington
cfcbdc0145 Move to OpaqueKey implementations from the external library 
[LMS-2757]
 2014-05-29 17:03:35 -04:00
Adam
b15f3f1951 Merge pull request #3841 from edx/fix/large-email-queries-2 
Fix/large email queries 2
 2014-05-29 16:37:25 -04:00
Will Daly
e69749c9df Merge pull request #3896 from edx/will/install-ease-and-requirements 
Install EASE and requirements
 2014-05-29 16:21:36 -04:00
Mark Hoeber
97bc71bd23 Welcome page text edits 2014-05-29 15:44:59 -04:00
Mark Hoeber
714f440353 Update help for welcome, register, and login pages 
All now go to getting started, but have different tokens, for further
segmenting later.
 2014-05-29 15:34:49 -04:00
Alison Hodges
85f1997fcb Merge pull request #3927 from edx/ahodges/documentation/DOC438 
corrected a typo; tried to clarify a different sentence
 2014-05-29 15:08:08 -04:00
muhammad-ammar
026c6523e8 Merge pull request #3882 from edx/ammar/test-youtube-availibility 
Check YouTube Availability for Video Tests
 2014-05-29 23:53:58 +05:00
Alison Hodges
7edcc2d16b corrected a typo; tried to clarify a different sentence 2014-05-29 14:43:10 -04:00
Carlos Andrés Rocha
a3360aa643 Updated version of event-tracking library to 0.1.0 2014-05-29 14:41:14 -04:00
Don Mitchell
85565a3de8 lms dashboard ignores errored courses 2014-05-29 14:38:42 -04:00
Andy Armstrong
138cd45934 Merge pull request #3819 from edx/andya/edit-containers 
Allow editing of container xblocks/xmodules
 2014-05-29 14:33:26 -04:00
Julia Hansbrough
172c6d1559 Merge pull request #3905 from edx/flowerhack/change-hardcoded-defaults 
Moved hardcoded defaults into settings
 2014-05-29 14:23:06 -04:00
Andy Armstrong
6b3e100cc1 Allow editing of container xblocks/xmodules 
STUD-1312
 2014-05-29 14:02:45 -04:00
Carson Gee
7cb241b8cc Merge pull request #3717 from mitocw/cg/studio_addl_apps 
Add ADDL_INSTALLED_APPS to studio for parity with lms
 2014-05-29 13:22:36 -04:00
David Adams
1f0c104786 Merge pull request #3871 from edx/dcadams/fix_metrics_tab_after_opaque_keys 
Fixes some stuff for metrics tab
 2014-05-29 09:43:46 -07:00
Alan Boudreault
031ac9852e Add mimetype additions in studio startup 2014-05-29 11:44:14 -04:00
lduarte1991
a4c912a05b Annotation Tools: Fixing tests for student_view 
Fixed typo from autocomplete

Fixed dict for tests
 2014-05-29 11:34:40 -04:00
lduarte1991
1d6f3c631d Annotation Tools: Load Tinymce in student_view 2014-05-29 11:34:40 -04:00
Alan Boudreault
57025cd5e6 Add missing mimetypes for xblock resources 2014-05-29 11:14:00 -04:00
Muhammad Ammar
7afcb9348c Check YouTube Availabitlity for Video Tests 2014-05-29 15:08:47 +00:00
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