Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
65,817 Commits 1 Branch 0 Tags
624bef547c66da17048e29ff5d80126a665f1a0d
Commit Graph

14096 Commits

Author SHA1 Message Date
Will Daly
1cc776ff19 Remove V2 of the EdX.org footer 2015-06-10 13:13:32 -04:00
Will Daly
69306da49a Remove unused code left over from ECOM-188. 2015-06-10 13:08:23 -04:00
Peter Fogg
d74bb36634 Fix updating immutable request dictionary. 
Django's `QueryDict`s are immutable during normal running, and so they
must be copied if any updates are to be made to them. In testing,
though, `request.DATA._mutable` is `True`, so tests can falsely pass.
 2015-06-10 11:15:02 -04:00
asadiqbal
302d7a0152 SOL-971 
Allow microsites to override content

more test checks

Fix pylint error (duplicate import)

SOL-971 Changes
 2015-06-10 19:26:30 +05:00
Awais Qureshi
16bbdc7fca Merge pull request #8329 from edx/awais786/ECOM-1494-remove-midcourse-models 
ECOM-1494 removing models.
 2015-06-10 18:24:39 +05:00
Awais
ed02d9cc5c ECOM-1494 removing models only. 2015-06-10 11:19:51 +05:00
Matt Drayer
e756685418 mattdrayer/SOL-952: Update default URLs and add backwards migration 2015-06-09 15:11:48 -04:00
David Ormsbee
73b3af6c94 Merge pull request #8426 from mcgachey/mcgachey-lti-enrollment-fix 
[LTI Provider] Fix bug preventing unenrolled users from accessing content
 2015-06-09 11:49:57 -04:00
Awais Qureshi
4eef610833 Merge pull request #8328 from edx/awais786/awais786/ECOM-1572-icrv-emails-format-new 
ECOM-1572 implementing code to new branch.
 2015-06-09 20:24:16 +05:00
David Baumgold
9bdf64d385 Merge pull request #8433 from edx/db/json-as-dicts 
Use dicts when defining JSON
 2015-06-09 11:15:56 -04:00
Ben Patterson
242b3736a0 Merge pull request #8429 from edx/benp/fix-flaky-lms-answer-jun2015 
Fix flaky lettuce test. TE-572.
 2015-06-09 10:44:19 -04:00
David Baumgold
9643aca40e Use dicts when defining JSON 2015-06-09 10:02:58 -04:00
muzaffaryousaf
0881cdf366 Updating account_settings_url for bulk emails. 
TNL-1877
 2015-06-09 19:02:42 +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
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
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
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
christopher lee
30884d192b Added delete thread in discussion api 2015-06-08 15:43:39 -04:00
Diana Huang
7461a2fd37 Refactor and merge CourseViewType and CourseTab. 
TNL-2321
 2015-06-08 15:18:39 -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
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
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
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
jsa
f4b2c197db don’t trigger a refund request in otto, if otto requested unenrollment. 
XCOM-396
 2015-06-08 11:07:16 -04:00
Diana Huang
a224d06a89 Allow multiple external_link tabs for one course. 2015-06-08 10:10:45 -04:00
Chris Dodge
e47c97b465 make courses.html also honor the ENABLE_COURSE_DISCOVERY feature flag 2015-06-08 07:46:55 -04:00
Xavier Antoviaque
b32629d62f Default to filestorage when S3 isn't configured (aws.py) 
Also moves the default icons to the badges subfolder to avoid storage conflicts.
 2015-06-08 11:30:16 +02:00
Zia Fazal
20800ea561 refactored code to make certificate PDF generation optional 
improved coverage

refactoring based on feedback

fixed quality violations

changes based on feedback
 2015-06-08 12:42:07 +05:00
asadiqbal
6f0606a00b asadiqbal08/SOL-961: Student-generated certificate flow shows "download" certificate button 2015-06-07 20:44:42 -04:00
Matt Drayer
3e52b8fad1 mattdrayer/SOL-947: Refactor Web/HTML certificate URL patterns 2015-06-06 23:15:17 -04:00
Kelketek
c8b8717944 Merge pull request #8399 from open-craft/fix-badging-name 
Fix self-paced badge naming.
 2015-06-06 09:31:02 -05:00
Jonathan Piacenti
eba951fe69 Fix self-paced badge naming. 2015-06-06 13:44:35 +00:00
Sarina Canelake
e53b9c83d9 Use Django 1.4 @ensure_csrf_cookie method PLAT-664 2015-06-06 08:48:36 -04:00
Greg Price
37ebbc45e3 Add thread voting to discussion API 2015-06-05 16:12:54 -04:00
Greg Price
6c2df96c5f Merge pull request #8372 from edx/gprice/discussion-api-follow-thread 
Add ability to follow a thread in discussion API
 2015-06-05 14:12:29 -04:00
Greg Price
9ff8749716 Add ability to follow a thread in discussion API 2015-06-05 13:20:57 -04:00
Nimisha Asthagiri
d240785b17 MA-722 Render xBlock API Support 2015-06-05 11:18:48 -04:00
Matt Drayer
dc5f650338 Merge pull request #8371 from edx/mattdrayer/SOL-953 
mattdrayer/SOL-953: Remove Mako UNDEFINED overrides
 2015-06-04 21:10:52 -04:00
srpearce
d4b99561d1 Merge pull request #8326 from edx/sylvia/docs/SOL_ECOM 
Sylvia/docs/sol ecom
 2015-06-04 17:35:03 -04:00
Matt Drayer
803a73fdad mattdrayer/SOL-953: Remove Mako UNDEFINED overrides 2015-06-04 16:56:24 -04:00