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

33604 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Awais Jibran
3cd48e4d61 Merge pull request #8317 from edx/aj/plat643-cms-export-command-export-to-wrong-place 
Fixed cms course export using management command.
 2015-06-09 18:59:03 +05:00
muzaffaryousaf
b185a686d8 Removing course_title from email subject. 
TNL-1877
 2015-06-09 18:48:55 +05:00
Brian Talbot
0003bf7aaf Merge pull request #8319 from edx/talbs/UX-2011-v4 
Web Certificates: Add Base/Distinguished Print Styling - Take 3
 2015-06-09 09:38:05 -04:00
Ben Patterson
e54ce29587 Fix flaky lettuce test. TE-572. 
This should be ported to bok-choy, but until then we should fix the flakiness in
this test. It needs to wait for the page to change after the user clicks 'reset'.
 2015-06-09 09:37:36 -04:00
Greg Price
b91287bfe3 Merge pull request #8425 from edx/gprice/discussion-api-parent-id 
Use parent_id returned from the comments service
 2015-06-09 09:33:17 -04:00
Christine Lytwynec
73ce054c54 Merge pull request #8415 from edx/clytwynec/re-enable_acid_block_tests 
unskip acid xblock tests
 2015-06-09 09:31:34 -04:00
Awais Qureshi
ab46de59c2 Merge pull request #8407 from edx/awais786/ECOM-1644-course-access-roles 
ECOM-1644 Implementing course-access roles.
 2015-06-09 18:23:03 +05:00
Matt Drayer
c4175c7dc6 Merge pull request #8363 from edx/ziafazal/SOL-861 
refactored code to make certificate PDF generation optional
 2015-06-09 09:01:04 -04:00
Awais Jibran
fee8f6db64 Merge pull request #8037 from edx/aj/tnl2167-pause-vide-event-not-emitting-at-video-end 
pause_video event does not emit when a video ends
 2015-06-09 16:18:51 +05:00
Awais
956e41348e ECOM-1644 Implementing course-access roles. 2015-06-09 15:29:19 +05:00
Awais Jibran
3e6670d1a4 PLAT-643 
Fixed cms course export
 2015-06-09 11:19:46 +05:00
Phil McGachey
0c7623d530 [LTI Provider] Fix bug preventing unenrolled users from accessing content 
Change https://github.com/edx/edx-platform/pull/8240 refactored the LTI
provider template rendering code and introduced an issue where a user was
required to be enrolled in a course before that course's content could be
accessed over LTI. According to the LTI design spec:
    https://docs.google.com/document/d/185hdPvIxcKtiDOLjb4sTGovA_WYXWz5Cd79gCzQwBms
we delegate access control over LTI content to the LTI consumer, rather
than requiring that users enroll in edX courses explicitly (and that admins
keep edX and LTI provider enrollemnts consistent when students add or drop
courses).

This change fixes the immediate issue, which is disrupting the LTI Provider
pilot currently running at Harvard.
 2015-06-08 23:01:43 -04:00
Kelketek
9a55497e72 Merge pull request #8417 from open-craft/badges-events-rename 
Tweaked names of badge events.
 2015-06-08 20:45:33 -05:00
Brian Talbot
33b7fbbbd4 UX-2011: adding print-based styles for Open edX web certs 2015-06-08 20:58:38 -04:00
Greg Price
2c7590d197 Use parent_id returned from the comments service 
This depends on cs_comments_service commit 0487891.
 2015-06-08 16:59:21 -04:00
Christopher Lee
96a9a7e7cc Merge pull request #8355 from edx/clee/discussion_api_delete_thread 
MA-661: Clee/discussion api delete thread
 2015-06-08 16:34:28 -04:00
Peter Fogg
8ffe7c65e6 Merge pull request #8397 from edx/peter-fogg/category-subnavigation 
TNL-1891 Browse Teams: Category Subnavigation
 2015-06-08 16:32:41 -04:00
Chris
a5204310b1 Merge pull request #8267 from edx/clrux/UX-2078-error-heading-reduction 
Reducing size of error message heading
 2015-06-08 16:12:57 -04:00
Diana Huang
cddd387beb Merge pull request #8367 from edx/diana/merge-course-view-and-tab 
Refactor and merge CourseViewType and CourseTab.
 2015-06-08 16:08:27 -04:00
Christine Lytwynec
659c72a03e move bok choy studio split tests to shard_2 2015-06-08 15:53:34 -04:00
Christine Lytwynec
e31a78cbb7 move bok choy video license tests to shard_2 2015-06-08 15:51:13 -04:00
Christine Lytwynec
2005734e1c move bok choy discussion tests to shard_2 2015-06-08 15:45:46 -04:00
christopher lee
30884d192b Added delete thread in discussion api 2015-06-08 15:43:39 -04:00
David Baumgold
6809d5e799 Merge pull request #8420 from edx/db/improve-openedx-readme 
Improve README for openedx directory
 2015-06-08 15:20:22 -04:00
