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

14265 Commits

Author SHA1 Message Date
Sarina Canelake
749cb4ee7d Merge pull request #4031 from edx/sarina/other-ok-fixes 
Sarina/other ok fixes
 2014-06-09 15:18:13 -04:00
Sarina Canelake
bf6c342dcf Fix location.url [LMS-2786] 2014-06-09 15:17:20 -04:00
Diana Huang
baf0cee0be Fix gen_cert_report to use CourseKeys. 2014-06-09 15:17:13 -04:00
Sarina Canelake
a9cad6a5bb Fix logging bug in openended grading 2014-06-09 15:16:18 -04:00
Julia Hansbrough
3a9f0b3f74 Fix import 2014-06-09 15:13:31 -04:00
Don Mitchell
acc02b0e09 Fix to excess asset query 2014-06-09 15:13:23 -04:00
Julia Hansbrough
ade82c2d05 Notes convert course_id to course_key 2014-06-09 15:12:23 -04:00
Diana Huang
729f0eb203 Fix variable name. 2014-06-09 15:10:48 -04:00
Don Mitchell
2c6437a279 Fix performance regression 
Remove course_from_id
don't fetch whole course when the root will do
don't fetch even the root if the id will do
check for definition.data == null
 2014-06-09 15:10:47 -04:00
Joe Blaylock
fa9a022cca Merge pull request #4016 from edx/jrbl/bugfix_lxml_flattening 
Bugfix certificates request queue HTML flattening
 2014-06-06 11:10:33 -07:00
Julia Hansbrough
d2b2699166 Merge pull request #3969 from lduarte1991/lduarte-harvardx-pr2 
Annotation Tool: Urgent update for ChinaX AB Testing
 2014-06-06 13:55:10 -04:00
Ned Batchelder
ec5aee2949 Remove duplicates in a class list so tests aren't duplicated 2014-06-06 13:17:36 -04:00
Joe Blaylock
277dcb1113 Bugfix certificates request queue HTML flattening 2014-06-06 09:31:46 -07:00
lduarte1991
9c0d14ea2b Annotator Tools: OpaqueKeys update for Notes 2014-06-05 15:53:26 -04:00
jsa
58c5066e66 Add support for search spell corrections to Forums UX. 
Co-authored-by: Brian Talbot <btalbot@edx.org>

JIRA: FOR-591
 2014-06-05 15:00:29 -04:00
polesye
7b2d67f209 BLD-1049: Allow the video player to work with redirected links. 2014-06-05 09:34:54 +03:00
Jay Zoldak
ac17e809ee Fix some translation tags 2014-06-03 15:50:11 -04:00
Julia Hansbrough
136bcb2911 Merge pull request #3934 from edx/flowerhack/handout-error-logs 
Removed excessive logging
 2014-06-03 09:30:31 -04:00
Adam
f832011335 Merge pull request #3956 from edx/adam/user-id-profile-information 
adds user id to student profile information (LMS-2791)
 2014-06-03 09:04:36 -04:00
Julia Hansbrough
e1688e2a42 Removed excessive logging 2014-06-02 20:02:25 +00:00
Adam Palay
a2b2b37ed7 adds user id to student profile information (LMS-2791) 2014-06-02 15:49:46 -04:00
Muhammad Ammar
d9fe111c5b Bok-Choy Video Tests Batch9 2014-06-02 11:48:40 +00:00
Waheed Ahmed
cb2af13418 Fixed staff debug info endpoints for staff member. 
LMS-2737
 2014-06-02 12:26:27 +05:00
Julia Hansbrough
6ccb11f03e Change Location, CourseLocator, etc to reference opaque-keys library 2014-05-30 20:32:38 +00:00
David Baumgold
0c9d682df3 Merge pull request #3196 from mtyaka/enrollment-emails-http 
Don't hardcode https protocol in enrollment emails.
 2014-05-30 09:30:43 -04: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
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
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
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
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
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
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
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
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
Diana Huang
019374a41e Fix gen_cert_report to use CourseKeys. 2014-05-27 16:13:45 -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
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
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
Muhammad Ammar
510d0ae153 Bok-Choy Tests for Video Start Time, End Time and Finish Time 2014-05-27 10:37:26 +00:00
Usman Khalid
1ecfac3f84 Added trailing slashes otherwise the course_id regex sometimes eats up get parameters. 
LMS-2738
 2014-05-26 15:50:23 +05:00
Julia Hansbrough
78ed9e9512 Fixed some TODOs, removed irrelevant ones 2014-05-24 19:36:24 -04:00
Sarina Canelake
46d7f99004 StaffFactories accept course_keys, not courses. Make that clear in the interface. 2014-05-24 19:36:18 -04:00