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

10253 Commits

Author SHA1 Message Date
stv
2e1400f842 Fix Pylint: W0613(unused-argument) 2015-02-19 19:56:51 -08:00
stv
416f7090b1 Fix Pylint: C0112(empty-docstring) 2015-02-19 19:56:51 -08:00
stv
75aaf0d4a7 Fix Pylint: C0326(bad-whitespace) 2015-02-19 19:56:51 -08:00
Christina Roberts
985a492efd Merge pull request #4891 from aboudreault/discussion-digest-default 
Add ENABLE_DISCUSSION_EMAIL_DIGEST feature
 2015-02-19 10:36:59 -06:00
Alan Boudreault
ac445d6eff Add ENABLE_DISCUSSION_EMAIL_DIGEST feature, to enable discussion emails digest by default for all users 2015-02-19 14:34:10 +08:00
Mark Sadecki
002dc0f553 Merge pull request #6926 from edx/cptvitamin/TNL-1371-fieldset-no-legend 
[TNL-1371] Adds a SR only legend for fieldset and translates
 2015-02-18 13:43:10 -05:00
Will Daly
ad1cf355e9 Merge pull request #7007 from edx/will/ecom-859-take-three 
ECOM-859: Add support for an input image capture.
 2015-02-18 12:59:26 -05:00
Will Daly
a29662cdbc ECOM-859: Add support for an input image capture. 
Add support for HTML Media Capture (file input)
so that iOS users can use the camera.
 2015-02-18 11:10:41 -05:00
Will Daly
dca2b95e60 Merge pull request #7010 from edx/will/ecom-1060 
ECOM-1060: Logistration third-party auth improvements
 2015-02-18 10:07:43 -05:00
Sarina Canelake
1fb580e3ef Merge pull request #6938 from mitocw/bdero/gitlog-pagination 
Add pagination to sysadmin dashboard Git import logs
 2015-02-18 10:04:22 -05:00
Xavier Antoviaque
132cadb517 Merge pull request #2968 from edx-solutions/xblock-external-ui 
xblock-external-ui: Add XBlock API call to render XBlock views
 2015-02-18 08:58:33 +01:00
Brandon DeRosier
367dc2573b Test multi-page gitlogs 2015-02-18 01:58:53 -05:00
David Baumgold
e5c650d394 Merge pull request #7006 from stvstnfrd/dead 
Remove dead code paths
 2015-02-17 16:44:17 -05:00
Will Daly
a5f173dfcc ECOM-1060: Logistration third-party auth improvements 
When the user returns to the registration page with a current
third party auth provider, hide the third party auth buttons
are hidden, including the
"or create a new one here" text that does not make sense
when the buttons are hidden.
 2015-02-17 14:48:53 -05:00
Clinton Blackburn
2854bb9524 Added Course Structure API 2015-02-17 13:23:34 -05:00
Sarina Canelake
793a472628 Merge pull request #6962 from Stanford-Online/giulio/course-price-bugfix 
BUGFIX: shopping_cart_enabled + cosmetic price
 2015-02-17 12:56:16 -05:00
Will Daly
cec3484184 Merge pull request #6969 from edx/will/ecom-1055 
ECOM-1055: Add messaging for when a student's verification will expire before the deadline
 2015-02-17 10:57:57 -05:00
Giulio Gratta
6a037d05f7 BUGFIX: shopping_cart_enabled + cosmetic price 
- pass through registration price for use in template
- change conditional for add-to-cart to use registration price
- change conditional for sidebar price field to also include registration price
- remove expected failure in test
- add test for shopping_cart + course without mode
 2015-02-17 07:50:59 -08:00
Will Daly
6796b07d56 Add messaging for when a student's verification will expire before the deadline. 2015-02-17 09:55:29 -05:00
Xavier Antoviaque
05c857478b xblock-external-ui: Adds support for CORS headers (cross-domain request) 
xblock-external-ui: Alternate referer check for CORS requests
xblock-external-ui: Allow to disable httponly on session cookies
xblock-external-ui: Add a unit test for CorsCSRFMiddleware
 2015-02-17 10:24:27 +01:00
stv
91eb723946 Remove obsolete management command 
While this may have served a purpose at one point, it's now been broken
for more than 2 years [1]; a critical code path makes a call to a
function which is no longer imported.

[1] commit 84cb0ce99b
    Date:   Fri Dec 21 13:15:37 2012 -0500
 2015-02-16 22:50:11 -08:00
stv
971713d0c2 Remove unreferenced mustache_helpers code 
I can't seem to find any references to this code outside of the library
and the tests themselves.
 2015-02-16 22:50:11 -08:00
Xavier Antoviaque
2ba4957951 xblock-external-ui: Add XBlock API call to render XBlock views 
xblock-external-ui: Include CSRF token in the API answer
xblock-external-ui: Include full path when building local_url
xblock-external-ui: Fix TestHandleXBlockCallback & bok_choy, add tests
xblock-external-ui: Only return `instance` in `_invoke_xblock_handler()`
xblock-external-ui: Group resources by hash tag to avoid duplicate loads
xblock-external-ui: PEP8
xblock-external-ui: Fail early if the XBlock view is called anonymously

    We used to serve anonymous requests, but most XBlocks assume that the
    user is logged in, which can generate a lot of errors when the user is
    accessed or when an XBlock ajax callback is queried. Fail early to only
    get one error per page load, and prevent displaying the XBlock
    altogether when the LMS doesn't find an active user session.

