Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,178 Commits 1 Branch 0 Tags
2c1676f2ee3b8eead60edb1e6dcee89e10ab39bc
Commit Graph

28178 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Muhammad Shoaib
2c1676f2ee removed the is_invoice condition from the pdf file 2015-01-26 12:56:31 +05:00
Sarina Canelake
fdb490d121 Merge pull request #6728 from OmarIthawi/edraak/omarithawi/social-login-icons-rtl 
RTL margins for 3rd-party auth button icons
 2015-01-25 09:19:18 -05:00
swdanielli
47b3eae78f Merge pull request #6470 from edx/danielli/recommender_code_review 
code review
 2015-01-23 17:39:09 -05:00
swdanielli
ed8fea79c2 update accessibility 2015-01-23 16:13:26 -05:00
Carlos Andrés Rocha
78375b797b Merge pull request #6738 from edx/rc/2015-01-20 
Rc/2015 01 20
 2015-01-23 16:10:28 -05:00
Carlos Andrés Rocha
6db7a7e688 Merge pull request #6751 from edx/release 
Release
 2015-01-23 16:10:00 -05:00
Carlos Andrés Rocha
bd1b322cdc Merge pull request #6734 from edx/hotfix/2015-01-22 
When changing quantities, be sure to return the new CyberSource submit f...
 2015-01-23 13:09:07 -05:00
Sarina Canelake
28ced73d29 Merge pull request #6737 from edx/cptvitamin/OPEN-485-alt-in-api-doc 
adds alt text to sample api response
 2015-01-23 12:51:18 -05:00
Stephen Sanchez
6616b7b5c9 Merge pull request #6731 from edx/sanchez/cache_course_enrollment_details 
Adding caching to the course details endpoint for the Enrollment API.
 2015-01-23 08:55:02 -05:00
chrisndodge
8d6f094438 Merge pull request #6732 from edx/cdodge/add-filter-to-coupon-download 
Change coupon CSV download to only include counts for coupons redeemed a...
 2015-01-22 17:34:56 -05:00
Stephen Sanchez
267ec24f0a Merge pull request #6735 from edx/sanchez/allow_enrollment_without_username 
Enrollment API to be used without knowing the current user name.
 2015-01-22 16:37:45 -05:00
Mark Sadecki
06bc55549f Updates sample FAQ to match edx-demo-course 2015-01-22 16:29:55 -05:00
David Baumgold
ccc2dd8327 Merge pull request #6722 from Stanford-Online/giulio/shorten-course-module-py-line-lengths 
Shortened line length of studio help strings
 2015-01-22 16:16:33 -05:00
stephensanchez
896bc1c859 Adding caching to the course details endpoint for the Enrollment API. 2015-01-22 20:58:22 +00:00
Mark Sadecki
f0f0cb7659 adds alt text to sample api response 2015-01-22 15:42:02 -05:00
stephensanchez
2d1d58225a Allow the enrollment API to be used without knowing the authenticted user name. 2015-01-22 19:50:02 +00:00
Chris Dodge
74f6380e9e Change coupon CSV download to only include counts for coupons redeemed all the way through purchase 
updated the failed unit test case and removed the unnessary import
 2015-01-23 00:21:58 +05:00
Chris Dodge
6bfe20b9a9 When changing quantities, be sure to return the new CyberSource submit form html. Also, to ensure that any browser content is fully refreshed when clicking the back button, force a page refresh to reset client state 2015-01-22 13:33:23 -05:00
Giulio Gratta
47a0e3441e Shortened line length of studio help strings 2015-01-22 09:48:41 -08:00
David Baumgold
d89f677f3c Merge pull request #6727 from edx/proxy-tender-domain-rc 
Proxy TENDER_DOMAIN variable from environment to Studio settings
 2015-01-22 12:15:51 -05:00
David Baumgold
f2d549b619 Proxy TENDER_DOMAIN variable from environment to Studio settings 2015-01-22 10:56:30 -05:00
Omar Al-Ithawi
a5c0b6e29a RTL margins for 3rd-party auth button icons 2015-01-22 17:49:47 +02:00
Usman Khalid
3d4a853e00 Merge pull request #5926 from Stanford-Online/kluo/lti-grades-past-due 
Make LTI grade submissions respect deadlines
 2015-01-22 19:55:21 +05:00
Kevin Luo
af9dce82a3 Make LTI grade submissions respect deadlines 2015-01-21 17:05:46 -08:00
Will Daly
fcd7736d29 Merge pull request #6721 from edx/will/revert-requirejs-changes 
Revert "Add RequireJS and RequireJS Optimizer configuration to the LMS"
 2015-01-21 19:07:34 -05:00
