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

23135 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Calen Pennington
16faafded9 Fix ssl redirection test 2014-05-13 14:13:45 -04:00
Calen Pennington
a247bb7b9e Fix StaffDebug javascript tests 2014-05-13 12:57:22 -04:00
Calen Pennington
6fcf65ef62 Fix staff debug view 2014-05-13 11:58:56 -04:00
Calen Pennington
484c529d99 Merge remote-tracking branch 'edx/opaque-keys' into opaque-keys-merge-master 2014-05-13 10:23:24 -04:00
Don Mitchell
741cdf9557 Merge pull request #3688 from edx/dhm/opaque-keys-bugs 
Dhm/opaque keys bugs
 2014-05-12 17:06:10 -04:00
Calen Pennington
37b1a2f738 Remove calls to loc_mapper 2014-05-12 16:34:53 -04:00
Don Mitchell
45e8984997 Merge pull request #3530 from edx/dhm/opaque-locator 
Make Locators comply with UsageKey accessors
 2014-05-12 16:26:12 -04:00
Don Mitchell
bf8ca487bb fix staff_grading server error 2014-05-12 16:25:27 -04:00
Julia Hansbrough
66bbe17e86 Merge pull request #3687 from edx/flowerhack/fix-discussion-opaque 
Flowerhack/fix discussion opaque
 2014-05-12 15:45:48 -04:00
Don Mitchell
ded28af8b4 Make Locators comply with UsageKey accessors 2014-05-12 15:35:54 -04:00
Calen Pennington
a4df0e1515 Fix failing tests 2014-05-12 14:45:38 -04:00
Julia Hansbrough
f6f802f3db Pass deprecated course keys through 2014-05-12 18:35:40 +00:00
Don Mitchell
2f8d7e8cbe Fix @feanil Traceback from Logs(TypeError: 'SlashSeparatedCourseKey' object is not iterable) 2014-05-12 12:29:06 -04:00
Don Mitchell
6d7fe5619a Merge pull request #3675 from edx/opaque-keys-migrate 
Opaque keys migrate
 2014-05-12 12:10:48 -04:00
Don Mitchell
75280e8577 fixup! Migration refactoring 2014-05-12 12:02:16 -04:00
Don Mitchell
2238ce2cda Let sql tell us if the data is unique 2014-05-12 11:55:35 -04:00
Don Mitchell
7b70c4b8da Migration refactoring 2014-05-12 11:55:35 -04:00
Calen Pennington
85ca7db7a6 Fix merge conflicts relative to master 2014-05-12 11:42:21 -04:00
Calen Pennington
19acdd31e8 Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master 
Conflicts:
	cms/djangoapps/contentstore/views/public.py
	common/djangoapps/external_auth/tests/test_ssl.py
	common/djangoapps/student/views.py
	lms/djangoapps/dashboard/sysadmin.py
	lms/templates/notes.html
 2014-05-12 11:35:03 -04:00
Calen Pennington
94c8d86a42 Fix failing tests from merge with master 2014-05-12 11:34:39 -04:00
Calen Pennington
b8f669eb09 Merge pull request #3669 from cpennington/opaque-keys-fix-discussion-tests 
Fix discussions by correctly serializing outgoing course_ids
 2014-05-12 11:10:10 -04:00
Anton Stupak
d37006c657 Merge pull request #3681 from edx/anton/fix-video-tests 
Video: Fix acceptance tests.
 2014-05-12 17:07:08 +03:00
polesye
2d64a2773f Fix acceptance tests. 2014-05-12 16:22:05 +03:00
Anton Stupak
839887246c Merge pull request #3643 from edx/anton/fix-video-in-ff 
Anton/fix video in ff
 2014-05-12 10:24:47 +03:00
David Ormsbee
77c7ebd704 Merge pull request #2768 from carsongee/cg/ssl-next-url 
Modified ssl certificate authentication to handle next redirection
 2014-05-11 20:12:12 -04:00
Sarina Canelake
b7003a1d76 Merge pull request #3672 from edx/sarina/fix-unicode 
Remove unicode character inserted into video_xfields
 2014-05-09 16:57:12 -04:00
Calen Pennington
cbcb1059a3 fixup! Fix discussions by correctly serializing outgoing course_ids 2014-05-09 16:47:39 -04:00
Julia Hansbrough
0e07c27d03 Merge pull request #3674 from edx/flowerhack/fix-ora 
Flowerhack/fix ora
 2014-05-09 16:45:37 -04:00
