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

8409 Commits

Author SHA1 Message Date
Jim Abramson
f5cfd1ef96 Merge pull request #3986 from edx/jsa/search-spell-correction 
Add support for search spell corrections to Forums UX.
 2014-06-05 15:14:00 -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
cahrens
5ab61fc4b2 Implement a custom editor for the split_module. 
STUD-1529
 2014-06-05 12:16:16 -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
c08831b4b6 Merge pull request #3974 from edx/zoldak/fix-translation-tags 
Fix some translation tags
 2014-06-03 18:15:21 -04:00
Jay Zoldak
ac17e809ee Fix some translation tags 2014-06-03 15:50:11 -04:00
Greg Price
6ab6b72c86 Merge pull request #3941 from edx/gprice/handle-invalid-json 
Improve handling of bad JSON from comments service
 2014-06-03 14:13:29 -04:00
Will Daly
b700dc0cca Merge pull request #3939 from edx/will/ora2-ai-grading-settings 
ORA2 AI Grading Settings
 2014-06-03 14:06:47 -04:00
Greg Price
dc2342859e Improve handling of bad JSON from comments service 
Instead of allowing the JSONDecodeError to escape, raise an error
indicating the request id and containing the first 100 characters
of the response to aid investigation.
 2014-06-03 13:34:36 -04:00
Will Daly
5f7520e121 Add AI algorithm configuration to LMS settings 
Added ORA2_FILE_PREFIX setting
 2014-06-03 11:49:56 -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
Greg Price
0d37b4b254 Merge branch 'release' 
Conflicts:
	cms/djangoapps/contentstore/tests/test_course_listing.py
	common/djangoapps/student/management/commands/create_random_users.py
	common/lib/xmodule/xmodule/modulestore/loc_mapper_store.py
	lms/djangoapps/bulk_email/forms.py
	lms/djangoapps/courseware/tests/test_video_handlers.py
	lms/djangoapps/courseware/views.py
	lms/djangoapps/instructor/management/commands/openended_post.py
	lms/djangoapps/instructor/management/commands/openended_stats.py
	lms/djangoapps/instructor/tests/test_spoc_gradebook.py
 2014-06-02 15:29:40 -04:00
muhammad-ammar
fd18165bbe Merge pull request #3682 from edx/ammar/bok-choy-video-tests-batch9 
Bok-Choy Video Tests Batch9
 2014-06-02 21:20:13 +05:00
lduarte1991
b83e27fc9d Diacritic Plugin for Annotator Tool: Pull-request Fixes 
Making sure extension comes after annotator css
 2014-06-02 10:45:29 -04:00
lduarte1991
de5edcffbb Diacritic Plugin for Annotator TooL: Added CSS and JS files 
- UI Fixes for Diacritic Mark Plugin
 2014-06-02 10:45:29 -04:00
Muhammad Ammar
d9fe111c5b Bok-Choy Video Tests Batch9 2014-06-02 11:48:40 +00:00
Waheed Ahmed
cc36162df1 Fixed links for units loaded via ajax. 
LMS-2711
 2014-06-02 14:19:19 +05: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
30dd47a62c Merge pull request #3907 from lduarte1991/lduarte-harvardx-image2 
Annotation Tools: Load Tinymce in student_view
 2014-05-30 10:51:46 -04: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
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
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
lduarte1991
1d6f3c631d Annotation Tools: Load Tinymce in student_view 2014-05-29 11:34:40 -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
Julia Hansbrough
0d854bd51e Moved hardcoded defaults into settings 2014-05-28 20:44:26 +00: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
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
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