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

30844 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Renzo Lucioni
d61cee95a8 Merge pull request #8500 from edx/renzo/commerce-cleanup 
Avoid POSTing unnecessary payment processor parameter
 2015-06-12 11:09:59 -04:00
Renzo Lucioni
3de0af1616 Merge pull request #8498 from edx/release 
Release
 2015-06-12 11:09:16 -04:00
Waheed Ahmed
36d321c4e3 Merge pull request #8496 from edx/waheed/plat674-improve-test-with-ddt 
Specified number of mongo and split calls in xblock outline handler test with ddt.
 2015-06-12 19:14:41 +05:00
Shrhawk
04eff80065 Merge pull request #8495 from edx/shr/bug/tnl-2122-fix-show-enable-import-from-youtube-transcript-button 
add name param check_transcripts
 2015-06-12 19:07:41 +05:00
Jim Abramson
79a63bbe0f Merge pull request #8488 from edx/patch/2015-06-11 
Patch/2015 06 11
 2015-06-12 09:38:51 -04:00
Waheed Ahmed
4323109cad Specified number of mongo and split calls in xblock outline handler test with ddt. 
PLAT-674
 2015-06-12 17:17:59 +05:00
Syed Hassan Raza
c9778a5f57 add name param check_transcripts 2015-06-12 16:34:45 +05:00
zubair-arbi
f73b68d6f1 Merge pull request #8382 from edx/zub/story/ecom-1591-studio-display-credit-eligibility-table 
show credit eligibility requirements in studio
 2015-06-12 15:41:58 +05:00
zubair-arbi
3204c8b3fe show credit eligibility requirements in studio 
ECOM-1591
 2015-06-12 13:19:57 +05:00
Sarina Canelake
233aba74a3 Merge pull request #8222 from Stanford-Online/giulio/font-awesome-icon-names 
BUGFIX: CCX Font Awesome icon name fixes
 2015-06-12 00:02:36 -04:00
Ben Patterson
32ab544b77 Merge pull request #8494 from edx/revert-8347-mcgachey-lti-authentication 
Revert "[LTI Provider] Basic LTI authentication"
 2015-06-11 21:12:05 -04:00
Ben Patterson
f8f2e2121a Revert "[LTI Provider] Basic LTI authentication" 2015-06-11 21:06:02 -04:00
David Ormsbee
fb491bf265 Merge pull request #8347 from mcgachey/mcgachey-lti-authentication 
[LTI Provider] Basic LTI authentication
 2015-06-11 19:51:57 -04:00
Renzo Lucioni
2db79556bd Avoid POSTing unnecessary payment processor parameter 2015-06-11 18:24:25 -04:00
Will Daly
9d60b0e07a Merge pull request #8444 from edx/will/credit-provider-part-two 
Credit provider integration Python API (Part 2 of 3)
 2015-06-11 17:38:42 -04:00
Kelketek
a61b9106ef Merge pull request #8312 from open-craft/kelketek/fix-flaky-lib-test 
(SOL-618) Fix for flaky library users studio test
 2015-06-11 15:25:35 -05:00
Christopher Lee
203e512d4e Merge pull request #8487 from edx/clee/discussion-api-delete-comment-rebased 
Clee/discussion api delete comment rebased
 2015-06-11 16:01:28 -04:00
christopher lee
205c735865 Added comment deletion in the discussion API 2015-06-11 14:09:02 -04:00
Renzo Lucioni
41c5916408 Payment button UI modifications 
Includes button copy revision and a styling tweak to make the selected payment button appear active while disabled.
 2015-06-11 13:43:38 -04:00
jsa
e1dfdc0811 Receipt page now also handles Cybersource payment failures. 
XCOM-398
 2015-06-11 13:42:58 -04:00
Sarina Canelake
7df880f514 Merge pull request #8483 from AkA84/update-authors 
Update AUTHORS
 2015-06-11 12:44:18 -04:00
Greg Price
94c1bf495a Merge pull request #8437 from edx/gprice/discussion-api-edit-comment 
Add comment editing to discussion API
 2015-06-11 12:28:23 -04:00
Alessandro Verdura
e25f62da6b Add myself to AUTHORS 2015-06-11 18:05:32 +02:00
Greg Price
895731f526 Add comment editing to discussion API 
This is done via PATCH on a comment instance endpoint.
 2015-06-11 11:39:01 -04:00
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
Ben Patterson
e99a56f3a4 Merge pull request #8470 from edx/benp/flag-flakies-jun2015 
Flag test as flaky. See SOL-975
 2015-06-11 06:18:47 -04: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
Matt Drayer
a9c9c15ced Merge pull request #8463 from edx/mattdrayer/SOL-449 
mattdrayer/SOL-449: Remove @skip decorator
 2015-06-10 21:15:49 -04:00
Ben Patterson
5977492867 Flag test as flaky. See SOL-975 2015-06-10 20:54:39 -04:00
Brian Talbot
d6a2bcfa69 Merge pull request #8465 from edx/talbs/SOL-973 
Web Certificates: Only Hide Staff Signature for Honor/Base Rendering
 2015-06-10 20:52:18 -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
Ben McMorran
a7e49c2113 Merge pull request #8441 from edx/benmcmorran/team-api-membership 
TNL-1907 Implement Course Team Membership API
 2015-06-10 17:17:25 -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
Brian Talbot
5faaca0d01 Merge pull request #8464 from edx/talbs/fix-sass+css-compile 
FIX - Compile Sass to CSS directory Clean Up
 2015-06-10 15:24:22 -04: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
Brian Talbot
5ff2a3af3f tidying up loose ends from sass compilation to css dir change 
* adding in missing web certs Sass/CSS asset settings
* updating .gitignore
 2015-06-10 14:23:13 -04:00
Matt Drayer
4dd55609ab Merge pull request #8430 from edx/asadiqbal08/SOL-971 
SOL-971
 2015-06-10 14:21:42 -04:00
Matt Drayer
aadb902cc7 mattdrayer/SOL-449: Remove @skip decorator 2015-06-10 14:20:39 -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
Waheed Ahmed
1b3efabaa0 Merge pull request #8457 from edx/waheed/tnl2425-fix-slow-transaction-xblock-outline 
Fixed slow transaction on xblock outline handler.
 2015-06-10 23:00:27 +05:00
Awais Qureshi
2374685dc5 Merge pull request #8462 from edx/awais786/ECOM-1644-message-format 
ECOM-1644 minor message updation.
 2015-06-10 22:59:32 +05:00
AlasdairSwan
2092d732a7 Merge pull request #8460 from edx/alasdair/footer-mobile-app-link-bug 
Fixes bug with app links in new footer
 2015-06-10 13:38:41 -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
Awais
d5ca25e197 ECOM-1644 minor message updation. 2015-06-10 22:08:23 +05:00