xblock-external-ui: Add request params in view render context
xblock-external-ui: HTTP error status when file is too large for handler
xblock-external-ui: Fix unicode encodings in XBlock rendering
xblock-external-ui: Feature flag for API call ENABLE_XBLOCK_VIEW_ENDPOINT
 2015-02-16 12:39:38 +01:00
Chris
48b50fa097 Merge pull request #6971 from edx/clrux/rtl-1630-fix 
RTLifying the forgot password link
 2015-02-13 15:15:24 -05:00
Will Daly
62b91d6fcc Merge pull request #6982 from edx/will/update-linkedin-field-name 
LinkedIn Add to Profile source parameter
 2015-02-13 14:03:10 -05:00
Clinton Blackburn
052fa8eafc Merge pull request #6935 from edx/clintonb/course-structure 
Generating Course Structure Asynchronously on Course Publish
 2015-02-13 13:37:05 -05:00
Chris Rodriguez
a1143d45ba RTLifying the forgot password link 2015-02-13 13:25:20 -05:00
Sarina Canelake
0217f50f12 Merge pull request #6986 from edx/sarina/fix-link 
Fix translator's guide link
 2015-02-13 12:53:55 -05:00
Will Daly
a18e0c6bc7 Rename LinkedIn configuration field to "company_identifier" 
Add "source" parameter to LinkedIn add-to-profile URL.

Add platform name to certification name.

Style changes for linked in sharing on dashboard
 2015-02-13 12:23:51 -05:00
Sarina Canelake
eb04ba2e9b Fix translator's guide link 
various pylint fixes
 2015-02-13 10:51:58 -05:00
Chris
2c8698c087 Merge pull request #6970 from edx/clrux/rtl-1629-fix 
Adding new logistration Sass partial to RTL compiled
 2015-02-13 10:46:54 -05:00
Chris
7766ed64a3 Merge pull request #6972 from edx/clrux/rtl-1631-fix 
RTL-ifying footer
 2015-02-13 10:45:16 -05:00
Chris
9c82195808 Merge pull request #6880 from edx/clrux/lms-navigation-icon-update 
Adding markup for icon fonts; adding custom styles for said icons
 2015-02-13 09:59:17 -05:00
Chris Rodriguez
23557b9800 RTL-ifying footer 2015-02-13 09:44:17 -05:00
Chris Rodriguez
be7b3f2949 Adjusting RTL styles for UX-1628 2015-02-13 09:44:17 -05:00
Will Daly
7da15ea1d2 Merge pull request #6957 from edx/will/country-access-part-3 
Finish Country Access (Part 3 of 3): Block enrollment from third party auth
 2015-02-12 22:25:07 -05:00
Chris Rodriguez
bed9d2f5da Adjusting line height and labels 2015-02-12 18:53:20 -05:00
Chris Rodriguez
7c02782f90 Adding new logistration Sass partial to RTL compiled 2015-02-12 18:53:20 -05:00
Chris Rodriguez
0326c1917a Adding markup for icon fonts; adding custom styles for said icons 2015-02-12 18:50:47 -05:00
Chris Rodriguez
23e2b8b702 Adjusting RTL styles for UX-1628 2015-02-12 11:29:59 -05:00
David Ormsbee
24fcab7f24 Very rough cut at generating a course outline after publishing. 2015-02-11 16:13:10 -05:00
Will Daly
5e732ea25c Country Access: Block enrollment from third party auth 
Users who are blocked from enrolling in a course
due to an embargo are redirected to the blocked
message page after authentication completes.
 2015-02-11 13:18:15 -05:00
Will Daly
70ec4c5f66 Merge pull request #6948 from edx/will/country-access-part-2 
Finish Country Access (Part 2 of 3)
 2015-02-11 13:15:38 -05:00
Will Daly
ea29bb4277 Merge pull request #6961 from edx/will/quiet-error-logs-invoice-pdf-missing-image 
Avoid logging errors when the image path is not provided for invoice PDFs
 2015-02-11 13:15:24 -05:00
ahsan-ul-haq
77f98e1e77 Merge pull request #6954 from edx/ahsan/tnl-1383-ALT-text-describes-image-not-action 
ALT text describes image, not action
 2015-02-11 22:31:22 +05:00
Will Daly
5173525389 Avoid logging errors when the image path is not provided for invoice PDFs 2015-02-11 11:01:51 -05:00
Awais Qureshi
f3c3202341 Merge pull request #6931 from edx/awais786/ECOM-1028-add-profile-linkedin 
ECOM-1028 adding linked-in button , config model and migration for linke...
 2015-02-11 20:45:30 +05:00
Waqas Khalid
4f326a8ca3 Merge pull request #6832 from edx/waqas/tnl1149-discussion-mathjax-solution 
Discussion forum should be independent of mathjax
 2015-02-11 20:27:45 +05:00
Awais
57ef60de0a ECOM-1028 adding linked-in button , config model and migration for linked url. 
ECOM-1028 update the migration and move the code into class method.
 2015-02-11 19:09:30 +05:00
Ahsan Ulhaq
b727bf70c5 ALT text describes image, not action 
At LMS dashboard course listing the course cover has alt
attribute that have course name and then Cover Page it describe
image not the action which is to take user to course home page

TNL-1383
 2015-02-11 18:43:50 +05:00