ichuang
34c28cf42d Merge pull request #3068 from edx/fix/ichuang/capa-customresponse-anonid 
allow capa problems access to anonymous_student_id
 2014-05-09 16:21:36 -04:00
David Baumgold
c0a5171c75 Merge pull request #3466 from lduarte1991/lduarte-harvardx 
Reconnecting Token Generator for Annotation Tool
 2014-05-09 16:14:42 -04:00
Calen Pennington
c72b0bb293 Resolve merge conflicts relative to master 2014-05-09 15:31:20 -04:00
Calen Pennington
155ffe37ca Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master 
Conflicts:
	cms/djangoapps/contentstore/views/item.py
	cms/djangoapps/contentstore/views/tests/test_container.py
	cms/djangoapps/contentstore/views/tests/test_tabs.py
	common/lib/xmodule/xmodule/modulestore/mongo/draft.py
	lms/djangoapps/certificates/management/commands/gen_cert_report.py
	lms/djangoapps/certificates/queue.py
	lms/djangoapps/certificates/views.py
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/tests/test_module_render.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/instructor/views/instructor_dashboard.py
	lms/djangoapps/instructor/views/legacy.py
	lms/djangoapps/shoppingcart/tests/test_models.py
	lms/djangoapps/verify_student/views.py
 2014-05-09 15:29:32 -04:00
Julia Hansbrough
9fb82d5357 Fixing ORA 2014-05-09 19:27:15 +00:00
Sarina Canelake
22d17a21ec Remove unicode character inserted into video_xfields 2014-05-09 15:25:56 -04:00
Andy Armstrong
a454502b63 Merge pull request #3666 from edx/andya/fix-translation-string 
Improve the translatability of Studio's paging header
 2014-05-09 15:16:11 -04:00
Carson Gee
74578cd720 Merge pull request #3493 from carsongee/cg/sysdash_git_info 
Adding additonal path to search for git information on sysadmin dashboard
 2014-05-09 15:14:10 -04:00
Sarina Canelake
193a816395 Merge pull request #3609 from edx/sarina/i18n-cleanup 
Clarify strings for i18n
 2014-05-09 15:00:36 -04:00
Calen Pennington
76a04fa805 Fix discussions by correctly serializing outgoing course_ids 2014-05-09 14:51:03 -04:00
Nimisha Asthagiri
754ada9c62 Merge pull request #3668 from edx/opaque-keys-fix-cache-content-diff-runs 
Fix delete cache so it also deletes location with run = None.
 2014-05-09 14:36:48 -04:00
Dave St.Germain
eab8445eb1 Merge pull request #3156 from edx/dcs/LMS-1740 
Fixes LMS-1740 by activating the zooming diagram with the spacebar.
 2014-05-09 14:28:24 -04:00
Carson Gee
cbf525f6cf Fix infinite redirect loop on logout caused by django caching 2014-05-09 14:22:11 -04:00
Carson Gee
5452de20d8 Modified ssl certificate authentication to handle next redirection 
Makes small changes in lms and cms both so that user's go to the
original page they intended to if they weren't already logged in
 2014-05-09 14:22:10 -04:00
Nimisha Asthagiri
e9052dc2fb Fix delete cache so it also deletes location with run = None. 2014-05-09 14:17:32 -04:00
Ned Batchelder
4ea3945d78 Merge pull request #3667 from edx/ned/more-links-in-pr-guidelines 
Add more links in the PR guidelines.
 2014-05-09 14:01:41 -04:00
Ned Batchelder
c7543dd33d Add more links in the PR guidelines. 2014-05-09 13:53:16 -04:00
Andy Armstrong
e75f273329 Apply Sarina's code review suggestions 2014-05-09 13:39:17 -04:00
Carson Gee
379745e3a4 Merge pull request #2686 from edx/feature/ichuang/add-reset-links-to-staff-debug 
add problem reset link to staff debug page
 2014-05-09 13:29:29 -04:00
srpearce
d756b4a96d Merge pull request #3617 from edx/sylvia/docs/DOC-359 
Sylvia/docs/doc 359
 2014-05-09 13:26:39 -04:00
Sylvia Pearce
28a2efeace Add VitalSource information 2014-05-09 13:25:38 -04:00
srpearce
fa0e958b43 Merge pull request #3650 from edx/sylvia/docs/DOC-206 
Sylvia/docs/doc 206
 2014-05-09 12:38:05 -04:00