Diana Huang
7461a2fd37 Refactor and merge CourseViewType and CourseTab. 
TNL-2321
 2015-06-08 15:18:39 -04:00
David Baumgold
3b34cb8407 Improve README for openedx directory 2015-06-08 15:11:54 -04:00
Peter Fogg
17d3906c86 TNL-1891 Browse Teams: Category Subnavigation 
Introduces a tabbed view component which displays its subviews and
handles Backbone navigation between each tab. This is used to implement
the "My Teams" and "Browse" areas of the Teams tab. Right now the
content of both tabs is stubbed out with a placeholder view which should
be replaced by TNL-1893 and TNL-1892.
 2015-06-08 15:05:11 -04:00
Chris Rodriguez
402c3f329f Removing conflict from header 2015-06-08 14:59:17 -04:00
Chris Rodriguez
4fd1ebce1c Fixing test to match CSS 2015-06-08 14:55:56 -04:00
cewing
a57cc930b6 add ccx-keys as a dependency of edx 2015-06-08 11:25:13 -07:00
Awais
424e1f5b3c ECOM-1572 implementing code to new branch. 2015-06-08 23:23:23 +05:00
Jonathan Piacenti
ada51a3b31 Tweaked names of badge events. 2015-06-08 18:11:01 +00:00
tlindaliu
cdfc213c7d linda adding name to authors file 2015-06-08 13:44:59 -04:00
Carol Tong
77395bdf0d Merge pull request #8366 from edx/carol/doc/StudioTempl_Certs 
DOC: Finalize Help targets, sidebar text for Studio Certificates page
 2015-06-08 13:44:32 -04:00
Will Daly
e5a62aaaba Credit provider integration Python API 
* Add Python API functions for creating and updating requests for credit.
* Add Django models and migrations for tracking credit requests and status.
 2015-06-08 13:30:32 -04:00
chrisndodge
de5e12d995 Merge pull request #8405 from edx/cdodge/feature-flag-course-search-on-courses-page 
make courses.html also honor the ENABLE_COURSE_DISCOVERY feature flag
 2015-06-08 13:12:16 -04:00
Jim Abramson
a7ebe17dfb Merge pull request #8414 from edx/jsa/fix-deactivate-enrollment 
Jsa/fix deactivate enrollment
 2015-06-08 13:09:54 -04:00
Feanil Patel
e488896f2f Merge pull request #8409 from edx/dsego/SOL-875 
Update edx-search dependency to reference latest edx-search
 2015-06-08 13:08:50 -04:00
Feanil Patel
924bbe6b9f Update github.txt to use a tag instead of a commit 2015-06-08 13:07:14 -04:00
Adam
d0f7a08cc4 Merge pull request #8408 from edx/release 
Release
 2015-06-08 11:00:20 -05:00
Christine Lytwynec
7e19142b01 unskip acid xblock tests 2015-06-08 11:57:18 -04:00
Sarina Canelake
c9796b83a9 Merge pull request #8403 from edx/sarina/remove-redefine-django14-cors 
Use Django 1.4 @ensure_csrf_cookie method PLAT-664
 2015-06-08 11:44:25 -04:00
Carol Tong
6aa7f810f3 DOC: Finalize Help targets, sidebar text for certificates 2015-06-08 11:36:11 -04:00
Xavier Antoviaque
688d62293b Merge pull request #8406 from antoviaque/badges-migration-fix 
Default to filestorage when S3 isn't configured (aws.py) - SOL-963
 2015-06-08 17:26:21 +02:00
Diana Huang
a02b242e5e Merge pull request #8413 from edx/diana/fix-allow-multiple 
Allow multiple external_link tabs for one course.
 2015-06-08 11:09:55 -04:00
jsa
f4b2c197db don’t trigger a refund request in otto, if otto requested unenrollment. 
XCOM-396
 2015-06-08 11:07:16 -04:00
jsa
445d0dabb6 Correct deactivation logic in enrollment api and test. 
XCOM-396
 2015-06-08 11:06:52 -04:00
Diana Huang
a224d06a89 Allow multiple external_link tabs for one course. 2015-06-08 10:10:45 -04:00
Calen Pennington
69799cc1e0 Merge pull request #8344 from cpennington/update-xblock-repo 
Update XBlock dependency to use the merged commit from the edx repo
 2015-06-08 09:56:42 -04:00
Sven Marnach
5cc599af3f Bump edx-submissions hash to latest version. 
This will pull in the new get_all_submissions() interface method.
 2015-06-08 15:48:18 +02:00