Braden MacDonald
4198da1ae1 Merge pull request #6657 from open-craft/fix-library-old-mongo-default 
Fix errors with libraries when old mongo is default (first) modulestore (SOL-234)
 2015-01-21 15:05:12 -08:00
Will Daly
1f2b155746 Revert "Add RequireJS and RequireJS Optimizer configuration to the LMS" 
This reverts commit 1d6fceda50.
 2015-01-21 17:13:27 -05:00
Sarina Canelake
e70a5e265c Merge pull request #6082 from openfun/edx/translate-enrollment-emails 
Render enrollment emails in the student's language
 2015-01-21 16:40:51 -05:00
chrisndodge
e617ce927d Merge pull request #6713 from edx/cdodge/no-tax-id-on-cc-receipts 
Only put the TaxID for Invoices, not Credit Card based receipts
 2015-01-21 16:16:24 -05:00
Will Daly
1eaf84a443 Merge pull request #6544 from edx/will/requirejs-optimizer-lms 
Add RequireJS and RequireJS Optimizer configuration to the LMS
 2015-01-21 15:23:35 -05:00
Brian Talbot
872870ea18 Merge pull request #6715 from edx/talbs/fix-instructordashboard-icons 
FIX - LMS: Instructor Dashboard Revoke Access Icon
 2015-01-21 15:04:27 -05:00
Chris Dodge
62b58fce02 Only put the TaxID for Invoices, not Credit Card based receipts 2015-01-21 15:02:50 -05:00
Braden MacDonald
025f046b04 Fix errors with libraries when old mongo is default (first) modulestore 2015-01-21 11:01:52 -08:00
Brian Talbot
9d2ede98a4 LMS: resolving incorrect icon on Instructor Dashboard admin list mgmt 
UX-1466
 2015-01-21 13:47:12 -05:00
Stephen Sanchez
0bd1f84d6f Merge pull request #6699 from edx/sanchez/unicode_error_verification 
ECOM-959 Making verification msg strings unicode friendly.
 2015-01-21 11:02:00 -05:00
David Baumgold
e6e443c712 Merge pull request #6674 from edx/disable-pylint-name-errors-on-settings 
Ignore invalid-name errors for settings files
 2015-01-21 10:40:05 -05:00
David Baumgold
a72e129da5 Merge pull request #6532 from edx/course-about-i18n 
Improve i18n on course about page
 2015-01-21 10:23:59 -05:00
chrisndodge
ab53bad878 Merge pull request #6704 from edx/cdodge/fix-shoppingcart-back-button 
When changing quantities, be sure to return the new CyberSource submit f...
 2015-01-21 10:22:57 -05:00
Chris Dodge
7faf5cc0f3 When changing quantities, be sure to return the new CyberSource submit form html. Also, to ensure that any browser content is fully refreshed when clicking the back button, force a page refresh to reset client state 2015-01-21 09:12:06 -05:00
Sarina Canelake
6604eedbad Merge pull request #6683 from mitocw/bdero/instructor-dashboard-gitlogs-link 
Add gitlogs link to instructor dashboard
 2015-01-20 21:14:04 -05:00
Carlos Andrés Rocha
065a7f3426 Merge pull request #6702 from edx/sanchez/verification_unicode_names 
ECOM-959 Making verification msg strings unicode friendly.
 2015-01-20 18:59:14 -05:00
Brandon DeRosier
24862edf1c Add gitlogs link to instructor dashboard 2015-01-20 18:55:42 -05:00
stephensanchez
3b5bd4e777 Making verification msg strings unicode friendly. 2015-01-20 21:41:57 +00:00
Renzo Lucioni
1503043826 Merge pull request #6698 from edx/renzo/disable-flaky-bok-choy 
Disable flaky bok-choy tests of payment and verification flow
 2015-01-20 16:40:13 -05:00
stephensanchez
891b952c99 Making verification msg strings unicode friendly. 2015-01-20 21:39:36 +00:00
AlasdairSwan
2ea094e5bc Merge pull request #6700 from edx/alasdair/old-verification-flow-fontawesome-fix 
ECOM-958 fixed font awesome issues with old verification flow
 2015-01-20 16:22:42 -05:00
Diana Huang
1ccc7dc8cc Merge pull request #6677 from edx/diana/handle-expired-verification 
Show an error when a student needs to reverify due to expiration.
 2015-01-20 16:21:13 -05:00
AlasdairSwan
04fc722e1c ECOM-958 fixed font awesome issues with old verification flow 2015-01-20 16:05:55 -05:00
Renzo Lucioni
d6a823c033 Disable flaky bok-choy tests of payment and verification flow 2015-01-20 15:30:23 -05:00
Daniel Friedman
1920ab4149 Merge pull request #6650 from edx/dan-f/validate-group-configuration-group-names 
Require unique group names in group configurations
 2015-01-20 15:27:49 -05:00