Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
30,917 Commits 1 Branch 0 Tags
54f62a85f6164545151c32a063916cbeec94de46
Commit Graph

11358 Commits

Author SHA1 Message Date
Will Daly
8988aa1c9e Credit provider integration Python API 
* Add end-point for initiating a request for credit from a provider.
* Add an end-point for a provider to update the status of a request (approved / denied).
 2015-06-11 11:34:25 -04:00
Will Daly
26f1ecb6a5 Merge pull request #8458 from edx/will/remove-v2-footer 
Remove V2 of the EdX.org footer
 2015-06-11 10:43:30 -04:00
Edward Zarecor
ac6e259388 Merge pull request #8467 from edx/release-2015-06-10-conflict 
Release 2015 06 10 conflict
 2015-06-11 10:16:48 -04:00
Muzaffar yousaf
3706949eab Merge pull request #8432 from edx/muzaffar/bulk-emails 
Remove course_title from bulk email.
 2015-06-11 18:10:00 +05:00
Clinton Blackburn
ce8550dba6 Merge pull request #8469 from edx/clintonb/course-structure-api-cleanup 
Removed IsAuthenticatedOrDebug
 2015-06-10 21:27:36 -04:00
Clinton Blackburn
2da42d5efa Removed IsAuthenticatedOrDebug 
IsAuthenticatedOrDebug hides potential issues with API client code that is run in local environments and later deployed to production where authentication fails.

XCOM-193
 2015-06-10 18:55:27 -04:00
Brian Talbot
fbe09770a4 Web Certs: adjusting base/honor-code rendering to only hide staff signatures 
SOL-973
 2015-06-10 18:47:26 -04:00
Edward Zarecor
c12c5c926d fixing post-release merge conflicts with DKH 2015-06-10 16:56:21 -04:00
Ben McMorran
695f19c420 TNL-1907 Implement Course Team Membership API 2015-06-10 20:40:02 +00:00
Will Daly
5198257cbe Merge pull request #8461 from edx/will/verify-student-cleanup 
Remove unused code left over from ECOM-188.
 2015-06-10 14:44:51 -04:00
Matt Drayer
4dd55609ab Merge pull request #8430 from edx/asadiqbal08/SOL-971 
SOL-971
 2015-06-10 14:21:42 -04:00
Renzo Lucioni
0349090815 Merge pull request #8456 from edx/renzo/payment-button-ui 
Payment button UI modifications
 2015-06-10 14:04:59 -04:00
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
AlasdairSwan
ff849d206a Fixes bug with app links in new footer 2015-06-10 12:41:49 -04:00
Renzo Lucioni
d6c0460483 Payment button UI modifications 
Includes button copy revision and a styling tweak to make the selected payment button appear active while disabled.
 2015-06-10 11:28:51 -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
Marco Morales
f39cef25be Merge pull request #8440 from Stanford-Online/giulio/font-awesome-icon-main-platform-fixes 
BUGFIX: fix  FA4 conversion for a few icons
 2015-06-09 22:35:11 -07:00
Sarina Canelake
cc85bfe81e Merge pull request #8019 from jazkarta/testjs 
Add Jasmine specs to test CCX schedule tab
 2015-06-09 21:36:08 -04:00
Carlos de la Guardia
85111ceb5a Add jasmine tests for ccx schedule code. 2015-06-09 16:31:57 -05:00
Brian Talbot
387f7d149e revising expected output paths for Django Pipeline 2015-06-09 17:31:38 -04:00
David Baumgold
77facf13ba Merge pull request #8419 from edx/sass-output-to-css-dir 
Compile Sass to CSS dirs, move Creative Commons CSS into Sass
 2015-06-09 17:00:15 -04:00
Matt Drayer
e756685418 mattdrayer/SOL-952: Update default URLs and add backwards migration 2015-06-09 15:11:48 -04:00
Giulio Gratta
cd76b40542 BUGFIX: CCX icon FA4 conversion 
- ccx enrollment remove icon -> correct icon: "fa-times-circle"
- ccx grading policy warning -> correct icon: "fa-warning"
 2015-06-09 10:23:06 -07:00
Giulio Gratta
0b741aa3c4 BUGFIX: fix FA4 conversion for a few icons 
- course-about sidebar info icon -> correct icon: "fa-info-circle"
- wiki search add file -> correct icon: "fa-plus-circle"
- wiki history paragraph info -> correct icon: "fa-info-circle"
 2015-06-09 10:18:35 -07: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
Will Daly
36d1eb22cd Merge pull request #8338 from edx/will/credit-provider-integration 
Credit provider integration Python API (Part 1 of 3)
 2015-06-09 11:12:51 -04:00
David Baumgold
141892a9fd Move _creative-commons.scss into elements directory 2015-06-09 11:08:40 -04:00
David Baumgold
a7c710a0de Moved Creative Commons CSS into Sass 
Also reconfigured paver to compile Sass into CSS directories
 2015-06-09 10:55:20 -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
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